details: https://anonhg.NetBSD.org/pkgsrc/rev/272542e381a5
branches: trunk
changeset: 465179:272542e381a5
user: sketch <sketch%pkgsrc.org@localhost>
date: Tue Dec 23 10:37:56 2003 +0000
description:
Use compiler.mk logic, fixing systems with a non-GCC compiler.
diffstat:
math/octave/Makefile | 6 ++----
net/kdenetwork/Makefile | 7 +++----
textproc/sp/Makefile | 6 ++----
3 files changed, 7 insertions(+), 12 deletions(-)
diffs (74 lines):
diff -r 396db3dfd908 -r 272542e381a5 math/octave/Makefile
--- a/math/octave/Makefile Tue Dec 23 10:35:30 2003 +0000
+++ b/math/octave/Makefile Tue Dec 23 10:37:56 2003 +0000
@@ -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 @@
.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 -r 396db3dfd908 -r 272542e381a5 net/kdenetwork/Makefile
--- a/net/kdenetwork/Makefile Tue Dec 23 10:35:30 2003 +0000
+++ b/net/kdenetwork/Makefile Tue Dec 23 10:37:56 2003 +0000
@@ -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 @@
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 @@
.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 -r 396db3dfd908 -r 272542e381a5 textproc/sp/Makefile
--- a/textproc/sp/Makefile Tue Dec 23 10:35:30 2003 +0000
+++ b/textproc/sp/Makefile Tue Dec 23 10:37:56 2003 +0000
@@ -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 @@
.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; \