[pkgsrc/trunk]: pkgsrc Remove explicit dependencies on the GNU m4 package wit...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Remove explicit dependencies on the GNU m4 package wit...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:49:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/22f52a59f58f
branches:  trunk
changeset: 494290:22f52a59f58f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 22 20:51:45 2005 +0000

description:
Remove explicit dependencies on the GNU m4 package with USE_TOOLS+=m4
and appropriate TOOLS_DEPMETHOD.gm4 settings.

diffstat:

 cad/gnetlist/Makefile               |   8 ++++----
 devel/autoconf/Makefile             |   6 +++---
 devel/autoconf213/Makefile          |   6 +++---
 devel/automake/Makefile             |   7 ++++---
 devel/bison/Makefile                |  10 ++++------
 devel/libsigc++/Makefile            |   4 +---
 devel/libsigc++2/Makefile           |   4 +---
 graphics/gdk-pixbuf/Makefile.common |   3 +--
 8 files changed, 21 insertions(+), 27 deletions(-)

diffs (193 lines):

diff -r 476e247bc307 -r 22f52a59f58f cad/gnetlist/Makefile
--- a/cad/gnetlist/Makefile     Sun May 22 20:28:47 2005 +0000
+++ b/cad/gnetlist/Makefile     Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:51:45 jlam Exp $
 #
 
 DISTNAME=              geda-gnetlist-${PKGVERSION}
@@ -11,7 +11,8 @@
 
 DEPENDS+=              geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
-DEPENDS+=              m4>=1.4:../../devel/m4
+USE_TOOLS+=            gm4
+TOOLS_DEPMETHOD.gm4=   DEPENDS
 
 .include "../../cad/geda/Makefile.common"
 
@@ -23,12 +24,11 @@
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
 EVAL_PREFIX+=   PCBDIR=pcb
-M4DIR= ${LOCALBASE}
 
 post-patch:
 .for f in gnet-PCBboard.scm gnet-gsch2pcb.scm
        ${MV} -f ${WRKSRC}/scheme/${f} ${WRKSRC}/scheme/${f}.bak
-       ${SED} -e 's;@M4@;${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4;g' \
+       ${SED} -e 's;@M4@;${TOOLS_M4:Q};g' \
               -e 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
               -e 's;@pcb_m4dir@;${PCBDIR}/share/pcb/m4;g' \
                ${WRKSRC}/scheme/${f}.bak > ${WRKSRC}/scheme/${f}
diff -r 476e247bc307 -r 22f52a59f58f devel/autoconf/Makefile
--- a/devel/autoconf/Makefile   Sun May 22 20:28:47 2005 +0000
+++ b/devel/autoconf/Makefile   Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/05/13 16:54:12 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=              autoconf-2.59
 PKGREVISION=           1
@@ -10,7 +10,8 @@
 HOMEPAGE=              http://www.gnu.org/software/autoconf/autoconf.html
 COMMENT=               Generates automatic source code configuration scripts
 
-DEPENDS=               m4>=1.4:../../devel/m4
+USE_TOOLS+=            gm4
+TOOLS_DEPMETHOD.gm4=   DEPENDS
 
 # The next line is for conflicts with old versions of this package,
 # which had autoconf-devel as PKGNAME.
@@ -21,7 +22,6 @@
 USE_LANGUAGES=         # empty
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --without-lispdir
-TOOLS_M4=              ${LOCALBASE}/bin/gm4
 
 INFO_FILES=            autoconf.info standards.info
 
diff -r 476e247bc307 -r 22f52a59f58f devel/autoconf213/Makefile
--- a/devel/autoconf213/Makefile        Sun May 22 20:28:47 2005 +0000
+++ b/devel/autoconf213/Makefile        Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/13 16:54:12 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=       autoconf213-2.13
@@ -10,7 +10,8 @@
 HOMEPAGE=      http://www.gnu.org/software/autoconf/autoconf.html
 COMMENT=       Generates automatic source code configuration scripts (old version)
 
-DEPENDS=       m4>=1.4:../../devel/m4
+USE_TOOLS+=            gm4
+TOOLS_DEPMETHOD.gm4=   DEPENDS
 
 CONFLICTS=             autoconf-devel-[0-9]*
 CONFLICTS=             autoconf<2.50
