[pkgsrc/trunk]: pkgsrc USE_GCC[23], USE_SUNPRO, and USE_MIPSPRO are all depre...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d3cad891d87
branches:  trunk
changeset: 468030:2d3cad891d87
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 09 19:57:54 2004 +0000

description:
USE_GCC[23], USE_SUNPRO, and USE_MIPSPRO are all deprecated.

diffstat:

 audio/festival/Makefile      |  4 ++--
 audio/flac/Makefile          |  4 ++--
 audio/mpg123/Makefile.common |  4 ++--
 textproc/sablotron/Makefile  |  4 ++--
 www/apache/Makefile          |  4 ++--
 www/apache6/Makefile         |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diffs (108 lines):

diff -r 1a4b7516e972 -r 2d3cad891d87 audio/festival/Makefile
--- a/audio/festival/Makefile   Mon Feb 09 18:48:58 2004 +0000
+++ b/audio/festival/Makefile   Mon Feb 09 19:57:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/22 07:15:00 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/02/09 19:57:54 jlam Exp $
 
 DISTNAME=      festival-1.4.1
 PKGREVISION=   1
@@ -29,7 +29,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_SUNPRO)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 PKG_COMPILER?= suncc
 .else
 PKG_COMPILER!= case "${CC_VERSION}" in                                 \
diff -r 1a4b7516e972 -r 2d3cad891d87 audio/flac/Makefile
--- a/audio/flac/Makefile       Mon Feb 09 18:48:58 2004 +0000
+++ b/audio/flac/Makefile       Mon Feb 09 19:57:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/03 12:38:51 abs Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/09 19:57:54 jlam Exp $
 #
 
 DISTNAME=              flac-1.1.0
@@ -29,7 +29,7 @@
 # This version of flac doesn't seem to build correctly with -O3 using
 # the MIPSpro compiler.
 #
-.if defined(USE_MIPSPRO)
+.if !empty(PKGSRC_COMPILER:Mmipspro)
 BUILDLINK_TRANSFORM+=  S:-O3:
 .endif
 
diff -r 1a4b7516e972 -r 2d3cad891d87 audio/mpg123/Makefile.common
--- a/audio/mpg123/Makefile.common      Mon Feb 09 18:48:58 2004 +0000
+++ b/audio/mpg123/Makefile.common      Mon Feb 09 19:57:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2003/12/18 19:04:29 sketch Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/02/09 19:57:55 jlam Exp $
 
 DISTNAME=      mpg123-0.59r
 MPG123_VERSION=        0.59.18
@@ -22,7 +22,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.  if defined(USE_SUNPRO)
+.  if !empty(PKGSRC_COMPILER:Msunpro)
 ALL_TARGET=    solaris
 .  else
 ALL_TARGET=    solaris-gcc${TARGET_SUFFIX}
diff -r 1a4b7516e972 -r 2d3cad891d87 textproc/sablotron/Makefile
--- a/textproc/sablotron/Makefile       Mon Feb 09 18:48:58 2004 +0000
+++ b/textproc/sablotron/Makefile       Mon Feb 09 19:57:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/25 15:29:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/09 19:57:55 jlam Exp $
 
 DISTNAME=              Sablot-1.0.1
 PKGNAME=               ${DISTNAME:S/Sablot/sablotron/}
@@ -30,7 +30,7 @@
 # SunPro needs libCrun and libm.
 #
 # XXX any extra libs needed on IRIX?
-.if defined(USE_SUNPRO)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 LIBS+=                 -lCrun -lm
 .elif !empty(CC_VERSION:Mgcc-2*)
 LIBS+=                 -lstdc++ -lm
diff -r 1a4b7516e972 -r 2d3cad891d87 www/apache/Makefile
--- a/www/apache/Makefile       Mon Feb 09 18:48:58 2004 +0000
+++ b/www/apache/Makefile       Mon Feb 09 19:57:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2003/11/02 05:36:56 grant Exp $
+# $NetBSD: Makefile,v 1.137 2004/02/09 19:57:55 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -111,7 +111,7 @@
 MAKE_ENV+=             LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 # if we are using gcc3, we need to link against libgcc_s, too. This
 # ensures modules can resolve symbols they require from gcc.
-.    if defined(USE_GCC3)
+.    if !empty(CC_VERSION:Mgcc-3*)
 USE_GCC_SHLIB=         YES # defined
 LINK_LIBGCC_LDFLAGS+=  -lgcc_s
 .    endif
diff -r 1a4b7516e972 -r 2d3cad891d87 www/apache6/Makefile
--- a/www/apache6/Makefile      Mon Feb 09 18:48:58 2004 +0000
+++ b/www/apache6/Makefile      Mon Feb 09 19:57:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2003/11/02 09:35:12 cube Exp $
+# $NetBSD: Makefile,v 1.87 2004/02/09 19:57:55 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -113,7 +113,7 @@
 MAKE_ENV+=             LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 # if we are using gcc3, we need to link against libgcc_s, too. This
 # ensures modules can resolve symbols they require from gcc.
-.    if defined(USE_GCC3)
+.    if !empty(CC_VERSION:Mgcc-3*)
 USE_GCC_SHLIB=         # defined
 LINK_LIBGCC_LDFLAGS+=  -lgcc_s
 .    endif