From 8ad38ecd1c17771f2a3f5875cbd50b4efb4314a2 Mon Sep 17 00:00:00 2001 From: grant Date: Thu, 22 Jan 2004 07:14:59 +0000 Subject: replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. --- cad/acs/Makefile | 4 ++-- cad/boolean/Makefile | 4 ++-- cad/covered-current/Makefile | 4 ++-- cad/covered/Makefile | 4 ++-- cad/geda-examples/Makefile | 4 ++-- cad/geda-symbols/Makefile | 5 ++--- cad/gerbv/Makefile | 4 ++-- cad/gnetlist/Makefile | 4 ++-- cad/gnucap/Makefile | 4 ++-- cad/ipal-current/Makefile | 4 ++-- cad/magic/Makefile | 4 ++-- cad/pcb-current/Makefile | 4 ++-- cad/transcalc/Makefile | 4 ++-- cad/verilog-current/Makefile | 4 ++-- cad/verilog/Makefile | 4 ++-- cad/vipec/Makefile | 4 ++-- 16 files changed, 32 insertions(+), 33 deletions(-) (limited to 'cad') diff --git a/cad/acs/Makefile b/cad/acs/Makefile index dc365bf5ff3..96cd7d08026 100644 --- a/cad/acs/Makefile +++ b/cad/acs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/21 16:32:08 martti Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:21:54 grant Exp $ # DISTNAME= acs-0.29 @@ -9,7 +9,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.geda.seul.org/tools/acs/index.html COMMENT= General purpose circuit simulator -USE_GMAKE= YES +USE_GNU_TOOLS+= make do-build: cd ${WRKSRC}/src && ${MAKE_PROGRAM} ${LOWER_OPSYS} diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile index 1a1c99f6827..fae75fa7888 100644 --- a/cad/boolean/Makefile +++ b/cad/boolean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/10 14:25:42 recht Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:21:54 grant Exp $ # DISTNAME= boolean @@ -18,7 +18,7 @@ REL= 6.4 BUILD_DEPENDS+= cmake>=1.6.6:../../devel/cmake USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make # the zip archive messes up the case of these files which breaks # cmake. diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile index c203dd1301c..cb87ae31980 100644 --- a/cad/covered-current/Makefile +++ b/cad/covered-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/30 17:21:55 cjep Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:21:54 grant Exp $ # DISTNAME= covered-${SNAPDATE} @@ -18,7 +18,7 @@ CONFLICTS+= covered-[0-9]* SNAPDATE= 20021214 GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make TEST_DIRS= ${WRKSRC}/diags/regress TEST_TARGET= #defined diff --git a/cad/covered/Makefile b/cad/covered/Makefile index 98e70b1e744..00e8fe97232 100644 --- a/cad/covered/Makefile +++ b/cad/covered/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/12/09 01:20:36 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.4 2004/01/22 07:21:54 grant Exp $ # DISTNAME= covered-0.2.2 @@ -18,7 +18,7 @@ CONFLICTS+= covered-current-[0-9]* USE_PERL5= YES REPLACE_PERL= diags/verilog/check_test GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make TEST_DIRS= ${WRKSRC}/diags/regress TEST_TARGET= iverilog diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile index 8f0a52a6510..02744454018 100644 --- a/cad/geda-examples/Makefile +++ b/cad/geda-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 07:21:54 grant Exp $ # DISTNAME= geda-examples-${PKGVERSION} @@ -18,7 +18,7 @@ DIST_SUBDIR= geda PKGVERSION= 20030901 GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geda diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile index 0af0f073406..8c5912e2a1e 100644 --- a/cad/geda-symbols/Makefile +++ b/cad/geda-symbols/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/10/29 23:14:22 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.14 2004/01/22 07:21:54 grant Exp $ # DISTNAME= geda-symbols-${PKGVERSION} @@ -18,7 +18,6 @@ DIST_SUBDIR= geda PKGVERSION= 20030901 GNU_CONFIGURE= YES -USE_GMAKE= YES -USE_GNU_TOOLS+= sed +USE_GNU_TOOLS+= make sed .include "../../mk/bsd.pkg.mk" diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 87e281d5c00..5e9a8f42e0a 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/12/30 17:21:55 cjep Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/22 07:21:54 grant Exp $ # DISTNAME= gerbv-0.15 @@ -12,7 +12,7 @@ COMMENT= Gerber file viewer CONFIGURE_ARGS+= --enable-exportpng GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile index c3b84794ca4..62a58690630 100644 --- a/cad/gnetlist/Makefile +++ b/cad/gnetlist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.24 2004/01/22 07:21:54 grant Exp $ # DISTNAME= geda-gnetlist-${PKGVERSION} @@ -25,7 +25,7 @@ CONFLICTS+= gEDA<19991011 GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_BUILDLINK2= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index f60b2a0858a..218386578ac 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/11/08 00:54:22 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 07:21:54 grant Exp $ # DISTNAME= gnucap-0.33 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.geda.seul.org/tools/acs/index.html COMMENT= General purpose circuit simulator USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_GNU_READLINE= YES do-build: diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile index 731f8ce6e1a..1823a6813a2 100644 --- a/cad/ipal-current/Makefile +++ b/cad/ipal-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 21:25:09 grant Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:21:55 grant Exp $ # DISTNAME= ipal-20001210 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make CFLAGS+= -fPIC diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 93d6052295c..ca52bcad79f 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:10 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:21:55 grant Exp $ # DISTNAME= magic-7.1 @@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://vlsi.cornell.edu/magic/ COMMENT= Integrated circuit layout system -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_X11= YES USE_BUILDLINK2= YES MAKE_ENV+= MAGIC_HOME=${PREFIX} diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile index ea171e6822e..3d4cb51647c 100644 --- a/cad/pcb-current/Makefile +++ b/cad/pcb-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/08/17 03:59:08 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2 2004/01/22 07:21:55 grant Exp $ # DISTNAME= pcb-${SNAPDATE} @@ -17,7 +17,7 @@ CONFLICTS+= pcb-[0-9]* SNAPDATE= 20030815 GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make # install to X11BASE until cad/gnetlist is taught to handle pcb installing # to X11BASE and pcb-current installing to LOCALBASE. Alternatively, once diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile index f6f30460170..6f1b84a67f1 100644 --- a/cad/transcalc/Makefile +++ b/cad/transcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:21:55 grant Exp $ # DISTNAME= transcalc-0.13 @@ -13,7 +13,7 @@ COMMENT= Transmission line analysis/synthesis GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../x11/gtk/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk" diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile index 60d88455ac8..b683daad9ef 100644 --- a/cad/verilog-current/Makefile +++ b/cad/verilog-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/08/25 11:21:50 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2004/01/22 07:21:55 grant Exp $ # DISTNAME= verilog-${SNAPDATE} @@ -20,7 +20,7 @@ CONFLICTS+= verilog-[0-9]* SNAPDATE= 20030815 USE_BUILDLINK2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make # # for ipal.h #CPPFLAGS+= -I${LOCALBASE}/include diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile index 9fe4b4b932e..61dce1ae0a3 100644 --- a/cad/verilog/Makefile +++ b/cad/verilog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/02 14:00:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/22 07:21:55 grant Exp $ # DISTNAME= verilog-0.7 @@ -17,7 +17,7 @@ BUILD_DEPENDS+= gperf>=2.7.2:../../devel/gperf CONFLICTS+= verilog-current-[0-9]* GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make # # for ipal.h #CPPFLAGS+= -I${LOCALBASE}/include diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 8846c862366..b28023eaace 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/12/30 17:21:55 cjep Exp $ +# $NetBSD: Makefile,v 1.34 2004/01/22 07:21:55 grant Exp $ # DISTNAME= ViPEC-3.1.3 @@ -13,7 +13,7 @@ BUILD_DEPENDS+= tmake-*:../../devel/tmake USE_BUILDLINK2= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make UNLIMIT_RESOURCES+= datasize CONFLICTS+= vipec-[0-9]* -- cgit v1.2.3