diff options
author | hubertf <hubertf> | 2004-05-20 11:09:16 +0000 |
---|---|---|
committer | hubertf <hubertf> | 2004-05-20 11:09:16 +0000 |
commit | a6375a3b2020b9c3acc318dd3341b54c7718266c (patch) | |
tree | eed4c22ae00d36cc77676c59c671196a4bb76d0c /lang/swi-prolog-lite/patches | |
parent | 3f7db4adfdedddb0d0afac6eac497482bada02ce (diff) | |
download | pkgsrc-a6375a3b2020b9c3acc318dd3341b54c7718266c.tar.gz |
move over swi-prolog-lite from pkgsrc-wip
Diffstat (limited to 'lang/swi-prolog-lite/patches')
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-aa | 50 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ab | 13 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ac | 13 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ad | 13 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ae | 31 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-af | 22 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ag | 13 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ah | 14 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ai | 19 |
9 files changed, 188 insertions, 0 deletions
diff --git a/lang/swi-prolog-lite/patches/patch-aa b/lang/swi-prolog-lite/patches/patch-aa new file mode 100644 index 00000000000..bddd855de7b --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-aa @@ -0,0 +1,50 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- src/Makefile.in.orig Tue Apr 9 20:09:31 2002 ++++ src/Makefile.in Wed May 1 19:41:34 2002 +@@ -63,6 +63,7 @@ + ARCH=@ARCH@ + INSTALL=@INSTALL@ + INSTALL_PROGRAM=@INSTALL_PROGRAM@ ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + MKDIR=@MKDIR@ + REL_LN=$(srcdir)/rel-ln +@@ -71,8 +72,9 @@ + CWFLAGS=@CWFLAGS@ + CIFLAGS=@CIFLAGS@ + CMFLAGS=@CMFLAGS@ +-CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) ++CFLAGS+= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) + LDFLAGS=@LDFLAGS@ ++CPPFLAGS=@CPPFLAGS@ + + PLFOREIGN=@PLFOREIGN@ + +@@ -135,7 +137,7 @@ + plld + + .c.o: +- $(CC) -c -I. -I$(srcdir) -I$(srcdir)/rc $(CFLAGS) $< @COUTOPT@ ++ $(CC) -c -I. -I$(srcdir) -I$(srcdir)/rc $(CPPFLAGS) $(CFLAGS) $< @COUTOPT@ + + system: $(PL) + startup: $(STARTUPPATH) +@@ -242,7 +244,7 @@ + ar x `$(CC) -print-libgcc-file-name` $@ + + plld: $(srcdir)/plld.c +- $(CC) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/plld.c ++ $(CC) -I. -I$(srcdir) $(CPPFLAGS) $(CFLAGS) -o $@ $(srcdir)/plld.c + + tags: $(srcdir)/TAGS + +@@ -322,7 +324,7 @@ + $(INSTALL_DATA) ../dotfiles/dotplrc $(PLBASE)/dotfiles + $(INSTALL_DATA) ../dotfiles/dotxpcerc $(PLBASE)/dotfiles + $(INSTALL_DATA) ../dotfiles/README $(PLBASE)/dotfiles +- $(INSTALL_PROGRAM) ../dotfiles/edit $(PLBASE)/dotfiles ++ $(INSTALL_SCRIPT) ../dotfiles/edit $(PLBASE)/dotfiles + + iinclude:: + cd ../include; \ diff --git a/lang/swi-prolog-lite/patches/patch-ab b/lang/swi-prolog-lite/patches/patch-ab new file mode 100644 index 00000000000..0c36bf7d647 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- src/configure.orig Tue Apr 16 10:03:45 2002 ++++ src/configure Wed May 1 19:21:58 2002 +@@ -978,7 +978,7 @@ + EXTRAOBJ="" + EXTRAHDR="" + INSTALLTARGET=dv-install +-PL=pl ++#PL=pl + PLLIB=libpl.a + RT="" + PLVERSION=`cat ../VERSION` diff --git a/lang/swi-prolog-lite/patches/patch-ac b/lang/swi-prolog-lite/patches/patch-ac new file mode 100644 index 00000000000..80c20de0060 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- packages/xpce/Makefile.in.orig Tue Apr 20 18:56:26 2004 ++++ packages/xpce/Makefile.in +@@ -4,7 +4,7 @@ + # See also ./configure + ################################################################ + +-MAKE=@MAKE@ ++MAKE=gmake + BUILDARCH=@BUILDARCH@ + + all:: diff --git a/lang/swi-prolog-lite/patches/patch-ad b/lang/swi-prolog-lite/patches/patch-ad new file mode 100644 index 00000000000..a62cab2c7c8 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- packages/Makefile.in.orig Thu Oct 16 16:06:35 2003 ++++ packages/Makefile.in +@@ -33,7 +33,7 @@ CNFG=@CNFG@ + + # Values filled from the main SWI-Prolog configure + +-MAKE=@MAKE@ ++MAKE=gmake + prefix=@prefix@ + exec_prefix=@exec_prefix@ + bindir=@bindir@ diff --git a/lang/swi-prolog-lite/patches/patch-ae b/lang/swi-prolog-lite/patches/patch-ae new file mode 100644 index 00000000000..6231ca76568 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ae @@ -0,0 +1,31 @@ +$NetBSD: patch-ae,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- packages/xpce/pl/src/Makefile.orig 2003-10-10 12:24:18.000000000 +0200 ++++ packages/xpce/pl/src/Makefile +@@ -33,7 +33,7 @@ BINDIR= ../../$(builddir) + OBJDIR= ../../$(builddir)/pl + CONFIG= ../../$(builddir)/config.h + +-CPLIFLAGS= -I$(PLINCL) -I../../$(builddir) -I../../src ++CPLIFLAGS= -I$(PLINCL) -I../../$(builddir) -I../../src -I${X11BASE}/include + PL= pl + PLLD= plld -pl $(PL) + ITFOBJ= $(addprefix $(OBJDIR)/, interface.o link.o pcecall.o) +@@ -114,14 +114,14 @@ $(XPCESO): $(SOITF) $(libXPCE) $(SOEXTR) + fi + + sopce$(XPCESO): +- LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ ++ LD_RUN_PATH="$(libdir):${X11BASE}/lib:$$LD_RUN_PATH"; \ + export LD_RUN_PATH; \ + $(PLLD) -shared $(SOITF) -L$(XLIB) -L$(LIBDIR) -lXPCE -o $(XPCESO); + axpce$(XPCESO): +- LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ ++ LD_RUN_PATH="$(libdir):${X11BASE}/lib:$$LD_RUN_PATH"; \ + export LD_RUN_PATH; \ + $(PLLD) -shared $(SOITF) $(SOEXTR) -L$(LIBDIR) \ +- -lXPCE $(GCCLIB) -L$(XLIB) $(XLIBS) $(NETLIBS) -o $(XPCESO); ++ -lXPCE $(GCCLIB) -L$(XLIB) -Wl,-R${XLIB} -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib $(XLIBS) $(NETLIBS) -o $(XPCESO); + + ################################################################$ + # QLF generation diff --git a/lang/swi-prolog-lite/patches/patch-af b/lang/swi-prolog-lite/patches/patch-af new file mode 100644 index 00000000000..ef8500cf440 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- packages/xpce/src/Makefile.in.orig Sat Jan 17 18:28:41 2004 ++++ packages/xpce/src/Makefile.in +@@ -88,7 +88,7 @@ NETLIBS=@NETLIBS@ + XLIBS=@XLIBS@ + LDFLAGS=-L$(XLIB) @LDFLAGS@ + GCCLIB=@GCCLIB@ +-LDSOFLAGS=@LDSOFLAGS@ -L$(XLIB) ++LDSOFLAGS=@LDSOFLAGS@ -L$(XLIB) -Wl,-R${XLIB} -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib + SOEXTRAOBJ=@SOEXTRAOBJ@ + SO=@SO@ + VWS=@VWS@ +@@ -107,7 +107,7 @@ LIBS= $(XLIBS) $(NETLIBS) -lm + + COFLAGS=@COFLAGS@ + CWFLAGS=@CWFLAGS@ +-CIFLAGS=-I. -I$(srcdir) @CIFLAGS@ ++CIFLAGS=-I. -I$(srcdir) @CIFLAGS@ -I${LOCALBASE}/include + CMFLAGS=@CMFLAGS@ @DEFS@ + CFLAGS=$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) + diff --git a/lang/swi-prolog-lite/patches/patch-ag b/lang/swi-prolog-lite/patches/patch-ag new file mode 100644 index 00000000000..c0d76124c87 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- src/pl-incl.h.orig 2004-01-05 10:43:45.000000000 +0100 ++++ src/pl-incl.h +@@ -206,7 +206,7 @@ gcc. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + + #ifndef __unix__ +-#if defined(_AIX) || defined(__APPLE__) || defined(__unix) || defined(__BEOS__) ++#if defined(_AIX) || defined(__APPLE__) || defined(__unix) || defined(__BEOS__) || defined(__NetBSD__) + #define __unix__ 1 + #endif + #endif diff --git a/lang/swi-prolog-lite/patches/patch-ah b/lang/swi-prolog-lite/patches/patch-ah new file mode 100644 index 00000000000..37e0e8e54a6 --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- src/pl-xterm.c.orig Thu Apr 22 16:35:01 2004 ++++ src/pl-xterm.c +@@ -27,7 +27,8 @@ + #endif + + #include "pl-incl.h" +-#if defined(HAVE_GRANTPT) && defined(O_PLMT) ++#if defined(HAVE_GRANTPT) && defined(O_PLMT) \ ++ && !defined(__FreeBSD__) /* grantpt is borked on freebsd up to 5.2.1-rc */ + + /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Open an alternative xterm-console. Used to support multi-threading diff --git a/lang/swi-prolog-lite/patches/patch-ai b/lang/swi-prolog-lite/patches/patch-ai new file mode 100644 index 00000000000..5f41fc2d0cd --- /dev/null +++ b/lang/swi-prolog-lite/patches/patch-ai @@ -0,0 +1,19 @@ +$NetBSD: patch-ai,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ + +--- packages//xpce/src/unx/process.c.orig 2002-02-01 16:05:02.000000000 +0100 ++++ packages//xpce/src/unx/process.c +@@ -45,7 +45,13 @@ simulated using CreatePipe() and CreateP + reduced to the facility to terminate the inferior process. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + +-#ifdef __unix__ ++/* that's not passed down, and pulling in src/pl-incl.h doesn't work ++ for some reason - HF */ ++#ifdef __NetBSD__ ++# define __unix__ 1 ++#endif ++ ++#if defined(__unix__) + #define HAVE_FORK 1 + #define HAVE_PTYS 1 + #define HAVE_KILL 1 |