diff options
40 files changed, 86 insertions, 92 deletions
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile index 0a4fe3ababa..151490de412 100644 --- a/audio/cheesetracker/Makefile +++ b/audio/cheesetracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/09/12 19:03:58 recht Exp $ +# $NetBSD: Makefile,v 1.23 2003/09/12 20:07:06 grant Exp $ # DISTNAME= cheesetracker-0.5.5 @@ -26,7 +26,6 @@ pre-configure: cd ${WRKSRC} && ${AUTOMAKE} --add-missing .include "../../mk/automake.mk" -.include "../../mk/compiler.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../x11/gtk--/buildlink2.mk" diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 8ff66a665ee..36a72478ef3 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:24:42 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:07 grant Exp $ DISTNAME= RasMol_2.7.1 PKGNAME= rasmol-2.7.1 @@ -19,7 +19,7 @@ MAKE_ENV+= DEPTHDEF="${DEPTHDEF}" .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .if defined(RASMOL_DEPTH) diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile index d3ac7775f6c..f37a6773df6 100644 --- a/cad/fastcap/Makefile +++ b/cad/fastcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:24:52 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:08 grant Exp $ # DISTNAME= fastcap-2.0-15Jul92 @@ -25,7 +25,7 @@ CONFIGURE_SCRIPT= ./config CONFIGURE_ARGS= 4 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif do-install: diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile index 57e01ec8a16..88becd3ab14 100644 --- a/cad/fasthenry/Makefile +++ b/cad/fasthenry/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/07/17 21:24:53 grant Exp $ +# $NetBSD: Makefile,v 1.16 2003/09/12 20:07:09 grant Exp $ # DISTNAME= fasthenry-3.0-12Nov96 @@ -40,7 +40,7 @@ MAKE_ENV+= LIBS="${LIBS}" .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../mk/bsd.pkg.mk" diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index 515c574d007..1dee976f183 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/07/17 21:25:43 grant Exp $ +# $NetBSD: Makefile,v 1.22 2003/09/12 20:07:09 grant Exp $ DISTNAME= gabber-0.8.8 PKGREVISION= 1 @@ -16,13 +16,14 @@ USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +USE_GCC2= # defined + GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-xmms --disable-sigctest .include "../../devel/gal/buildlink2.mk" .include "../../devel/libglade/buildlink2.mk" .include "../../devel/libsigc++10/buildlink2.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../graphics/freetype-lib/buildlink2.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk--/buildlink2.mk" diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile index 87d032d69f1..49042c2f77e 100644 --- a/cross/h8300-hms-gcc/Makefile +++ b/cross/h8300-hms-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/21 16:38:10 martti Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/12 20:07:10 grant Exp $ DISTNAME= gcc-core-3.1 PKGNAME= cross-h8300-hms-gcc-3.1 @@ -32,6 +32,8 @@ CONFIGURE_SCRIPT= ${SRCDIR}/configure SRCDIR= ${WRKDIR}/gcc-3.1 ALL_TARGET= CFLAGS="-O2 -fomit-frame-pointer" all +USE_GCC2= # defined + post-extract: ${LN} -s ${WRKDIR}/newlib-1.10.0/newlib ${SRCDIR}/newlib ${MKDIR} ${WRKSRC} @@ -42,5 +44,4 @@ post-install: ${LN} -s ${H8300_PREFIX}/bin/$$f ${PREFIX}/bin/$$f ; \ done -.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile index 56c1f951948..3d6e6451f7e 100644 --- a/databases/cdb/Makefile +++ b/databases/cdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/21 16:39:05 martti Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:11 grant Exp $ DISTNAME= cdb-0.75 CATEGORIES= databases @@ -12,8 +12,7 @@ ALL_TARGET= it INSTALL_TARGET= setup check .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif pre-build: diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index f7475283480..b5402b67c6a 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2003/09/12 18:36:10 recht Exp $ +# $NetBSD: Makefile,v 1.52 2003/09/12 20:07:12 grant Exp $ # DISTNAME= ddd-3.3.7 @@ -16,6 +16,8 @@ USE_GMAKE= YES TEST_TARGET= check INFO_FILES= ddd-themes.info ddd.info +USE_GCC3= # defined + CONFIGURE_ARGS+= --with-ncurses=no .include "../../mk/bsd.prefs.mk" @@ -46,7 +48,6 @@ post-install: .include "../../devel/binutils/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../mk/compiler.mk" .include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/glib/Makefile b/devel/glib/Makefile index c3e2c6a4118..1d0b6794485 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2003/08/09 10:44:41 seb Exp $ +# $NetBSD: Makefile,v 1.62 2003/09/12 20:07:12 grant Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -39,8 +39,7 @@ CONFIGURE_ENV+= glib_cv_rtldglobal_broken=no .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif GLIB_VERSION= ${DISTNAME:S/glib-//} diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile index 8e2a636ba32..6f052194fcc 100644 --- a/devel/prc-tools/Makefile +++ b/devel/prc-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/08/09 10:44:48 seb Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:13 grant Exp $ # DISTNAME= prc-tools-2.2 @@ -37,6 +37,8 @@ AUTOCONF_REQD= 2.50 USE_MAKEINFO= YES INFO_FILES= prc-tools.info +USE_GCC2= # defined + #CONFIGURE_ARGS+=--target=m68k-palmos CONFIGURE_ARGS+=--enable-targets=m68k-palmos,arm-palmos CONFIGURE_ARGS+=--enable-languages=c,c++ @@ -60,6 +62,5 @@ pre-patch: && ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff .include "../../mk/autoconf.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 116caecb1ae..ee48aa0ca99 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2003/09/06 17:01:42 magick Exp $ +# $NetBSD: Makefile,v 1.29 2003/09/12 20:07:14 grant Exp $ DISTNAME= xemacs-21.5.15 CATEGORIES= editors @@ -15,7 +15,7 @@ PLIST_SUBST+= EMACSVER=xemacs-21.5-b15 MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b15 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../mk/bsd.prefs.mk" diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index 4b0f8d3f6fe..a7b0214a8d8 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/07/17 21:35:46 grant Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:15 grant Exp $ DISTNAME= stella-1.1-src PKGNAME= stella-1.1 @@ -16,7 +16,7 @@ MAKEFILE= makefile ALL_TARGET= unix-x .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti" diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile index 544991b16f6..cb44f530d36 100644 --- a/games/angband-tty/Makefile +++ b/games/angband-tty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/06/11 20:50:53 abs Exp $ +# $NetBSD: Makefile,v 1.17 2003/09/12 20:07:16 grant Exp $ # DISTNAME= angband-283 @@ -23,7 +23,7 @@ ALL_TARGET= angband SPOILERFILE= angband-spoilers.tar.gz .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif do-install: diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 282e69ceeaf..1a009f71234 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/07/13 13:51:41 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2003/09/12 20:07:16 grant Exp $ # DISTNAME= angband-3.0.1 @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-setgid=games --prefix=${PREFIX} .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif # add spoiler files and clean up a bit diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common index 46352369342..a7f705ace24 100644 --- a/graphics/aalib/Makefile.common +++ b/graphics/aalib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2003/07/17 21:40:03 grant Exp $ +# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:17 grant Exp $ DISTNAME= aalib-${DIST_VERS} WRKSRC= ${WRKDIR}/aalib-1.4.0 @@ -19,7 +19,7 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 119a4a2b128..35bed3eb36c 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/18 11:21:01 agc Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/12 20:07:18 grant Exp $ # DISTNAME= aqsis-0.6.4 @@ -17,8 +17,8 @@ USE_GMAKE= yes USE_X11= yes USE_BUILDLINK2= yes +USE_GCC2= # defined -.include "../../mk/gcc.buildlink2.mk" .include "../../devel/libargparse/buildlink2.mk" .include "../../graphics/Mesa/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile index be6e2d3ba55..2e983aea74c 100644 --- a/graphics/ncview/Makefile +++ b/graphics/ncview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 21:41:54 grant Exp $ +# $NetBSD: Makefile,v 1.14 2003/09/12 20:07:18 grant Exp $ DISTNAME= ncview-1.92d CATEGORIES= graphics @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --with-udunits_incdir=${BUILDLINK_PREFIX.udunits}/include CONFIGURE_ARGS+= --with-udunits_libdir=${BUILDLINK_PREFIX.udunits}/lib .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../devel/netcdf/buildlink2.mk" diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 9039a7006a2..0bb82d86b3d 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2003/09/01 10:13:09 cjep Exp $ +# $NetBSD: Makefile,v 1.79 2003/09/12 20:07:19 grant Exp $ DISTNAME= netpbm-10.11.8 CATEGORIES= graphics @@ -25,8 +25,7 @@ STAGEDIR= ${WRKDIR}/staging .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif .if (${OPSYS} == SunOS) diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index 51854658118..c59b3c8bb89 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/07/17 21:41:59 grant Exp $ +# $NetBSD: Makefile,v 1.25 2003/09/12 20:07:20 grant Exp $ DISTNAME= ogle-0.9.1 PKGREVISION= 3 @@ -25,6 +25,8 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" #CONFIGURE_ARGS+= --enable-obsdaudio #CONFIGURE_ARGS+= --disable-sunaudio +USE_GCC2= # defined + .include "../../audio/liba52/buildlink2.mk" .include "../../audio/libmad/buildlink2.mk" .include "../../devel/binutils/buildlink2.mk" @@ -32,5 +34,4 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include "../../graphics/jpeg/buildlink2.mk" .include "../../misc/libdvdread/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile index f36f808faec..3b51301b14c 100644 --- a/graphics/ogle_gui/Makefile +++ b/graphics/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/07/17 21:42:00 grant Exp $ +# $NetBSD: Makefile,v 1.19 2003/09/12 20:07:21 grant Exp $ DISTNAME= ogle_gui-0.9.1 PKGREVISION= 2 @@ -17,6 +17,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --bindir=${PREFIX}/lib/ogle +USE_GCC2= # defined + USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -25,7 +27,6 @@ LDFLAGS+= ${BUILDLINK_LDFLAGS.ogle} .include "../../devel/binutils/buildlink2.mk" .include "../../devel/libglade/buildlink2.mk" .include "../../graphics/ogle/buildlink2.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index d25d820ba85..52444b8aade 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/08/26 02:30:28 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2003/09/12 20:07:21 grant Exp $ PERL5_SNAPSHOT= # empty PERL5_VERS= 5.8.0 @@ -220,6 +220,6 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk .if ${MACHINE_ARCH} == "alpha" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../mk/bsd.pkg.mk" diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 9f6e7bba027..f1b31c4ce70 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/08/09 11:11:36 seb Exp $ +# $NetBSD: Makefile,v 1.21 2003/09/12 20:07:22 grant Exp $ DISTNAME= octave-2.1.33 PKGNAME= octave-2.1.34 @@ -22,8 +22,7 @@ BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif USE_X11= yes diff --git a/math/scilab/Makefile b/math/scilab/Makefile index c1b57a49778..7c63c1b6fc3 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2003/07/17 21:48:08 grant Exp $ +# $NetBSD: Makefile,v 1.41 2003/09/12 20:07:23 grant Exp $ # DISTNAME= ${SCIBASE}.src @@ -63,7 +63,7 @@ post-install: ${RM} -f ${PREFIX}/lib/${PKGNAME}/macros/util/scipad.sci.orig .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif # the "SCI=0 && unset SCI" is done because some of the tests really will diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index f81517b3248..8f5eef868a0 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2003/08/05 13:39:53 drochner Exp $ +# $NetBSD: Makefile,v 1.27 2003/09/12 20:07:23 grant Exp $ DISTNAME= koffice-1.2.1 PKGREVISION= 4 @@ -24,8 +24,9 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +USE_GCC2= # defined + PTHREAD_OPTS+= require -GCC_REQD= 2.95.3 REPLACE_PERL= kpresenter/kprconverter.pl @@ -43,7 +44,6 @@ post-install: .include "../../graphics/libart2/buildlink2.mk" .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index fa293956335..e04d5c907fb 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/07/17 22:51:05 grant Exp $ +# $NetBSD: Makefile,v 1.25 2003/09/12 20:07:24 grant Exp $ # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp # @@ -38,8 +38,7 @@ INSTALL_TARGET= setup check MANVERSION= 20021211 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif post-extract: diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile index 03fd701fc89..0e254588e2c 100644 --- a/net/ucspi-tcp/Makefile +++ b/net/ucspi-tcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 22:51:58 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/12 20:07:25 grant Exp $ # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp DISTNAME= ucspi-tcp-0.88 @@ -21,8 +21,7 @@ ALL_TARGET= it INSTALL_TARGET= setup check .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif post-configure: diff --git a/news/inn/Makefile b/news/inn/Makefile index 1e4adaab7eb..453970416d2 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2003/07/29 16:30:06 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2003/09/12 20:07:25 grant Exp $ DISTNAME= inn-${INN_VERSION} PKGREVISION= 1 @@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif post-patch: diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index 651ff75f159..2869e412542 100644 --- a/print/ghostscript-esp/Makefile.common +++ b/print/ghostscript-esp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2003/07/17 22:52:27 grant Exp $ +# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:26 grant Exp $ DISTNAME= espgs-${GS_VERS}-source BASEGS_VERS= 7.05 @@ -93,6 +93,5 @@ post-install: .include "../../mk/bsd.pkg.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common index da9b56a7345..275c8d4a203 100644 --- a/print/ghostscript-gnu/Makefile.common +++ b/print/ghostscript-gnu/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2003/07/17 22:52:27 grant Exp $ +# $NetBSD: Makefile.common,v 1.9 2003/09/12 20:07:27 grant Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 7.05 @@ -83,6 +83,5 @@ post-install: .include "../../mk/bsd.pkg.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif diff --git a/security/sfs/Makefile b/security/sfs/Makefile index 99729617f16..bbf08625a71 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/08/09 11:21:57 seb Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/12 20:07:27 grant Exp $ # DISTNAME= sfs-0.7.2 @@ -22,6 +22,8 @@ USE_PKGINSTALL= yes USE_BUILDLINK2= yes USE_PERL5= yes +USE_GCC2= # defined + DIST_GCC= 2.95.3 PKG_USERS= sfs:sfs::Self-certifying\\ file\\ system:/ @@ -52,5 +54,4 @@ post-install: .include "../../devel/gmp/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 188eb1ff6f7..611c9f7d607 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2003/07/17 22:55:18 grant Exp $ +# $NetBSD: Makefile,v 1.38 2003/09/12 20:07:28 grant Exp $ DISTNAME= WindowMaker-0.80.2 PKGNAME= windowmaker-0.80.2 @@ -94,6 +94,5 @@ post-install: .include "../../mk/bsd.pkg.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index 885a94b1a99..547a14171f8 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/09/04 03:06:59 erh Exp $ +# $NetBSD: Makefile,v 1.32 2003/09/12 20:07:29 grant Exp $ # PKGNAME= ap-php-${PHP_BASE_VERS} @@ -22,5 +22,4 @@ do-install: .include "../../mk/apache.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 507f174bf77..6900205267e 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2003/07/19 12:34:18 tron Exp $ +# $NetBSD: Makefile,v 1.73 2003/09/12 20:07:29 grant Exp $ DISTNAME= mod_ssl-2.8.15-1.3.28 PKGNAME= ap-ssl-2.8.15 @@ -100,5 +100,4 @@ post-install: .include "../../security/openssl/buildlink2.mk" .include "../../www/apache/buildlink2.mk" -.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 89dd3b3c392..45e734c4d88 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2003/09/11 04:13:04 jlam Exp $ +# $NetBSD: Makefile,v 1.55 2003/09/12 20:07:31 grant Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 6 @@ -96,12 +96,11 @@ post-install: # XXX See below for NetBSD/alpha issues. .if ${MACHINE_ARCH} == "alpha" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3=YES -. include "../../mk/gcc.buildlink2.mk" +USE_GCC3= # defined .endif .include "../../archivers/bzip2/buildlink2.mk" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 361354b7a9c..5fd40b826c6 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2003/09/11 04:13:05 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2003/09/12 20:07:32 grant Exp $ DISTNAME= kdelibs-3.1.3 PKGREVISION= 2 @@ -109,7 +109,7 @@ post-install: ) > ${PLIST_SRC} .if ${MACHINE_ARCH} == "alpha" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../archivers/bzip2/buildlink2.mk" .include "../../audio/arts/buildlink2.mk" diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index 803f657be65..74f1889f3e1 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/08/31 12:01:16 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2003/09/12 20:07:33 grant Exp $ DISTNAME= neXtaw-0.14.1 CATEGORIES= x11 @@ -21,7 +21,7 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-alpha) -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif post-install: diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile index adb32521fd8..646c8830d8a 100644 --- a/x11/xephem/Makefile +++ b/x11/xephem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/07/17 22:56:55 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/09/12 20:07:33 grant Exp $ DISTNAME= xephem-3.5.2 PKGREVISION= 1 @@ -24,7 +24,7 @@ BUILD_DIRS= ${LIBSRC1} ${LIBSRC2} ${WRKSRC} INSTALL_DIRS= ${WRKSRC} .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif post-install: diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 22b3e6d4ac9..cf3514f8d5e 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2003/07/17 22:56:55 grant Exp $ +# $NetBSD: Makefile,v 1.37 2003/09/12 20:07:34 grant Exp $ DISTNAME= xfce-3.8.18 PKGREVISION= 2 @@ -22,7 +22,7 @@ USE_GMAKE= # defined GNU_CONFIGURE= # defined .if ${MACHINE_ARCH} == "alpha" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif CONFIGURE_ARGS+= --without-included-gettext diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile index a3d87bb62e3..67e8e0aa1c3 100644 --- a/x11/xphoon/Makefile +++ b/x11/xphoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/06/11 20:51:00 abs Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:35 grant Exp $ # DISTNAME= xphoon.tar @@ -22,7 +22,7 @@ MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS} .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .if ${OPSYS} == "NetBSD" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 4e1678fafbc..c8a851a4e44 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.54 2003/09/08 12:15:41 wiz Exp $ +# $NetBSD: Makefile.common,v 1.55 2003/09/12 20:07:35 grant Exp $ # DISTNAME= xscreensaver-4.13 @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --without-kerberos .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -. include "../../mk/gcc.buildlink2.mk" +USE_GCC2= # defined .endif .include "../../graphics/gle/buildlink2.mk" |