From 26234744b1d5cdccf6d6849f9ea2413875b32e32 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Thu, 20 Mar 2003 22:39:33 +0000
Subject: Use CFLAGS as well.  Set GAP_PLATFORM in a way to account for other
 CC variables. Fix PLIST. Bump PKGREVISION.

---
 math/gap/Makefile         |  6 +++---
 math/gap/PLIST            |  4 ++--
 math/gap/distinfo         |  3 ++-
 math/gap/patches/patch-ab | 13 +++++++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 math/gap/patches/patch-ab

(limited to 'math')

diff --git a/math/gap/Makefile b/math/gap/Makefile
index 476450f4ac5..967464a19a1 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/01/18 18:22:16 cjep Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/20 22:39:33 jschauma Exp $
 #
 
 DISTNAME=	gap4r3
 PKGNAME=	gap-4.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/ \
 		ftp://ftp.math.rwth-aachen.de/pub/gap/gap4/ \
@@ -26,7 +26,7 @@ CONFIGURE_ENV+=	PREFIX=${PREFIX}
 ALL_TARGET=	default
 
 GAP_DIRECTORY=	${PREFIX}/lib/gap4.3
-GAP_PLATFORM=	${MACHINE_GNU_PLATFORM}-cc
+GAP_PLATFORM=	${MACHINE_GNU_PLATFORM}-${CC}
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == SunOS
diff --git a/math/gap/PLIST b/math/gap/PLIST
index ab393ae3d0f..ea03aee0558 100644
--- a/math/gap/PLIST
+++ b/math/gap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/05 12:43:01 cjep Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/03/20 22:39:33 jschauma Exp $
 bin/gap
 lib/gap4.3/bin/${GAP_PLATFORM}/gac
 lib/gap4.3/bin/${GAP_PLATFORM}/gap
@@ -4310,6 +4310,6 @@ lib/gap4.3/tst/zmodnz.tst
 @dirrm lib/gap4.3/doc/ext
 @dirrm lib/gap4.3/doc
 @dirrm lib/gap4.3/cnf
-@dirrm lib/gap4.3/bin/${GAP_PLATFORM}-cc
+@dirrm lib/gap4.3/bin/${GAP_PLATFORM}
 @dirrm lib/gap4.3/bin
 @dirrm lib/gap4.3
diff --git a/math/gap/distinfo b/math/gap/distinfo
index 76b1b7fd3db..87b61df495f 100644
--- a/math/gap/distinfo
+++ b/math/gap/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/12/22 16:06:33 cjep Exp $
+$NetBSD: distinfo,v 1.4 2003/03/20 22:39:34 jschauma Exp $
 
 SHA1 (gap4r3.tar.gz) = 448d473fdba177aa4ba7d64542cec8bb770e3d61
 Size (gap4r3.tar.gz) = 47025159 bytes
 SHA1 (fix4r3n4.tar.gz) = 77f2e396b5f91504b3b9015b1317c2c25afcdfee
 Size (fix4r3n4.tar.gz) = 1129165 bytes
 SHA1 (patch-aa) = 98d7749f06e4b3c5c6955fe5478b39289ff219c6
+SHA1 (patch-ab) = bb7142d80f71ae0f2b97ff44d24d5fe0e9fa5431
diff --git a/math/gap/patches/patch-ab b/math/gap/patches/patch-ab
new file mode 100644
index 00000000000..cd8f894b3b4
--- /dev/null
+++ b/math/gap/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/03/20 22:39:34 jschauma Exp $
+
+--- Makefile.in.orig	Thu Mar 20 17:34:14 2003
++++ Makefile.in	Thu Mar 20 17:34:49 2003
+@@ -28,7 +28,7 @@
+ ##    - removes any files created by `configure'
+ ##
+ SHELL=/bin/sh
+-CC=@CC@
++CC="@CC@ ${CFLAGS}"
+ BASECC=@BASECC@
+ @SET_MAKE@
+ 
-- 
cgit v1.2.3