diff options
| -rw-r--r-- | audio/festival/Makefile | 4 | ||||
| -rw-r--r-- | audio/flac/Makefile | 4 | ||||
| -rw-r--r-- | audio/mpg123/Makefile.common | 4 | ||||
| -rw-r--r-- | textproc/sablotron/Makefile | 4 | ||||
| -rw-r--r-- | www/apache/Makefile | 4 | ||||
| -rw-r--r-- | www/apache6/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 74127b2e87c..5d54ae3f9e3 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -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 @@ FHOME= ${PREFIX}/share/festival .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 --git a/audio/flac/Makefile b/audio/flac/Makefile index a2a9c2dd3f4..77ac499bbb0 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -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 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm # 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 --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common index 490d6ca4a2c..4520abc0048 100644 --- a/audio/mpg123/Makefile.common +++ b/audio/mpg123/Makefile.common @@ -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 @@ USE_BUILDLINK2= # defined .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 --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 0a1b3c41dfd..badb830ace1 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -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 @@ LIBS+= ${_BLNK_ICONV_LDFLAGS} # 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 --git a/www/apache/Makefile b/www/apache/Makefile index 1e7b321032f..57f11437b0b 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -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 @@ LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK} 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 --git a/www/apache6/Makefile b/www/apache6/Makefile index 743c8d93722..991db11590a 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -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 @@ LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK} 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 |