@@ -19,7 +20,6 @@
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --program-transform-name='s/$$/-2.13/'
-TOOLS_M4=              ${LOCALBASE}/bin/gm4
 
 USE_MAKEINFO=          YES
 INFO_FILES=            autoconf213.info
diff -r 476e247bc307 -r 22f52a59f58f devel/automake/Makefile
--- a/devel/automake/Makefile   Sun May 22 20:28:47 2005 +0000
+++ b/devel/automake/Makefile   Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2005/05/22 20:51:45 jlam Exp $
 #
 
 DISTNAME=      automake-1.9.5
@@ -13,13 +13,14 @@
 
 DEPENDS=       autoconf>=2.58:../../devel/autoconf
 
+USE_TOOLS+=            gm4
+TOOLS_DEPMETHOD.gm4=   DEPENDS
+
 #PKG_INSTALLATION_TYPES=       overwrite pkgviews
 
 PLIST_SUBST+=          PKG_DIR_VERSION=1.9
 GNU_CONFIGURE=         YES
 _STRIPFLAG_INSTALL=    # none
-EVAL_PREFIX+=          M4DIR=m4
-TOOLS_M4=              ${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
 
 INFO_FILES=            automake.info
 
diff -r 476e247bc307 -r 22f52a59f58f devel/bison/Makefile
--- a/devel/bison/Makefile      Sun May 22 20:28:47 2005 +0000
+++ b/devel/bison/Makefile      Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=              bison-2.0
 CATEGORIES=            devel
@@ -8,14 +8,12 @@
 HOMEPAGE=              http://www.gnu.org/software/bison/bison.html
 COMMENT=               GNU yacc(1) replacement
 
-DEPENDS+=              m4>=1.4:../../devel/m4
-BUILD_USES_MSGFMT=     yes
-
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+BUILD_USES_MSGFMT=     yes
 GNU_CONFIGURE=         YES
-
-M4=                    ${LOCALBASE}/bin/gm4
+USE_TOOLS+=            gm4
+TOOLS_DEPMETHOD.gm4=   DEPENDS
 
 INFO_FILES=            bison.info
 
diff -r 476e247bc307 -r 22f52a59f58f devel/libsigc++/Makefile
--- a/devel/libsigc++/Makefile  Sun May 22 20:28:47 2005 +0000
+++ b/devel/libsigc++/Makefile  Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=      libsigc++-1.2.7
 CATEGORIES=    devel
@@ -15,8 +15,6 @@
 
 PKGCONFIG_OVERRIDE=    sigc++-1.2.pc.in
 
-CONFIGURE_ENV+=                ac_cv_prog_M4=${TOOLS_M4:Q}
-
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
diff -r 476e247bc307 -r 22f52a59f58f devel/libsigc++2/Makefile
--- a/devel/libsigc++2/Makefile Sun May 22 20:28:47 2005 +0000
+++ b/devel/libsigc++2/Makefile Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=      libsigc++-2.0.11
 PKGNAME=       libsigc++2-2.0.11
@@ -17,8 +17,6 @@
 
 PKGCONFIG_OVERRIDE=    sigc++-2.0.pc.in
 
-CONFIGURE_ENV+=                ac_cv_prog_M4=${TOOLS_M4:Q}
-
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
diff -r 476e247bc307 -r 22f52a59f58f graphics/gdk-pixbuf/Makefile.common
--- a/graphics/gdk-pixbuf/Makefile.common       Sun May 22 20:28:47 2005 +0000
+++ b/graphics/gdk-pixbuf/Makefile.common       Sun May 22 20:51:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2005/05/22 20:08:05 jlam Exp $
+# $NetBSD: Makefile.common,v 1.42 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=              gdk-pixbuf-${VER}.0
 CATEGORIES=            graphics devel
@@ -19,7 +19,6 @@
 GNU_CONFIGURE=         YES
 CONFIGURE_ENV+=                path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
 
-M4=                    ${LOCALBASE}/bin/gm4
 PLIST_SUBST+=          LOCALBASE=${LOCALBASE}
 
 DISTINFO_FILE=         ${.CURDIR}/../gdk-pixbuf/distinfo
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/feh Added a patch needed for ISO C90 complian...
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Added NO_BUILD.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/feh Added a patch needed for ISO C90 complian...
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Added NO_BUILD.
Indexes:
Home | Main Index | Thread Index | Old Index