From ca2057f39c5f723f17691e09eb7dc1240cddc656 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Sat, 8 Nov 2003 00:54:22 +0000
Subject: create a 'pkgsrc' type system in the gnucap build system and call
 that rather than using LOWER_OPSYS.  This is because the couple of os's that
 had correct targets were the same and others that pkgsrc works on aren't
 listed at all (like solaris).  Fixes build problems noted on solaris.

---
 cad/gnucap/Makefile         |  6 +++---
 cad/gnucap/distinfo         |  4 +++-
 cad/gnucap/patches/patch-ac | 16 ++++++++++++++++
 cad/gnucap/patches/patch-ad | 16 ++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 cad/gnucap/patches/patch-ac
 create mode 100644 cad/gnucap/patches/patch-ad

(limited to 'cad')

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 16291b88e9e..f60b2a0858a 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:32:11 martti Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/08 00:54:22 dmcmahill Exp $
 #
 
 DISTNAME=	gnucap-0.33
@@ -14,8 +14,8 @@ USE_GMAKE=		YES
 USE_GNU_READLINE=	YES
 
 do-build:
-	@cd ${WRKSRC}/modelgen && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${LOWER_OPSYS}
-	@cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${LOWER_OPSYS}
+	@cd ${WRKSRC}/modelgen && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pkgsrc
+	@cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pkgsrc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/*/gnucap ${PREFIX}/bin/
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 92fff048aba..8345c93017b 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/04/21 03:06:29 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2003/11/08 00:54:22 dmcmahill Exp $
 
 SHA1 (gnucap-0.33.tar.gz) = 67fe6ccc4e16807d842c5f0377b66a16c2904edf
 Size (gnucap-0.33.tar.gz) = 1387565 bytes
 SHA1 (patch-aa) = 404d6f926f4985a7d117e1361e9c2c9cabd6323b
 SHA1 (patch-ab) = 519cd313b023be49ee19018d4eb88697fcb739e3
+SHA1 (patch-ac) = b87c6eb33b427a154b03802e7633048b4ed003ab
+SHA1 (patch-ad) = 58ddab0864cc950e39f46c2230da2280ab26e19c
diff --git a/cad/gnucap/patches/patch-ac b/cad/gnucap/patches/patch-ac
new file mode 100644
index 00000000000..0b5eefe3b45
--- /dev/null
+++ b/cad/gnucap/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2003/11/08 00:54:22 dmcmahill Exp $
+
+--- modelgen/Makefile.orig	2002-11-06 02:47:55.000000000 -0500
++++ modelgen/Makefile
+@@ -77,6 +77,11 @@ netbsd: nothing
+ 	cat Make1 Make2.g++ Make3 Make.depend >NETBSD/Makefile
+ 	(cd NETBSD; ${MAKE} -k)
+ #-----------------------------------------------------------------------------
++pkgsrc: nothing
++	-mkdir PKGSRC
++	cat Make1 Make2.g++ Make3 Make.depend >PKGSRC/Makefile
++	(cd PKGSRC; ${MAKE} -k)
++#-----------------------------------------------------------------------------
+ next: nothing
+ 	-mkdir NEXT
+ 	cat Make1 Make2.g++ Make3 Make.depend >NEXT/Makefile
diff --git a/cad/gnucap/patches/patch-ad b/cad/gnucap/patches/patch-ad
new file mode 100644
index 00000000000..f5d547a053b
--- /dev/null
+++ b/cad/gnucap/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2003/11/08 00:54:22 dmcmahill Exp $
+
+--- src/Makefile.orig	2002-11-06 02:47:55.000000000 -0500
++++ src/Makefile
+@@ -77,6 +77,11 @@ netbsd: nothing
+ 	cat Make1 Make2.g++ Make3 Make.depend >NETBSD/Makefile
+ 	(cd NETBSD; ${MAKE} -k)
+ #-----------------------------------------------------------------------------
++pkgsrc: nothing
++	-mkdir PKGSRC
++	cat Make1 Make2.g++ Make3 Make.depend >PKGSRC/Makefile
++	(cd PKGSRC; ${MAKE} -k)
++#-----------------------------------------------------------------------------
+ next: nothing
+ 	-mkdir NEXT
+ 	cat Make1 Make2.g++ Make3 Make.depend >NEXT/Makefile
-- 
cgit v1.2.3