Work around for PLISTs so that the install machinery should now work on SunOS

9 files changed, 42 insertions, 23 deletions

diff --git a/math/gap/Makefile b/math/gap/Makefile
index f199c7f0d1a..b2961c33e83 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2003/01/04 23:49:56 cjep Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/05 12:43:01 cjep Exp $
 #
 
 DISTNAME=	gap4r3
 PKGNAME=	gap-4.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/ \
 		ftp://ftp.math.rwth-aachen.de/pub/gap4/ \
+		ftp://pell.anu.edu.au/pub/algebra/gap4/ \
 		ftp://ftp.ccs.neu.edu/pub/mirrors/ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}	\
 			fix4r3n4.tar.gz
@@ -27,6 +28,13 @@ 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:
 	( cd ${WRKSRC} && ${GTAR} zxf ${DISTDIR}/fix4r3n4.tar.gz )
 
diff --git a/math/gap/PLIST b/math/gap/PLIST
index 9f292649ebe..ab393ae3d0f 100644
--- a/math/gap/PLIST
+++ b/math/gap/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/31 18:40:43 cjep Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/01/05 12:43:01 cjep Exp $
 bin/gap
-lib/gap4.3/bin/${MACHINE_GNU_PLATFORM}-cc/gac
-lib/gap4.3/bin/${MACHINE_GNU_PLATFORM}-cc/gap
+lib/gap4.3/bin/${GAP_PLATFORM}/gac
+lib/gap4.3/bin/${GAP_PLATFORM}/gap
 lib/gap4.3/cnf/Makefile
 lib/gap4.3/cnf/Makegap.bottom
 lib/gap4.3/cnf/Makegap.in
@@ -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/${MACHINE_GNU_PLATFORM}-cc
+@dirrm lib/gap4.3/bin/${GAP_PLATFORM}-cc
 @dirrm lib/gap4.3/bin
 @dirrm lib/gap4.3
diff --git a/math/gap/gap.package.mk b/math/gap/gap.package.mk
index 03639997c03..6f3fd7d49a9 100644
--- a/math/gap/gap.package.mk
+++ b/math/gap/gap.package.mk
@@ -1,12 +1,20 @@
-# $NetBSD: gap.package.mk,v 1.6 2002/12/31 13:02:33 cjep Exp $
+# $NetBSD: gap.package.mk,v 1.7 2003/01/05 12:43:01 cjep Exp $
 #
 # Set GAP_PKG_NAME in your Makefile. More may appear here later.
 
 # Note that between nb1 == bug fix 3 and nb2 == bug fix 4 there are
 # some interface changes
 
-DEPENDS+=       	gap>=4.3nb5:../../math/gap
+DEPENDS+=       	gap>=4.3nb6:../../math/gap
 GAP_DIRECTORY=  	${LOCALBASE}/lib/gap4.3
 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}
+
diff --git a/math/gp-fplsa/Makefile b/math/gp-fplsa/Makefile
index d96afea91b5..db4243a1bf9 100644
--- a/math/gp-fplsa/Makefile
+++ b/math/gp-fplsa/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/24 00:17:25 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/05 12:43:02 cjep Exp $
 #
 
 DISTNAME=	fplsa
 PKGNAME=	gp-fplsa-1.0
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
diff --git a/math/gp-fplsa/PLIST b/math/gp-fplsa/PLIST
index c5f6a3347b8..e865a2162f2 100644
--- a/math/gp-fplsa/PLIST
+++ b/math/gp-fplsa/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/24 00:17:25 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/05 12:43:02 cjep Exp $
 lib/gap4.3/pkg/fplsa/README.fplsa
-lib/gap4.3/pkg/fplsa/bin/${MACHINE_GNU_PLATFORM}-cc/fplsa4
+lib/gap4.3/pkg/fplsa/bin/${GAP_PLATFORM}/fplsa4
 lib/gap4.3/pkg/fplsa/doc/fplsa.tex
 lib/gap4.3/pkg/fplsa/doc/manual.tex
 lib/gap4.3/pkg/fplsa/doc/manual.dvi
@@ -154,6 +154,6 @@ lib/gap4.3/pkg/fplsa/lib/ufnarovs.in
 @dirrm lib/gap4.3/pkg/fplsa/lib
 @dirrm lib/gap4.3/pkg/fplsa/gap
 @dirrm lib/gap4.3/pkg/fplsa/doc
