[pkgsrc/trunk]: pkgsrc replace BUILD_DEPENDS m4 and M4 definition with USE_GN...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53bd518147c4
branches:  trunk
changeset: 466980:53bd518147c4
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Jan 25 03:08:46 2004 +0000

description:
replace BUILD_DEPENDS m4 and M4 definition with USE_GNU_TOOLS+=m4.

diffstat:

 cad/tkgate/Makefile      |  5 ++---
 devel/libsigc++/Makefile |  8 +++-----
 graphics/plplot/Makefile |  6 ++----
 x11/gtk--/Makefile       |  7 ++-----
 4 files changed, 9 insertions(+), 17 deletions(-)

diffs (105 lines):

diff -r d28e0e61b7dc -r 53bd518147c4 cad/tkgate/Makefile
--- a/cad/tkgate/Makefile       Sun Jan 25 02:55:14 2004 +0000
+++ b/cad/tkgate/Makefile       Sun Jan 25 03:08:46 2004 +0000
@@ -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 @@
 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 -r d28e0e61b7dc -r 53bd518147c4 devel/libsigc++/Makefile
--- a/devel/libsigc++/Makefile  Sun Jan 25 02:55:14 2004 +0000
+++ b/devel/libsigc++/Makefile  Sun Jan 25 03:08:46 2004 +0000
@@ -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 @@
 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 -r d28e0e61b7dc -r 53bd518147c4 graphics/plplot/Makefile
--- a/graphics/plplot/Makefile  Sun Jan 25 02:55:14 2004 +0000
+++ b/graphics/plplot/Makefile  Sun Jan 25 03:08:46 2004 +0000
@@ -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 @@
 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 -r d28e0e61b7dc -r 53bd518147c4 x11/gtk--/Makefile
--- a/x11/gtk--/Makefile        Sun Jan 25 02:55:14 2004 +0000
+++ b/x11/gtk--/Makefile        Sun Jan 25 03:08:46 2004 +0000
@@ -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 @@
 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: