Updated gprolog to 1.3.0.

Change in GNU Prolog version 1.3.0:

* official release (Jan 4 2007)
* change error messages emitted by the compiler to follow GNU standards
* modify doc (mainly rename manual.xxx to gprolog.xxx)
* add DESTDIR variable support in main Makefile for staged installs
* fix a bug with Prolog floats in x86_64/linux (bad stack alignment)
* port for ix86/darwin (Mac OS X)
* add check target to main Makefile
* improve Win32 ports (cygwin, MinGW, MSVC 6.0 and 2005 Express Edition)
  (MSVC port uses MinGW as.exe instead of nasm.exe - named mingw-as.exe
   provided in the setup.exe)
* rename call/2 to call_det/2
* implement call/2-11 as will be defined in the next standard
* fix various problems when compiling with gcc 4 (gcc 4.1.1)
* emit .note.GNU-stack to mark the stack as no executable
  in x86_any.c, x86_64_any.c and powerpc_any.c
* change the way objects are found (obj_chain.c) using gcc ctors
* use Doug Lea malloc for OpenBSD (problem with malloc using mmap)
* fix problems in various ports:
  alpha/linux, powerpc/darwin (Mac OS X), sparc/solaris, ix86/OpenBSD

Change in GNU Prolog version 1.2.19:

* fix 2 bugs in global variables

Change in GNU Prolog version 1.2.18:

* fix problem when compiling with gcc 3.4.0
* fix bug in term comparison involving negative integers
* add consult, ... and fix minor bugs in the Win32 GUI console menu
* fix the stack overflow detection under cygwin
* port to ix86/MinGW - many thanks to:
  Cesar Rabak <csrabak@ig.com.br>
* fix a problem in the port to x86/OpenBSD
* port to sparc/NetBSD and powerpc/NetBSD - many thanks to:
  Jason Beegan <jtb@netbsd.org>
* fix a bug in =../2 involving FD variables
* fix a bug in arithmetics (in float_{integer/fractional}_part)
* fix a bug in FD solver (wrong union with a singleton)

Change in GNU Prolog version 1.2.17:

* change configure.in: by default ebp is not used
* fix a but with CTRL+C handler not reinstalled
* fix a bug with _XXX (re)displayed under the top-level
* port to x86_64/linux - many thanks to:
  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>

17 files changed, 157 insertions, 448 deletions

diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 123d347e3c0..025b0f54d69 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.11 2007/12/01 12:27:59 rillig Exp $
 
-DISTNAME=		gprolog-1.2.16
+DISTNAME=		gprolog-1.3.0
 CATEGORIES=		lang
-MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/
+MASTER_SITES=		${HOMEPAGE}
 
 MAINTAINER=		brook@nmsu.edu
-HOMEPAGE=		http://gnu-prolog.inria.fr/
+HOMEPAGE=		http://www.gprolog.org/
 COMMENT=		GNU prolog compiler and interpreter
 
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-powerpc *-*-sparc
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/libexec/${PKGNAME} \
+CONFIGURE_DIRS=		src
+CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/lib/${PKGNAME_NOREV} \
 			--with-doc-dir=${PREFIX}/share/doc/gprolog \
-			--with-html-dir=${PREFIX}/share/doc/html/gprolog \
+			--with-html-dir=${PREFIX}/share/doc/gprolog/html \
 			--with-examples-dir=${PREFIX}/share/examples/gprolog \