-@dirrm lib/gap4.3/pkg/fplsa/bin/${MACHINE_GNU_PLATFORM}-cc
+@dirrm lib/gap4.3/pkg/fplsa/bin/${GAP_PLATFORM}
 @dirrm lib/gap4.3/pkg/fplsa/bin
 @dirrm lib/gap4.3/pkg/fplsa
diff --git a/math/gp-grape/Makefile b/math/gp-grape/Makefile
index 124d88ceac5..49ae7a94afd 100644
--- a/math/gp-grape/Makefile
+++ b/math/gp-grape/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/12/23 22:18:24 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/05 12:43:02 cjep Exp $
 #
 
 DISTNAME=	grape4r1
 PKGNAME=	gp-grape-4.1
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.maths.qmul.ac.uk/~leonard/grape4r1/
 EXTRACT_SUFX=	.zoo
diff --git a/math/gp-grape/PLIST b/math/gp-grape/PLIST
index 08918479175..e4088561c56 100644
--- a/math/gp-grape/PLIST
+++ b/math/gp-grape/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/21 08:09:56 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/05 12:43:02 cjep Exp $
 lib/gap4.3/pkg/grape/COPYING
-lib/gap4.3/pkg/grape/bin/${MACHINE_GNU_PLATFORM}-cc/drcanon4
-lib/gap4.3/pkg/grape/bin/${MACHINE_GNU_PLATFORM}-cc/dreadnaut
-lib/gap4.3/pkg/grape/bin/${MACHINE_GNU_PLATFORM}-cc/drtogap4
-lib/gap4.3/pkg/grape/bin/${MACHINE_GNU_PLATFORM}-cc/gap4todr
+lib/gap4.3/pkg/grape/bin/${GAP_PLATFORM}/drcanon4
+lib/gap4.3/pkg/grape/bin/${GAP_PLATFORM}/dreadnaut
+lib/gap4.3/pkg/grape/bin/${GAP_PLATFORM}/drtogap4
+lib/gap4.3/pkg/grape/bin/${GAP_PLATFORM}/gap4todr
 lib/gap4.3/pkg/grape/doc/cnauty.tex
 lib/gap4.3/pkg/grape/doc/colour.tex
 lib/gap4.3/pkg/grape/doc/consmod.tex
@@ -67,6 +67,6 @@ lib/gap4.3/pkg/grape/read.me
 @dirrm lib/gap4.3/pkg/grape/htm
 @dirrm lib/gap4.3/pkg/grape/grh
 @dirrm lib/gap4.3/pkg/grape/doc
-@dirrm lib/gap4.3/pkg/grape/bin/i386--netbsdelf-cc
+@dirrm lib/gap4.3/pkg/grape/bin/${GAP_PLATFORM}
 @dirrm lib/gap4.3/pkg/grape/bin
 @dirrm lib/gap4.3/pkg/grape
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index 0d32781db4b..9f6460da8bd 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/12/23 10:48:12 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/05 12:43:02 cjep Exp $
 #
 
 DISTNAME=	xgap4r16
 PKGNAME=	xgap-4.16
+PKGREVISION=	1
 CATEGORIES=	math x11
 MASTER_SITES=	ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/share/
 EXTRACT_SUFX=	.zoo
diff --git a/math/xgap/PLIST b/math/xgap/PLIST
index aa4bff03088..55aa81a9abd 100644
--- a/math/xgap/PLIST
+++ b/math/xgap/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/04 12:23:00 cjep Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/05 12:43:02 cjep Exp $
 bin/xgap
-lib/gap4.3/pkg/xgap/bin/${MACHINE_GNU_PLATFORM}-cc/xgap
+lib/gap4.3/pkg/xgap/bin/${GAP_PLATFORM}/xgap
 lib/gap4.3/pkg/xgap/doc/answers.tex
 lib/gap4.3/pkg/xgap/doc/diffgap3.tex
 lib/gap4.3/pkg/xgap/doc/gobject.tex
@@ -89,6 +89,6 @@ lib/gap4.3/pkg/xgap/lib/sheet.gd
 @dirrm lib/gap4.3/pkg/xgap/htm
 @dirrm lib/gap4.3/pkg/xgap/examples
 @dirrm lib/gap4.3/pkg/xgap/doc
-@dirrm lib/gap4.3/pkg/xgap/bin/${MACHINE_GNU_PLATFORM}-cc
+@dirrm lib/gap4.3/pkg/xgap/bin/${GAP_PLATFORM}
 @dirrm lib/gap4.3/pkg/xgap/bin
 @dirrm lib/gap4.3/pkg/xgap