Instead of setting compiler flags in each package if it uses C99,

allow USE_LANGUAGES+=c99 and let gcc and mipspro do the right thing.
May need to be reviewed/added for other compilers.
ok rillig@

4 files changed, 8 insertions, 29 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 91643bbaf0d..e68dfae06e1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2006/11/30 22:55:31 joerg Exp $
+# $NetBSD: Makefile,v 1.147 2006/12/02 22:32:59 jschauma Exp $
 
 .include "Makefile.common"
 
@@ -13,7 +13,7 @@ CONFLICTS=	geomview<1.8.1nb2  # used to have a program named 'animate'
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
@@ -44,12 +44,6 @@ CONFIGURE_ARGS+=	--without-perl
 # WMF linkage is currently broke, since libMagick would need symbols from libWand
 CONFIGURE_ARGS+=	--without-wmf
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+=		-c99
-.endif
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index c57f6e2697d..d09684ae23e 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/11/09 20:57:40 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2006/12/02 22:32:59 jschauma Exp $
 
 DISTNAME=	cairo-1.2.6
 CATEGORIES=	graphics
@@ -10,6 +10,7 @@ COMMENT=	Vector graphics library with cross-device output support
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LANGUAGES+=		c99
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
@@ -32,12 +33,6 @@ PLIST_SUBST+=		CARBON="@comment "
 
 BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.5.1
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+=			-c99
-.endif
-
 # For snprintf()
 CPPFLAGS.SunOS+=		-D__EXTENSIONS__
 
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 658d1254603..d8516ce00e3 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/11/05 17:23:44 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/02 22:32:59 jschauma Exp $
 
 DISTNAME=	glitz-0.5.6
 PKGREVISION=	2
@@ -11,6 +11,7 @@ COMMENT=	OpenGL 2D graphics library and a backend for gl output in cairo
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LANGUAGES+=		c99
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \
@@ -23,12 +24,6 @@ CONFIGURE_ENV+=	AGL_LIBS="-framework AGL"
 PLIST_SUBST+=	AGL="@comment "
 .endif
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+=		-c99
-.endif
-
 .include "options.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index eee771d4bef..7cfbe2436b5 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/02 22:32:59 jschauma Exp $
 #
 
 DISTNAME=	jasper-1.701.0
@@ -14,15 +14,10 @@ COMMENT=	Software-based reference implementation of the JPEG-2000 codec
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
+USE_LANGUAGES+=		c99
 USE_LIBTOOL=		YES
 CONFIGURE_ARGS+=	--enable-shared --without-x --disable-opengl
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+=		-c99
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jasper
 .for doc in jasper jpeg2000