From f12aacd1157c3b9f2988f49022a3e7abc23155bc Mon Sep 17 00:00:00 2001
From: sketch <sketch@pkgsrc.org>
Date: Thu, 18 Dec 2003 14:44:17 +0000
Subject: Remove hacks for Solaris which worked around a bug in mk/bsd.prefs.mk
 before -r1.130.  They are now preventing this package from installing.

Bump PKGREVISION.
---
 math/gap/Makefile       | 9 ++-------
 math/gap/gap.package.mk | 7 +------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'math/gap')

diff --git a/math/gap/Makefile b/math/gap/Makefile
index 335e716c36d..bbeb4e99126 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:47:31 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/18 14:44:17 sketch Exp $
 #
 
 DISTNAME=	gap4r3
 PKGNAME=	gap-4.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/ \
 		ftp://ftp.math.rwth-aachen.de/pub/gap/gap4/ \
@@ -28,11 +28,6 @@ ALL_TARGET=	default
 GAP_DIRECTORY=	${PREFIX}/lib/gap4.3
 GAP_PLATFORM=	${MACHINE_GNU_PLATFORM}-${CC}
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == SunOS
-GAP_PLATFORM=	${MACHINE_GNU_PLATFORM}2-${CC}
-.endif
-
 PLIST_SUBST=	GAP_PLATFORM=${GAP_PLATFORM}
 
 post-extract:
diff --git a/math/gap/gap.package.mk b/math/gap/gap.package.mk
index 1cd61f578cf..cc40e2410df 100644
--- a/math/gap/gap.package.mk
+++ b/math/gap/gap.package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gap.package.mk,v 1.8 2003/03/28 21:24:25 wiz Exp $
+# $NetBSD: gap.package.mk,v 1.9 2003/12/18 14:44:17 sketch Exp $
 #
 # Set GAP_PKG_NAME in your Makefile. More may appear here later.
 
@@ -11,9 +11,4 @@ GAP_PKG_ROOT=		${GAP_DIRECTORY}/pkg
 GAP_PKG_DIRECTORY=	${GAP_PKG_ROOT}/${GAP_PKG_NAME}
 GAP_PLATFORM=   	${MACHINE_GNU_PLATFORM}-cc
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == SunOS
-GAP_PLATFORM=   ${MACHINE_GNU_PLATFORM}2-${CC}
-.endif
-
 PLIST_SUBST=    GAP_PLATFORM=${GAP_PLATFORM}
-- 
cgit v1.2.3