From 40614d0b3ca35e2c5b10e307c2c29f92feb73486 Mon Sep 17 00:00:00 2001 From: grant Date: Wed, 17 Sep 2003 19:39:58 +0000 Subject: get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now. --- graphics/aalib/Makefile.common | 4 ++-- graphics/aqsis/Makefile | 4 ++-- graphics/mplayer-share/Makefile.depends | 7 ++----- graphics/ncview/Makefile | 4 ++-- graphics/netpbm/Makefile | 4 ++-- graphics/ogle/Makefile | 4 ++-- graphics/ogle_gui/Makefile | 4 ++-- graphics/xv/Makefile | 6 +----- 8 files changed, 15 insertions(+), 22 deletions(-) (limited to 'graphics') diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common index a7f705ace24..5e9cb77f43c 100644 --- a/graphics/aalib/Makefile.common +++ b/graphics/aalib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:17 grant Exp $ +# $NetBSD: Makefile.common,v 1.9 2003/09/17 19:40:26 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" -USE_GCC2= # defined +USE_PKGSRC_GCC= # defined .endif .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 35bed3eb36c..0371f865951 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/09/12 20:07:18 grant Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/17 19:40:27 grant Exp $ # DISTNAME= aqsis-0.6.4 @@ -17,7 +17,7 @@ USE_GMAKE= yes USE_X11= yes USE_BUILDLINK2= yes -USE_GCC2= # defined +USE_PKGSRC_GCC= # defined .include "../../devel/libargparse/buildlink2.mk" .include "../../graphics/Mesa/buildlink2.mk" diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends index 9c2d7209134..53a2a6aa1db 100644 --- a/graphics/mplayer-share/Makefile.depends +++ b/graphics/mplayer-share/Makefile.depends @@ -1,11 +1,9 @@ -# $NetBSD: Makefile.depends,v 1.20 2003/09/12 21:46:46 jmmv Exp $ +# $NetBSD: Makefile.depends,v 1.21 2003/09/17 19:40:31 grant Exp $ # DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share -.if !empty(MACHINE_PLATFORM:MNetBSD-1.5*) && !defined(USE_GCC3) -USE_GCC2= yes -.endif +GCC_REQD= 2.95.3 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" . include "../../audio/cdparanoia/buildlink2.mk" @@ -39,7 +37,6 @@ USE_X11= YES .include "../../graphics/libungif/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../misc/libdvdread/buildlink2.mk" -.include "../../mk/compiler.mk" .if defined(USE_OSS) . include "../../mk/ossaudio.buildlink2.mk" diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile index 2e983aea74c..795bded5bf1 100644 --- a/graphics/ncview/Makefile +++ b/graphics/ncview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/09/12 20:07:18 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/17 19:40:33 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" -USE_GCC2= # defined +USE_PKGSRC_GCC= # defined .endif .include "../../devel/netcdf/buildlink2.mk" diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 0bb82d86b3d..9c690a8d688 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2003/09/12 20:07:19 grant Exp $ +# $NetBSD: Makefile,v 1.80 2003/09/17 19:40:35 grant Exp $ DISTNAME= netpbm-10.11.8 CATEGORIES= graphics @@ -25,7 +25,7 @@ STAGEDIR= ${WRKDIR}/staging .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -USE_GCC3= # defined +USE_PKGSRC_GCC= # defined .endif .if (${OPSYS} == SunOS) diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index c59b3c8bb89..71e622bdaab 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2003/09/12 20:07:20 grant Exp $ +# $NetBSD: Makefile,v 1.26 2003/09/17 19:40:37 grant Exp $ DISTNAME= ogle-0.9.1 PKGREVISION= 3 @@ -25,7 +25,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" #CONFIGURE_ARGS+= --enable-obsdaudio #CONFIGURE_ARGS+= --disable-sunaudio -USE_GCC2= # defined +GCC_REQD= 2.95.3 .include "../../audio/liba52/buildlink2.mk" .include "../../audio/libmad/buildlink2.mk" diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile index 3b51301b14c..33f9d0a4896 100644 --- a/graphics/ogle_gui/Makefile +++ b/graphics/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/09/12 20:07:21 grant Exp $ +# $NetBSD: Makefile,v 1.20 2003/09/17 19:40:38 grant Exp $ DISTNAME= ogle_gui-0.9.1 PKGREVISION= 2 @@ -17,7 +17,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --bindir=${PREFIX}/lib/ogle -USE_GCC2= # defined +GCC_REQD= 2.95.3 USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 1d3656197ad..14facc24721 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2003/07/17 21:43:16 grant Exp $ +# $NetBSD: Makefile,v 1.50 2003/09/17 19:40:40 grant Exp $ DISTNAME= xv-3.10a PKGREVISION= 5 @@ -46,10 +46,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv -.if defined(USE_GCC3) -. include "../../lang/gcc3/buildlink2.mk" -.endif - .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3