diff options
author | grant <grant@pkgsrc.org> | 2003-09-12 20:07:06 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2003-09-12 20:07:06 +0000 |
commit | ac2754dcb77d9e0b1e91ab79e653cff0f20984b3 (patch) | |
tree | b596b8542a4a5c038a220ab491f50d77e0be34b2 /graphics | |
parent | fc9eb6dcc42e52cac845c76befcd934f6539539f (diff) | |
download | pkgsrc-ac2754dcb77d9e0b1e91ab79e653cff0f20984b3.tar.gz |
kill all references to gcc.buildlink2.mk and compiler.mk, and define
USE_GCC2 or USE_GCC3 where appropriate.
the functionality of the old gcc.buildlink2.mk has been rolled into
compiler.mk now, which is automatically used.
more changes to come later...
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/aalib/Makefile.common | 4 | ||||
-rw-r--r-- | graphics/aqsis/Makefile | 4 | ||||
-rw-r--r-- | graphics/ncview/Makefile | 4 | ||||
-rw-r--r-- | graphics/netpbm/Makefile | 5 | ||||
-rw-r--r-- | graphics/ogle/Makefile | 5 | ||||
-rw-r--r-- | graphics/ogle_gui/Makefile | 5 |
6 files changed, 14 insertions, 13 deletions
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" |