summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-01-25 03:08:46 +0000
committergrant <grant@pkgsrc.org>2004-01-25 03:08:46 +0000
commitfd49d1a855d6081bb874af52b038f0531dc6a9a1 (patch)
treefa855173b773787e6a949665703ab3df49fc6f8b
parentf9d1cda00bc4cd4f34ee12d52ee27bbef009a7ab (diff)
downloadpkgsrc-fd49d1a855d6081bb874af52b038f0531dc6a9a1.tar.gz
replace BUILD_DEPENDS m4 and M4 definition with USE_GNU_TOOLS+=m4.
-rw-r--r--cad/tkgate/Makefile5
-rw-r--r--devel/libsigc++/Makefile8
-rw-r--r--graphics/plplot/Makefile6
-rw-r--r--x11/gtk--/Makefile7
4 files changed, 9 insertions, 17 deletions
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 5334eba2a15..0fc6d6714cb 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:25:24 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/25 03:08:46 grant Exp $
#
DISTNAME= tkgate-1.6i
@@ -12,12 +12,11 @@ HOMEPAGE= http://www-2.cs.cmu.edu/~hansen/tkgate/
COMMENT= Tcl/Tk based digital circuit editor and simulator
BUILD_DEPENDS+= bison>=1.35:../../devel/bison
-BUILD_DEPENDS+= m4>=1.4:../../devel/m4
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
USE_BUILDLINK2= yes
USE_IMAKE= yes
-M4= ${LOCALBASE}/bin/gm4
+USE_GNU_TOOLS+= m4
TKGATE_SITENAME= Earth
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 638e962e607..a2ab90e998b 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/22 08:24:30 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/25 03:08:47 grant Exp $
DISTNAME= libsigc++-1.2.5
CATEGORIES= devel
@@ -8,18 +8,16 @@ MAINTAINER= bsieker@freenet.de
HOMEPAGE= http://libsigc.sourceforge.net/
COMMENT= Type-safe callback system for C++ programs
-BUILD_DEPENDS= m4>=1.4:../../devel/m4
-
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_GNU_TOOLS+= m4 make
USE_GCC_SHLIB= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/sigc++-1.2.pc.in
-CONFIGURE_ENV+= ac_cv_prog_M4=${LOCALBASE}/bin/gm4
+CONFIGURE_ENV+= ac_cv_prog_M4=${M4}
.include "../../mk/pthread.buildlink2.mk"
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index f2984a03e91..0853dc0bdb7 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/25 03:08:47 grant Exp $
DISTNAME= plplot-5.2.1
CATEGORIES= graphics
@@ -8,11 +8,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://plplot.sourceforge.net/
COMMENT= Scientific plotting package
-BUILD_DEPENDS+= m4>=1.4:../../devel/m4
-
USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make
+USE_GNU_TOOLS+= m4 make
USE_FORTRAN= # defined
USE_X11= # defined
USE_PERL5= build
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 98f44ca4d85..21a1162a4c7 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/25 03:08:47 grant Exp $
#
DISTNAME= gtkmm-1.2.10
@@ -12,19 +12,16 @@ MAINTAINER= bsieker@freenet.de
HOMEPAGE= http://gtkmm.sourceforge.net/
COMMENT= C++ wrapper for GTK+
-BUILD_DEPENDS+= m4>=1.4:../../devel/m4
-
USE_X11BASE= YES
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_PERL5= build
-USE_GNU_TOOLS+= make
+USE_GNU_TOOLS+= m4 make
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS= --enable-static
-M4= ${LOCALBASE}/bin/gm4
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
post-install: