diff options
author | jmc <jmc@pkgsrc.org> | 2003-05-22 03:00:57 +0000 |
---|---|---|
committer | jmc <jmc@pkgsrc.org> | 2003-05-22 03:00:57 +0000 |
commit | a1d616e40add5f6df389deb9165e8312cdce5c96 (patch) | |
tree | fcdfb5555e35ac8bb560709fb3d1d777c526ba2d | |
parent | 1f7e0bf466d4a44fdd10f8c6cfe619958f5ee6ee (diff) | |
download | pkgsrc-a1d616e40add5f6df389deb9165e8312cdce5c96.tar.gz |
Some fixes so this will build. Needs cmake in a builds depend. Actually delete
the 6 patch files not used anymore
-rw-r--r-- | cad/boolean/Makefile | 4 | ||||
-rw-r--r-- | cad/boolean/patches/patch-ab | 36 | ||||
-rw-r--r-- | cad/boolean/patches/patch-ac | 14 | ||||
-rw-r--r-- | cad/boolean/patches/patch-ad | 24 | ||||
-rw-r--r-- | cad/boolean/patches/patch-ae | 10 | ||||
-rw-r--r-- | cad/boolean/patches/patch-af | 11 | ||||
-rw-r--r-- | cad/boolean/patches/patch-ag | 12 |
7 files changed, 3 insertions, 108 deletions
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile index 8ef8fef81dd..ea3e5acf83d 100644 --- a/cad/boolean/Makefile +++ b/cad/boolean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/05/15 23:02:05 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.9 2003/05/22 03:00:57 jmc Exp $ # DISTNAME= boolean @@ -14,6 +14,8 @@ COMMENT= GDSII viewer/editor + (boolean) operations on sets of 2d polygons DIST_SUBDIR= ${PKGNAME_NOREV} REL= 6.4 +BUILD_DEPENDS+= cmake>=1.6.6:../../devel/cmake + USE_BUILDLINK2= YES USE_GMAKE= YES diff --git a/cad/boolean/patches/patch-ab b/cad/boolean/patches/patch-ab deleted file mode 100644 index 429122ae6ff..00000000000 --- a/cad/boolean/patches/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ - ---- ../src/bool/valuesvc.h.orig Mon Apr 3 21:23:56 2000 -+++ ../src/bool/valuesvc.h Thu Aug 31 17:28:22 2000 -@@ -37,6 +37,24 @@ - #define MAXLONG 0x7fffffff
- --
#else --
#include <values.h> -+
-+#else -+
-+#if defined(__NetBSD__) -+
-+#include <math.h> -+
-+#include <float.h> -+
-+#ifndef MAXDOUBLE
-+#define MAXDOUBLE DBL_MAX
-+#endif
-+#ifndef MAXLONG
-+#define MAXLONG 0x7fffffff
-+#endif
-+#else -+
-+#include <values.h> -+
-+#endif
- #endif - -@@ -45,2 +63,4 @@ - -
-+ -+ diff --git a/cad/boolean/patches/patch-ac b/cad/boolean/patches/patch-ac deleted file mode 100644 index 738bf9681f1..00000000000 --- a/cad/boolean/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ - ---- ../src/bool/node.cpp.orig Mon Apr 3 21:23:56 2000 -+++ ../src/bool/node.cpp Thu Aug 31 17:29:18 2000 -@@ -15,5 +15,9 @@ - #include "valuesvc.h"
- #else
-+#if defined(__NetBSD__)
-+#include "valuesvc.h"
-+#else
- #include <values.h>
-+#endif
- #endif
- //this here is to initialize the static iterator of node
diff --git a/cad/boolean/patches/patch-ad b/cad/boolean/patches/patch-ad deleted file mode 100644 index 6c62c49d78e..00000000000 --- a/cad/boolean/patches/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ - -note, the boolean sources seem to have "BIGINDIAN" backwards -hence the backwards looking test. - ---- ../src/gdssourc/gdsio.cpp.orig Tue Apr 18 11:13:08 2000 -+++ ../src/gdssourc/gdsio.cpp Thu Aug 31 18:10:44 2000 -@@ -7,4 +7,16 @@ - */ - -+#if defined(__NetBSD__) -+#include <sys/types.h> -+#include <machine/endian.h> -+#if (BYTE_ORDER == LITTLE_ENDIAN) -+#define BIGINDIAN -+#else -+#ifdef BIGINDIAN -+#undef BIGINDIAN -+#endif /* BIGINDIAN */ -+#endif /* BYTE_ORDER == BIG_ENDIAN */ -+#endif /* __NetBSD__ */ -+ - #ifdef __GNUG__ - #pragma implementation diff --git a/cad/boolean/patches/patch-ae b/cad/boolean/patches/patch-ae deleted file mode 100644 index 25f17144fa8..00000000000 --- a/cad/boolean/patches/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ - ---- ../release_settings.sh.orig Wed Sep 29 15:35:16 1999 -+++ ../release_settings.sh Thu Aug 31 23:02:51 2000 -@@ -49,4 +49,5 @@ - SunOS*4.*sun3* ) arch_dir=sun3.sunos4 ;; - Linux* ) arch_dir=linux ;; -+ NetBSD* ) arch_dir=netbsd ;; - * ) arch_dir=UNKNOWN ;; - esac diff --git a/cad/boolean/patches/patch-af b/cad/boolean/patches/patch-af deleted file mode 100644 index b9813fed5ee..00000000000 --- a/cad/boolean/patches/patch-af +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ - ---- ../../toolmanager.orig Wed Sep 29 15:28:28 1999 -+++ ../../toolmanager Thu Aug 31 22:53:40 2000 -@@ -41,5 +41,5 @@ - # directory where the application is installed (and exit if getloc goes wrong). - # boolean_loc=`getloc BOOLEAN` -- boolean_loc=/usr/tools/boolean -+ boolean_loc=@prefix@/libexec/boolean - [ $? != 0 ] && echo Bad getloc. Exiting ... && exit - diff --git a/cad/boolean/patches/patch-ag b/cad/boolean/patches/patch-ag deleted file mode 100644 index 4fff94ebf43..00000000000 --- a/cad/boolean/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ - ---- ../src/drivers/doubledc.h.orig Fri Sep 15 11:50:52 2000 -+++ ../src/drivers/doubledc.h Thu Nov 16 08:54:32 2000 -@@ -25,4 +25,7 @@ - #include <math.h>
-
-+// needed to pull in the classes from wx/geometry.h -+#define wxUSE_GEOMETRY 1 -+ - #include "wxmatrix.h"
- #include "wx/image.h"
|