diff options
Diffstat (limited to 'cad/boolean/patches')
| -rw-r--r-- | cad/boolean/patches/patch-aa | 82 | ||||
| -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, 189 insertions, 0 deletions
diff --git a/cad/boolean/patches/patch-aa b/cad/boolean/patches/patch-aa new file mode 100644 index 00000000000..5aa0d85d99c --- /dev/null +++ b/cad/boolean/patches/patch-aa @@ -0,0 +1,82 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $ + +--- makefile.gui.orig Sun Sep 17 22:18:44 2000 ++++ makefile.gui Sat Nov 11 19:35:59 2000 +@@ -1,5 +1,5 @@ +-CC = g++ ++CC = ${CXX} + #WXWIN = ../wx_src +-WXWINDOW_LIBPATH= /usr/local/lib ++WXWINDOW_LIBPATH= ${LOCALBASE}/lib + WXWIN = $(WXWINDOW_LIBPATH) + TEMPDIR = ../temp/linuxgui +@@ -11,19 +11,17 @@ + -I$(SRCDIR)/tools \ + -I$(SRCDIR)/bool \ +- -I$(SRCDIR)/drivers \ ++ -I$(SRCDIR)/drivers \ + -I$(SRCDIR)/intrface \ + -I$(SRCDIR)/dosint \ +- -I$(SRCDIR)/list \ +- -I$(WXWIN)/wx/include\ +- -I/usr/local/include\ +- -I/usr/local/lib/wx/include\ +- -I/usr/local/lib/glib/include\ +- -I/usr/local/include\ +- -I/usr/X11R6/include +-LIBDIR = -L/usr/X11R6/lib \ +- -L/usr/local/lib ++ -I$(SRCDIR)/list \ ++ -I${LOCALBASE}/include \ ++ -I${X11BASE}/include \ ++ `glib-config --cflags` \ ++ `gtk-config --cflags` \ ++ `wx-config --cflags` ++LIBDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib \ ++ -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib + XTRAFLAGS = -static + CFLAGS = -D_G_UNIX \ +- -DBIGINDIAN \ + -DLINUX \ + -DWIN_INT \ +@@ -31,15 +29,16 @@ + -fenum-int-equiv \ + -fexceptions \ +- -fguiding-decls \ ++ -fguiding-decls \ + -fno-implicit-templates \ +- -D_REENTRANT -g ++ -D_REENTRANT -g + # -D_REENTRANT -g -D__WXDEBUG__ + # -Wall -D_REENTRANT -g -D__WXDEBUG__ + TEXTLIBS = -ll -lm -lg++ -lstdc++ + LIBS = -lstdc++ -lXmu -lXt \ +- -lwx_gtk \ +- -lgtk -lgdk -lglib -lgmodule \ +- -lpthread -rdynamic -ldl -lXext -lX11 -lm -lgthread +- ++ `glib-config --libs` \ ++ `gtk-config --libs` \ ++ `wx-config --libs` \ ++ --Wl,-export-dynamic -lXext \ ++ -lX11 -lm + PROGNAME = boolean + SRCPOOLS = interface misc bool gdssource drivers tools parser list +@@ -72,8 +71,8 @@ + $(TEMPDIR)/unitsdlg.o \ + $(TEMPDIR)/distdlg.o \ +- $(TEMPDIR)/orderdlg.o \ ++ $(TEMPDIR)/orderdlg.o \ + $(TEMPDIR)/groupdlg.o \ + $(TEMPDIR)/strucdlg.o \ +- $(TEMPDIR)/about.o \ ++ $(TEMPDIR)/about.o \ + $(TEMPDIR)/wait.o \ + $(TEMPDIR)/gdsapp.o \ +@@ -126,5 +125,5 @@ + $(TEMPDIR)/trans.o\ + $(TEMPDIR)/dcclbuf.o\ +- $(TEMPDIR)/windrv.o \ ++ $(TEMPDIR)/windrv.o \ + $(TEMPDIR)/gdsdrout.o \ + $(TEMPDIR)/emaskin.o \ diff --git a/cad/boolean/patches/patch-ab b/cad/boolean/patches/patch-ab new file mode 100644 index 00000000000..429122ae6ff --- /dev/null +++ b/cad/boolean/patches/patch-ab @@ -0,0 +1,36 @@ +$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 new file mode 100644 index 00000000000..738bf9681f1 --- /dev/null +++ b/cad/boolean/patches/patch-ac @@ -0,0 +1,14 @@ +$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 new file mode 100644 index 00000000000..6c62c49d78e --- /dev/null +++ b/cad/boolean/patches/patch-ad @@ -0,0 +1,24 @@ +$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 new file mode 100644 index 00000000000..25f17144fa8 --- /dev/null +++ b/cad/boolean/patches/patch-ae @@ -0,0 +1,10 @@ +$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 new file mode 100644 index 00000000000..b9813fed5ee --- /dev/null +++ b/cad/boolean/patches/patch-af @@ -0,0 +1,11 @@ +$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 new file mode 100644 index 00000000000..4fff94ebf43 --- /dev/null +++ b/cad/boolean/patches/patch-ag @@ -0,0 +1,12 @@ +$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"
|