diff options
| author | sketch <sketch@pkgsrc.org> | 2003-12-23 10:37:56 +0000 |
|---|---|---|
| committer | sketch <sketch@pkgsrc.org> | 2003-12-23 10:37:56 +0000 |
| commit | 839613806ef24d5545ec27bb10ff7b00bde026f7 (patch) | |
| tree | 74595757301c8f3d90b395577013d6ca1a69349e | |
| parent | 7422a82dcf0240d929f2f566a3f2232920d777a1 (diff) | |
| download | pkgsrc-839613806ef24d5545ec27bb10ff7b00bde026f7.tar.gz | |
Use compiler.mk logic, fixing systems with a non-GCC compiler.
| -rw-r--r-- | math/octave/Makefile | 6 | ||||
| -rw-r--r-- | net/kdenetwork/Makefile | 7 | ||||
| -rw-r--r-- | textproc/sp/Makefile | 6 |
3 files changed, 7 insertions, 12 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index d4f7ec504a6..15899fad1a5 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2003/11/10 04:25:08 grant Exp $ +# $NetBSD: Makefile,v 1.40 2003/12/23 10:39:30 sketch Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -50,14 +50,12 @@ post-install: .include "../../mk/bsd.prefs.mk" -GCC_VERSION!= ${CC} --version - .if !empty(CC_VERSION:Mgcc-3*) PKG_FAIL_REASON= "Octave does not build with ${CC_VERSION} - please use octave-current." .endif post-patch: -.if ${GCC_VERSION:C/-.*$$//} == egcs +.if !empty(CC_VERSION:Megcs*) @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \ if [ $$EGCS_VERSION -lt 19981201 ]; then \ cd ${WRKSRC}; \ diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index 50e59e80f01..33dc3de3629 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2003/07/17 22:51:18 grant Exp $ +# $NetBSD: Makefile,v 1.66 2003/12/23 10:37:56 sketch Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -32,8 +32,7 @@ CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ FIX_RPATH+= KDE_LDFLAGS KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) +.if !empty(CC_VERSION:Megcs*) PLIST_SRC= ${PKGDIR}/PLIST.egcs .else PLIST_SRC= ${PKGDIR}/PLIST.gcc @@ -51,7 +50,7 @@ CFLAGS+= -I${LOCALBASE}/include .endif post-install: -.if (${GCC_VERSION:C/-.*$$//} != egcs) +.if empty(CC_VERSION:Megcs*) @${FIND} ${KDEBASEDIR}/share/kde/locale -name ksirc.mo | ${XARGS} ${RM} .endif diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index dfa47a13cdf..a5055e13ef8 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/01/29 21:43:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2003/12/23 10:40:46 sketch Exp $ # DISTNAME= sp-1.3.4 @@ -33,10 +33,8 @@ post-install: .include "../../mk/bsd.prefs.mk" -GCC_VERSION!= ${CC} --version - post-patch: -.if (${GCC_VERSION:C/-.*$$//} == egcs) +.if !empty(CC_VERSION:Megcs*) @cd ${WRKSRC}; for FILE in ${PATCHDIR}/egcs-patch-*; do \ ${PATCH} ${PATCH_ARGS} <$$FILE; \ |