summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/gnetlist/Makefile8
-rw-r--r--devel/autoconf/Makefile6
-rw-r--r--devel/autoconf213/Makefile6
-rw-r--r--devel/automake/Makefile7
-rw-r--r--devel/bison/Makefile10
-rw-r--r--devel/libsigc++/Makefile4
-rw-r--r--devel/libsigc++2/Makefile4
-rw-r--r--graphics/gdk-pixbuf/Makefile.common3
8 files changed, 21 insertions, 27 deletions
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 42fd6f27480..8979bb8a340 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -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 @@ COMMENT= Netlist generation program
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 @@ USE_TOOLS+= gmake
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 --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 9c549d835b9..e539590c8d2 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -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 @@ MAINTAINER= wiz@NetBSD.org
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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= # empty
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-lispdir
-TOOLS_M4= ${LOCALBASE}/bin/gm4
INFO_FILES= autoconf.info standards.info
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index aa1720c7fea..564a1b13a7d 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -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 @@ MAINTAINER= wiz@NetBSD.org
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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --program-transform-name='s/$$/-2.13/'
-TOOLS_M4= ${LOCALBASE}/bin/gm4
USE_MAKEINFO= YES
INFO_FILES= autoconf213.info
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index cfc188143d4..db5adb1cdb9 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -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 @@ COMMENT= GNU Standards-compliant Makefile generator
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 --git a/devel/bison/Makefile b/devel/bison/Makefile
index a503369407c..d4c87990659 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -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 @@ MAINTAINER= cjep@NetBSD.org
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 --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 6ff16e22e28..0b87a68ea97 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -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 @@ USE_LANGUAGES= c c++
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 --git a/devel/libsigc++2/Makefile b/devel/libsigc++2/Makefile
index 664f2ac1869..74b60ca65b4 100644
--- a/devel/libsigc++2/Makefile
+++ b/devel/libsigc++2/Makefile
@@ -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 @@ GNU_CONFIGURE= yes
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 --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index a4acfc2a50b..e7ad5e636c3 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -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 @@ USE_LIBTOOL= YES
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 23:44:21 +0000