-			--with-c-flags='-O3 -finline-functions -fomit-frame-pointer -D__unix__=1'
+			--with-c-flags=${CFLAGS:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gprolog/PLIST b/lang/gprolog/PLIST
index c4577f18c4f..ba9a8fdca28 100644
--- a/lang/gprolog/PLIST
+++ b/lang/gprolog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/13 20:15:11 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/01 12:27:59 rillig Exp $
 bin/fd2c
 bin/gplc
 bin/gprolog
@@ -6,8 +6,117 @@ bin/hexgplc
 bin/ma2asm
 bin/pl2wam
 bin/wam2ma
-libexec/${PKGNAME}/COPYING
-libexec/${PKGNAME}/ChangeLog
+lib/${PKGNAME}/COPYING
+lib/${PKGNAME}/ChangeLog
+lib/${PKGNAME}/NEWS
+lib/${PKGNAME}/VERSION
+lib/${PKGNAME}/bin/fd2c
+lib/${PKGNAME}/bin/gplc
+lib/${PKGNAME}/bin/gprolog
+lib/${PKGNAME}/bin/hexgplc
+lib/${PKGNAME}/bin/ma2asm
+lib/${PKGNAME}/bin/pl2wam
+lib/${PKGNAME}/bin/wam2ma
+lib/${PKGNAME}/include/fd_to_c.h
+lib/${PKGNAME}/include/gprolog.h
+lib/${PKGNAME}/lib/all_fd_bips.o
+lib/${PKGNAME}/lib/all_pl_bips.o
+lib/${PKGNAME}/lib/debugger.o
+lib/${PKGNAME}/lib/libbips_fd.a
+lib/${PKGNAME}/lib/libbips_pl.a
+lib/${PKGNAME}/lib/libengine_fd.a
+lib/${PKGNAME}/lib/libengine_pl.a
+lib/${PKGNAME}/lib/liblinedit.a
+lib/${PKGNAME}/lib/top_level.o
+share/doc/gprolog/compil-scheme.eps
+share/doc/gprolog/compil-scheme.gif
+share/doc/gprolog/compil-scheme.pdf
+share/doc/gprolog/contents_motif.gif
+share/doc/gprolog/debug-box.eps
+share/doc/gprolog/debug-box.gif
+share/doc/gprolog/debug-box.pdf
+share/doc/gprolog/gprolog.chm
+share/doc/gprolog/gprolog.dvi
+share/doc/gprolog/gprolog.html
+share/doc/gprolog/gprolog.pdf
+share/doc/gprolog/gprolog.ps
+share/doc/gprolog/html/contents_motif.gif
+share/doc/gprolog/html/gprolog-idx.html
+share/doc/gprolog/html/gprolog.css
+share/doc/gprolog/html/gprolog001.html
+share/doc/gprolog/html/gprolog002.html
+share/doc/gprolog/html/gprolog003.html
+share/doc/gprolog/html/gprolog004.html
+share/doc/gprolog/html/gprolog005.html
+share/doc/gprolog/html/gprolog006.html
+share/doc/gprolog/html/gprolog007.html
+share/doc/gprolog/html/gprolog008.html
+share/doc/gprolog/html/gprolog009.html
+share/doc/gprolog/html/gprolog010.html
+share/doc/gprolog/html/gprolog011.html
+share/doc/gprolog/html/gprolog012.html
+share/doc/gprolog/html/gprolog013.html
+share/doc/gprolog/html/gprolog014.html
+share/doc/gprolog/html/gprolog015.html
+share/doc/gprolog/html/gprolog016.html
+share/doc/gprolog/html/gprolog017.html
+share/doc/gprolog/html/gprolog018.html
+share/doc/gprolog/html/gprolog019.html
+share/doc/gprolog/html/gprolog020.html
+share/doc/gprolog/html/gprolog021.html
+share/doc/gprolog/html/gprolog022.html
+share/doc/gprolog/html/gprolog023.html
+share/doc/gprolog/html/gprolog024.html
+share/doc/gprolog/html/gprolog025.html
+share/doc/gprolog/html/gprolog026.html
+share/doc/gprolog/html/gprolog027.html
+share/doc/gprolog/html/gprolog028.html
+share/doc/gprolog/html/gprolog029.html
+share/doc/gprolog/html/gprolog030.html
+share/doc/gprolog/html/gprolog031.html
+share/doc/gprolog/html/gprolog032.html
+share/doc/gprolog/html/gprolog033.html
+share/doc/gprolog/html/gprolog034.html
+share/doc/gprolog/html/gprolog035.html
+share/doc/gprolog/html/gprolog036.html
+share/doc/gprolog/html/gprolog037.html
+share/doc/gprolog/html/gprolog038.html
+share/doc/gprolog/html/gprolog039.html
+share/doc/gprolog/html/gprolog040.html
+share/doc/gprolog/html/gprolog041.html
+share/doc/gprolog/html/gprolog042.html
+share/doc/gprolog/html/gprolog043.html
+share/doc/gprolog/html/gprolog044.html
+share/doc/gprolog/html/gprolog045.html
+share/doc/gprolog/html/gprolog046.html
+share/doc/gprolog/html/gprolog047.html
+share/doc/gprolog/html/gprolog048.html
+share/doc/gprolog/html/gprolog049.html
+share/doc/gprolog/html/gprolog050.html
+share/doc/gprolog/html/gprolog051.html
+share/doc/gprolog/html/gprolog052.html
+share/doc/gprolog/html/gprolog053.html
+share/doc/gprolog/html/gprolog054.html
+share/doc/gprolog/html/gprolog055.html
+share/doc/gprolog/html/gprolog056.html
+share/doc/gprolog/html/gprolog057.html
+share/doc/gprolog/html/gprolog058.html
+share/doc/gprolog/html/gprolog059.html
+share/doc/gprolog/html/gprolog060.html
+share/doc/gprolog/html/gprolog061.html
+share/doc/gprolog/html/gprolog062.html
+share/doc/gprolog/html/gprolog063.html
+share/doc/gprolog/html/gprolog064.html
+share/doc/gprolog/html/gprolog065.html
+share/doc/gprolog/html/gprolog066.html
+share/doc/gprolog/html/gprolog067.html
+share/doc/gprolog/html/gprolog068.html
+share/doc/gprolog/html/gprolog069.html
+share/doc/gprolog/html/gprolog070.html
+share/doc/gprolog/html/gprolog071.html
+share/doc/gprolog/html/index.html
+share/doc/gprolog/html/next_motif.gif
+share/doc/gprolog/html/previous_motif.gif
 share/examples/gprolog/ExamplesC/Makefile
 share/examples/gprolog/ExamplesC/README
 share/examples/gprolog/ExamplesC/examp.pl
@@ -34,6 +143,7 @@ share/examples/gprolog/ExamplesFD/eq10.pl
 share/examples/gprolog/ExamplesFD/eq20.pl
 share/examples/gprolog/ExamplesFD/five.pl
 share/examples/gprolog/ExamplesFD/gardner.pl
+share/examples/gprolog/ExamplesFD/langford.pl
 share/examples/gprolog/ExamplesFD/magic.pl
 share/examples/gprolog/ExamplesFD/magsq.pl
 share/examples/gprolog/ExamplesFD/multipl.pl
@@ -69,120 +179,13 @@ share/examples/gprolog/ExamplesPl/sendmore.pl
 share/examples/gprolog/ExamplesPl/tak.pl
 share/examples/gprolog/ExamplesPl/tak_gvar.pl
 share/examples/gprolog/ExamplesPl/zebra.pl
-libexec/${PKGNAME}/NEWS
-libexec/${PKGNAME}/VERSION
-libexec/${PKGNAME}/bin/fd2c
-libexec/${PKGNAME}/bin/gplc
-libexec/${PKGNAME}/bin/gprolog
-libexec/${PKGNAME}/bin/hexgplc
-libexec/${PKGNAME}/bin/ma2asm
-libexec/${PKGNAME}/bin/pl2wam
-libexec/${PKGNAME}/bin/wam2ma
-libexec/${PKGNAME}/include/fd_to_c.h
-libexec/${PKGNAME}/include/gprolog.h
-libexec/${PKGNAME}/lib/all_fd_bips.o
-libexec/${PKGNAME}/lib/all_pl_bips.o
-libexec/${PKGNAME}/lib/debugger.o
-libexec/${PKGNAME}/lib/libbips_fd.a
-libexec/${PKGNAME}/lib/libbips_pl.a
-libexec/${PKGNAME}/lib/libengine_fd.a
-libexec/${PKGNAME}/lib/libengine_pl.a
-libexec/${PKGNAME}/lib/liblinedit.a
-libexec/${PKGNAME}/lib/obj_begin.o
-libexec/${PKGNAME}/lib/obj_end.o
-libexec/${PKGNAME}/lib/top_level.o
-share/doc/gprolog/compil-scheme.pdf
-share/doc/gprolog/debug-box.pdf
-share/doc/gprolog/manual.chm
-share/doc/gprolog/manual.dvi
-share/doc/gprolog/manual.pdf
-share/doc/gprolog/manual.ps
-share/doc/gprolog/pl-bips.dvi
-share/doc/html/gprolog/compil-scheme.gif
-share/doc/html/gprolog/contents_motif.gif
-share/doc/html/gprolog/debug-box.gif
-share/doc/html/gprolog/index.html
-share/doc/html/gprolog/manual-idx.html
-share/doc/html/gprolog/manual001.html
-share/doc/html/gprolog/manual002.html
-share/doc/html/gprolog/manual003.html
-share/doc/html/gprolog/manual004.html
-share/doc/html/gprolog/manual005.html
-share/doc/html/gprolog/manual006.html
-share/doc/html/gprolog/manual007.html
-share/doc/html/gprolog/manual008.html
-share/doc/html/gprolog/manual009.html
-share/doc/html/gprolog/manual010.html
-share/doc/html/gprolog/manual011.html
-share/doc/html/gprolog/manual012.html
-share/doc/html/gprolog/manual013.html
-share/doc/html/gprolog/manual014.html
-share/doc/html/gprolog/manual015.html
-share/doc/html/gprolog/manual016.html
-share/doc/html/gprolog/manual017.html
-share/doc/html/gprolog/manual018.html
-share/doc/html/gprolog/manual019.html
-share/doc/html/gprolog/manual020.html
-share/doc/html/gprolog/manual021.html
-share/doc/html/gprolog/manual022.html
-share/doc/html/gprolog/manual023.html
-share/doc/html/gprolog/manual024.html
-share/doc/html/gprolog/manual025.html
-share/doc/html/gprolog/manual026.html
-share/doc/html/gprolog/manual027.html
-share/doc/html/gprolog/manual028.html
-share/doc/html/gprolog/manual029.html
-share/doc/html/gprolog/manual030.html
-share/doc/html/gprolog/manual031.html
-share/doc/html/gprolog/manual032.html
-share/doc/html/gprolog/manual033.html
-share/doc/html/gprolog/manual034.html
-share/doc/html/gprolog/manual035.html
-share/doc/html/gprolog/manual036.html
-share/doc/html/gprolog/manual037.html
-share/doc/html/gprolog/manual038.html
-share/doc/html/gprolog/manual039.html
-share/doc/html/gprolog/manual040.html
-share/doc/html/gprolog/manual041.html
-share/doc/html/gprolog/manual042.html
-share/doc/html/gprolog/manual043.html
-share/doc/html/gprolog/manual044.html
-share/doc/html/gprolog/manual045.html
-share/doc/html/gprolog/manual046.html
-share/doc/html/gprolog/manual047.html
-share/doc/html/gprolog/manual048.html
-share/doc/html/gprolog/manual049.html
-share/doc/html/gprolog/manual050.html
-share/doc/html/gprolog/manual051.html
-share/doc/html/gprolog/manual052.html
-share/doc/html/gprolog/manual053.html
-share/doc/html/gprolog/manual054.html
-share/doc/html/gprolog/manual055.html
-share/doc/html/gprolog/manual056.html
-share/doc/html/gprolog/manual057.html
-share/doc/html/gprolog/manual058.html
-share/doc/html/gprolog/manual059.html
-share/doc/html/gprolog/manual060.html
-share/doc/html/gprolog/manual061.html
-share/doc/html/gprolog/manual062.html
-share/doc/html/gprolog/manual063.html
-share/doc/html/gprolog/manual064.html
-share/doc/html/gprolog/manual065.html
-share/doc/html/gprolog/manual066.html
-share/doc/html/gprolog/manual067.html
-share/doc/html/gprolog/manual068.html
-share/doc/html/gprolog/manual069.html
-share/doc/html/gprolog/manual070.html
-share/doc/html/gprolog/manual071.html
-share/doc/html/gprolog/next_motif.gif
-share/doc/html/gprolog/previous_motif.gif
-@dirrm share/doc/html/gprolog
-@dirrm share/doc/gprolog
-@dirrm libexec/${PKGNAME}/lib
-@dirrm libexec/${PKGNAME}/include
-@dirrm libexec/${PKGNAME}/bin
-@dirrm libexec/${PKGNAME}
 @dirrm share/examples/gprolog/ExamplesPl
 @dirrm share/examples/gprolog/ExamplesFD
 @dirrm share/examples/gprolog/ExamplesC
 @dirrm share/examples/gprolog
+@dirrm share/doc/gprolog/html
+@dirrm share/doc/gprolog
+@dirrm lib/${PKGNAME}/lib
+@dirrm lib/${PKGNAME}/include
+@dirrm lib/${PKGNAME}/bin
+@dirrm lib/${PKGNAME}
diff --git a/lang/gprolog/distinfo b/lang/gprolog/distinfo
index 00190542bd0..663b6650980 100644
--- a/lang/gprolog/distinfo
+++ b/lang/gprolog/distinfo
@@ -1,18 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.7 2007/12/01 12:27:59 rillig Exp $
 
-SHA1 (gprolog-1.2.16.tar.gz) = 128071ff640be38782b943218762e09ef0287dc6
-RMD160 (gprolog-1.2.16.tar.gz) = f15c6214f6ff905d6cbe15ee12cbff9a2dd939f9
-Size (gprolog-1.2.16.tar.gz) = 2478633 bytes
-SHA1 (patch-aa) = 11cef0fd91bcfa21c264f5d2f44d1a06c6075177
-SHA1 (patch-ab) = 550411d2c52b31b7a747ad2bf30c4439a8e71d0a
-SHA1 (patch-ac) = ae2d6ee1e0fe94e7602b8db9e4127ea82b56dcfe
-SHA1 (patch-ad) = 3a83cf6a9ab48830237ee8ac5d162ac5260775bc
-SHA1 (patch-ae) = a832ac080488e1e9a155d135af4e87eafb03d0de
-SHA1 (patch-af) = 72d0bfe0128c153886c4b356cce5b9bac902cd87
-SHA1 (patch-ag) = fffdc682ca58d5530108b9e2f3ba22a46c114b09
-SHA1 (patch-ah) = 1893c4c9b7f8a31487029455a47872aa1ffc4ccd
-SHA1 (patch-ai) = 789b465de0c768dbfcdcb063998256d7931726fd
-SHA1 (patch-aj) = 0fea4c886bbc9f94d53edb04d3f6a93a7fab5431
-SHA1 (patch-al) = 5745b485e5cfc82142148f49ab69f307fe7b71cf
-SHA1 (patch-am) = 6c12d78cbf6d2763ad7bf0f40cee2025f2362961
-SHA1 (patch-an) = 1eb7c3c03ab323ddcc7884cb5234448eaa3f1cb7
+SHA1 (gprolog-1.3.0.tar.gz) = 1ad7b7764c8e8d92f4f18619f29155001fe7d78f
+RMD160 (gprolog-1.3.0.tar.gz) = 56a7e6f0dab343d162620bccb177e67bca639797
+Size (gprolog-1.3.0.tar.gz) = 3016665 bytes
+SHA1 (patch-ba) = 226ca02c9a70b49278237cebc66eda3439df2f88
diff --git a/lang/gprolog/patches/patch-aa b/lang/gprolog/patches/patch-aa
deleted file mode 100644
index 2eac1163418..00000000000
--- a/lang/gprolog/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/11/13 20:15:11 jschauma Exp $
-
---- Ma2Asm/ix86_any.c.orig	Wed Nov 13 14:12:33 2002
-+++ Ma2Asm/ix86_any.c	Wed Nov 13 14:12:46 2002
-@@ -38,7 +38,7 @@
- 
- #define MAX_C_ARGS_IN_C_CODE       32
- 
--#if (defined(M_ix86_cygwin) || defined(M_ix86_bsd)) && !defined(__FreeBSD__)
-+#if (defined(M_ix86_cygwin) || defined(M_ix86_bsd)) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- 
- #define UN                         "_"
- 
diff --git a/lang/gprolog/patches/patch-ab b/lang/gprolog/patches/patch-ab
deleted file mode 100644
index 03836089b96..00000000000
--- a/lang/gprolog/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- configure.in.orig
-+++ configure.in
-@@ -311,6 +311,7 @@
- 		mips*irix*)      AC_DEFINE(M_mips_irix);;
- 		sparc*sunos*)    AC_DEFINE(M_sparc_sunos);;
- 		sparc*solaris*)  AC_DEFINE(M_sparc_solaris);;
-+		sparc*bsd*)	 AC_DEFINE(M_sparc_bsd);;
- 	        alpha*osf*)      AC_DEFINE(M_alpha_osf);;
- 	        alpha*linux*)    AC_DEFINE(M_alpha_linux);;
- 		i*86*linux*)     AC_DEFINE(M_ix86_linux);;
-@@ -319,6 +320,7 @@
- 		i*86*bsd*)       AC_DEFINE(M_ix86_bsd);;
-         	powerpc*linux*)  AC_DEFINE(M_powerpc_linux);;
- 		powerpc*darwin*) AC_DEFINE(M_powerpc_darwin);;
-+		powerpc*bsd*)    AC_DEFINE(M_powerpc_bsd);;
- 		*86*cygwin*)     AC_DEFINE(M_ix86_cygwin);;
- 		*)               AC_MSG_ERROR(unsupported architecture)
- 	esac
diff --git a/lang/gprolog/patches/patch-ac b/lang/gprolog/patches/patch-ac
deleted file mode 100644
index 577a92231d9..00000000000
--- a/lang/gprolog/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- configure.orig
-+++ configure
-@@ -2327,6 +2327,10 @@
- #define M_sparc_solaris 1
- EOF
- ;;
-+		sparc*bsd*)  cat >>confdefs.h <<\EOF
-+#define M_sparc_bsd 1
-+EOF
-+;;
- 	        alpha*osf*)      cat >>confdefs.h <<\EOF
- #define M_alpha_osf 1
- EOF
-@@ -2357,6 +2361,10 @@
- ;;
- 		powerpc*darwin*) cat >>confdefs.h <<\EOF
- #define M_powerpc_darwin 1
-+EOF
-+;;
-+		powerpc*bsd*) cat >>confdefs.h <<\EOF
-+#define M_powerpc_bsd 1
- EOF
- ;;
- 		*86*cygwin*)     cat >>confdefs.h <<\EOF
diff --git a/lang/gprolog/patches/patch-ad b/lang/gprolog/patches/patch-ad
deleted file mode 100644
index d97772f9a50..00000000000
--- a/lang/gprolog/patches/patch-ad
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/06/23 19:48:22 jtb Exp $
-
---- Ma2Asm/powerpc_any.c.orig
-+++ Ma2Asm/powerpc_any.c
-@@ -42,7 +42,7 @@
- #define MAX_DOUBLES_IN_PRED        2048
- 
- 
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- 
- #define UN
- #define R(reg)                     #reg
-@@ -186,7 +186,7 @@
- 
-   Label_Printf("");
-   Inst_Printf(".align", "2");
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-   Inst_Printf(".type", "%s,@function", label);
- #endif
- 
-@@ -431,7 +431,7 @@
- 
- 
- 
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- 
- #define STACK_OFFSET(offset)   offset * 4 - 24
- #define DBL_RET_WORDS          0
-@@ -462,7 +462,7 @@
- }
- 
- 
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- 
- #define AFTER_ARG_DBL						\
- }
-@@ -649,7 +649,7 @@
-   BEFORE_ARG;
- 
-   Inst_Printf("addis", "%s,0," HI_UN(foreign_double+%d), r,
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- 	      index * 4
- #else
- 	      index * 8
-@@ -882,7 +882,7 @@
- void
- Dico_String_Start(int nb_consts)
- {
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-   Label_Printf(".section\t.rodata");
- #else
-   Label_Printf(".cstring");
-@@ -900,7 +900,7 @@
- Dico_String(int str_no, char *asciiz)
- {
-   Label_Printf("%s%d:", STRING_PREFIX, str_no);
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-   Inst_Printf(".string", "%s", asciiz);
- #else
-   Inst_Printf(".asciz", "%s", asciiz);
-@@ -948,7 +948,7 @@
-     case NONE:
-       value = 1;		/* then in case ARRAY_SIZE */
-     case ARRAY_SIZE:
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-       if (!global)
- 	Inst_Printf(".local", UN "%s", name);
-       Inst_Printf(".comm", UN "%s,%ld,4", name, value * 4);
diff --git a/lang/gprolog/patches/patch-ae b/lang/gprolog/patches/patch-ae
deleted file mode 100644
index b26729b736b..00000000000
--- a/lang/gprolog/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- EnginePl/gp_config.h.in.orig
-+++ EnginePl/gp_config.h.in
-@@ -31,7 +31,10 @@
- /* Define if you have termios.h */
- #undef HAVE_TERMIOS_H
- 
--/* Define if you have termios.h */
-+/* Define if you have termio.h */
-+#undef HAVE_TERMIO_H
-+
-+/* Define if you have malloc.h */
- #undef HAVE_MALLOC_H
- 
- /* Define if you have a working `mmap' system call */
-@@ -148,11 +151,17 @@
- /* Define if the system is a sparc/sunos */
- #undef M_sparc_sunos
- 
-+/* Define if the system is a sparc/bsd */
-+#undef M_sparc_bsd
-+
- /* Define if the system is a powerpc/linux */
- #undef M_powerpc_linux
- 
--/* Define if the system is a powerpc/bsd */
-+/* Define if the system is a powerpc/darwin */
- #undef M_powerpc_darwin
-+
-+/* Define if the system is a powerpc/bsd */
-+#undef M_powerpc_bsd
- 
- 
- 
diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af
deleted file mode 100644
index df174471606..00000000000
--- a/lang/gprolog/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- EnginePl/engine1.c.orig
-+++ EnginePl/engine1.c
-@@ -97,7 +97,7 @@
- 
- #endif
- 
--#ifdef M_sparc
-+#if defined(M_sparc) && !defined(M_sparc_bsd)
-   register long *rfl asm("%l2") = base_fl;
-   register double *rfd asm("%l3") = base_fd;
- #endif
diff --git a/lang/gprolog/patches/patch-ag b/lang/gprolog/patches/patch-ag
deleted file mode 100644
index 05bd2fa99fd..00000000000
--- a/lang/gprolog/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- BipsPl/os_interf_c.c.orig
-+++ BipsPl/os_interf_c.c
-@@ -217,7 +217,7 @@
-   tsig[nb_sig].atom = Create_Atom("SIGIO");
-   tsig[nb_sig++].sig = SIGIO;
- #endif
--#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin )
-+#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin ) && !defined( M_powerpc_bsd ) && !defined( M_sparc_bsd )
-   tsig[nb_sig].atom = Create_Atom("SIGPOLL");
-   tsig[nb_sig++].sig = SIGPOLL;
- #endif
diff --git a/lang/gprolog/patches/patch-ah b/lang/gprolog/patches/patch-ah
deleted file mode 100644
index 57d920fde0b..00000000000
--- a/lang/gprolog/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2003/07/07 21:31:54 jtb Exp $
-
---- EnginePl/machine.h.orig
-+++ EnginePl/machine.h
-@@ -125,11 +125,7 @@
- #    define M_USED_REGS            {"ebx", "ebp", 0}
- #endif
- 
--#elif defined(M_powerpc_linux)
--
--#    define M_USED_REGS            {"15", "20", 0}
--
--#elif defined(M_powerpc_darwin)
-+#elif defined(M_powerpc_linux) || defined(M_powerpc_darwin) || defined(M_powerpc_bsd)
- 
- #    define M_USED_REGS            {"15", "20", 0}
- 
diff --git a/lang/gprolog/patches/patch-ai b/lang/gprolog/patches/patch-ai
deleted file mode 100644
index 72074f3c2b6..00000000000
--- a/lang/gprolog/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2003/07/07 21:31:54 jtb Exp $
-
---- EnginePl/machine.c.orig
-+++ EnginePl/machine.c
-@@ -480,7 +480,7 @@
- 
- static void
- SIGSEGV_Handler(int sig, siginfo_t * si)
--#elif defined(M_ix86_bsd)
-+#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)
- 
- static void
- SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
diff --git a/lang/gprolog/patches/patch-aj b/lang/gprolog/patches/patch-aj
deleted file mode 100644
index 099ed55bca3..00000000000
--- a/lang/gprolog/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2003/07/07 21:31:54 jtb Exp $
-
---- Ma2Asm/sparc_any.c.orig
-+++ Ma2Asm/sparc_any.c
-@@ -171,7 +171,7 @@
- {
-   Label_Printf("");
-   Inst_Printf(".align", "4");
--#ifdef M_sparc_solaris
-+#if defined(M_sparc_solaris) || defined(M_sparc_bsd)
-   Inst_Printf(".type", UN "%s,#function", label);
- #endif
-   Inst_Printf(".proc", "020");
-@@ -915,7 +915,7 @@
-       break;
- 
-     case INITIAL_VALUE:
--#ifdef M_sparc_solaris
-+#if defined(M_sparc_solaris) || defined(M_sparc_bsd)
-       Inst_Printf(".type", UN "%s,#object", name);
-       Inst_Printf(".size", UN "%s,4", name);
- #endif
diff --git a/lang/gprolog/patches/patch-al b/lang/gprolog/patches/patch-al
deleted file mode 100644
index 5595c1ed2a6..00000000000
--- a/lang/gprolog/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.2 2002/11/13 20:15:14 jschauma Exp $
-
---- Makefile.in.orig	Wed Nov 13 14:11:45 2002
-+++ Makefile.in	Wed Nov 13 14:12:06 2002
-@@ -1,6 +1,7 @@
- #                               MAIN MAKEFILE
- #                               -------------
- 
-+PREFIX         = @prefix@
- ROOT_DIR       = @ROOT_DIR@
- PKG_NAME       = @PKG_NAME@
- 
-@@ -57,7 +58,7 @@
- install-system:
- 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- 	$(INSTALL_DIR)/include $(INSTALL_DIR)/lib
--	for i in `echo "$(TXT_FILES)"`; do $(INSTALL_PROGRAM) ../$$i $(INSTALL_DIR);done
-+	for i in `echo "$(TXT_FILES)"`; do $(INSTALL_DATA) ../$$i $(INSTALL_DIR);done
- 	for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin;done
- 	for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib;done
- 	for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib;done
diff --git a/lang/gprolog/patches/patch-am b/lang/gprolog/patches/patch-am
deleted file mode 100644
index cbed97d9442..00000000000
--- a/lang/gprolog/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.3 2003/06/23 19:48:24 jtb Exp $
-
---- EnginePl/obj_chain.c.orig
-+++ EnginePl/obj_chain.c
-@@ -207,7 +207,7 @@
- #endif
-       (*p->fct_init) ();
- 
--#if defined(M_powerpc_linux) || defined(M_alpha_linux) || \
-+#if defined(M_powerpc_linux) || defined(M_alpha_linux) || defined(M_powerpc_bsd) ||\
-     defined(M_mips_irix)
-       p = (ObjChain *) ((long *) p + 1);
- #elif 0
diff --git a/lang/gprolog/patches/patch-an b/lang/gprolog/patches/patch-an
deleted file mode 100644
index aec7a6e9dbe..00000000000
--- a/lang/gprolog/patches/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-an,v 1.4 2003/07/07 21:31:54 jtb Exp $
-
---- Ma2Asm/FromC/mach.h.orig
-+++ Ma2Asm/FromC/mach.h
-@@ -12,7 +12,8 @@
-  *---------------------------------*/
- 
- #if defined(M_sony_news) || defined(M_ultrix_dec) || defined(M_alpha_osf) ||\
--    defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd)
-+    defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd) ||\
-+    defined(M_powerpc_bsd) || defined(M_sparc_bsd) || defined(__ELF__)
- 
- #   define M_Asm_Symbol1(name)     #name
- #   define M_Asm_Symbol(name)      M_Asm_Symbol1(name)
-@@ -66,7 +67,7 @@
- 
- #    define M_Direct_Goto(lab)     {_asm {jmp M_Asm_Symbol(lab)}; return;}
- 
--#elif defined(M_powerpc_linux)
-+#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- 
- #    define M_Direct_Goto(lab)     {asm("b " M_Asm_Symbol(lab)); return;}
- 
diff --git a/lang/gprolog/patches/patch-ba b/lang/gprolog/patches/patch-ba
new file mode 100644
index 00000000000..879eee5d3ab
--- /dev/null
+++ b/lang/gprolog/patches/patch-ba
@@ -0,0 +1,25 @@
+$NetBSD: patch-ba,v 1.1 2007/12/01 12:28:04 rillig Exp $
+
+On NetBSD, the sigcontext struct is so well-protected from userland that
+I didn't find a way to access it.
+
+--- src/EnginePl/machine.c.orig	2007-01-04 11:35:13.000000000 +0100
++++ src/EnginePl/machine.c	2007-12-01 13:18:32.000000000 +0100
+@@ -469,7 +469,7 @@ SIGSEGV_Handler(int sig, struct sigconte
+ static void
+ SIGSEGV_Handler(int sig, siginfo_t * si)
+ 
+-#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)
++#elif (defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)) && !defined(__NetBSD__)
+ static void
+ SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
+ 
+@@ -517,7 +517,7 @@ SIGSEGV_Handler(int sig)
+ 
+   WamWord *addr = (WamWord *) si->si_addr;
+ 
+-#elif defined(M_ix86_bsd)
++#elif defined(M_ix86_bsd) && !defined(__NetBSD__)
+ 
+   WamWord *addr = (WamWord *) scp->sc_err;
+