Import gprolog-1.1.6, the GNU prolog compiler and interpreter, into

the Packages Collection.

Package created by Brook Milligan (brook@biology.nmsu.edu) and submitted
in PR pkg/10479. Additional Solaris patch by myself.

19 files changed, 905 insertions, 0 deletions

diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
new file mode 100644
index 00000000000..28164c2c6ce
--- /dev/null
+++ b/lang/gprolog/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/07/03 10:27:49 agc Exp $
+#
+
+DISTNAME=		gprolog-1.1.6
+CATEGORIES=		lang
+MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/contraintes/gnu-prolog/unstable/
+
+MAINTAINER=		brook@nmsu.edu
+HOMEPAGE=		http://gnu-prolog.inria.fr/
+
+#ONLY_FOR_PLATFORM=	NetBSD-*-i386
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/libexec/gprolog-1.1.6 \
+			--with-doc-dir=${PREFIX}/share/doc/gprolog \
+			--with-html-dir=${PREFIX}/share/doc/html/gprolog \
+			--with-example-dir=${PREFIX}/share/examples/gprolog \
+			--with-c-flags='-O3 -finline-functions -fomit-frame-pointer -D__unix__=1'
+
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gprolog/files/md5 b/lang/gprolog/files/md5
new file mode 100644
index 00000000000..948e4b0d0f9
--- /dev/null
+++ b/lang/gprolog/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+MD5 (gprolog-1.1.6.tar.gz) = 3d9faa59f8a2548410875ace66badc4d
diff --git a/lang/gprolog/files/patch-sum b/lang/gprolog/files/patch-sum
new file mode 100644
index 00000000000..5d692972977
--- /dev/null
+++ b/lang/gprolog/files/patch-sum
@@ -0,0 +1,15 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+MD5 (patch-aa) = 4ade30dc5c4e9e74c6eb82e2d400466d
+MD5 (patch-ab) = 612c9c0c225a431ba74f92542ea7c92b
+MD5 (patch-ac) = 32454cf56fcc24222c52c00a024c84e0
+MD5 (patch-ad) = 8f01d8d6ef69ce20ab34574ffad43522
+MD5 (patch-ae) = 36b3a31e3cc30c7e7f5ee0632e645823
+MD5 (patch-af) = 1a4e4f8560a53dabaa69714e525016e0
+MD5 (patch-ag) = cce844d6355bbb6448d85ce8ce9ed2c0
+MD5 (patch-ah) = 0d0da345455ba5df3d1e60ce916b18e9
+MD5 (patch-ai) = 9cb091b2b317b08ce6e869a4cf247258
+MD5 (patch-aj) = d9953df6ae0fdbd9ce9e1c862afd9daf
+MD5 (patch-ak) = 5bde2b8832f98c29f1f9df78c5514cc4
+MD5 (patch-al) = 7d4315caf80a7354ac46d22ad7295853
+MD5 (patch-am) = 21ae98586ef394723e081076f594cae8
diff --git a/lang/gprolog/patches/patch-aa b/lang/gprolog/patches/patch-aa
new file mode 100644
index 00000000000..b74a36c4cba
--- /dev/null
+++ b/lang/gprolog/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- Ma2Asm/ix86_any.c.orig	Thu Apr  6 04:47:50 2000
++++ Ma2Asm/ix86_any.c	Fri Jun 30 12:48:40 2000
+@@ -39,7 +39,7 @@
+ 
+ #define MAX_C_ARGS_IN_C_CODE       32
+ 
+-#ifdef M_ix86_cygwin
++#if defined(M_ix86_cygwin) || defined(M_ix86_bsd)
+ 
+ #define UN                         "_"
+ 
+@@ -703,7 +703,9 @@
+ void Dico_String_Start(int nb_consts)
+ 
+ {
++#if !defined(M_ix86_bsd)
+  Label_Printf(".section\t.rodata");
++#endif
+ }
+ 
+ 
diff --git a/lang/gprolog/patches/patch-ab b/lang/gprolog/patches/patch-ab
new file mode 100644
index 00000000000..0b25eba78e6
--- /dev/null
+++ b/lang/gprolog/patches/patch-ab
@@ -0,0 +1,68 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- Linedit/stty.c.orig	Wed May 24 03:35:24 2000
++++ Linedit/stty.c	Fri Jun 30 12:48:41 2000
+@@ -21,12 +21,25 @@
+ /* with this program; if not, write to the Free Software Foundation, Inc.  */

+ /* 59 Temple Place - Suite 330, Boston, MA 02111, USA.                     */

+ /*-------------------------------------------------------------------------*/

++#include "../EnginePl/gp_config.h"

++

+ #include <stdio.h>

+ #include <signal.h>

+ 

+ #if defined(__unix__) || defined(__CYGWIN__)

+ 

++#if defined(HAVE_SYS_IOCTL_COMPAT_H)

++#include <sys/ioctl_compat.h>

++#endif

++#if defined(HAVE_TERMIOS_H)

++#include <termios.h>

++#elif defined(HAVE_TERMIO_H)

+ #include <termio.h>

++#define termios termio

++#define TIOCGETP TCGETA

++#define TIOCSETP TCSETA

++#endif

++

+ #include <unistd.h>

+ 

+ #if defined(sun) /* && defined(sparc) */ /* commented out for ix86/solaris */

+@@ -71,10 +84,10 @@
+ 

+ static int           is_tty_in;

+ static int           is_tty_out;

+-static struct termio old_stty_in;

+-static struct termio new_stty_in;

+-static struct termio old_stty_out;

+-static struct termio new_stty_out;

++static struct termios old_stty_in;

++static struct termios new_stty_in;

++static struct termios old_stty_out;

++static struct termios new_stty_out;

+ 

+ #elif defined(_WIN32)

+ 

+@@ -96,10 +109,10 @@
+ #if defined(__unix__) || defined(__CYGWIN__)

+ 

+ static

+-void      Set_TTY_Mode          (struct termio *old,struct termio *new);

++void      Set_TTY_Mode          (struct termios *old,struct termios *new);

+ 

+-#define Gtty(fd,s) ioctl(fd,TCGETA,s)

+-#define Stty(fd,s) ioctl(fd,TCSETA,s)

++#define Gtty(fd,s) ioctl(fd,TIOCGETP,s)

++#define Stty(fd,s) ioctl(fd,TIOCSETP,s)

+ 

+ #endif

+ 

+@@ -287,7 +300,7 @@
+ /*                                                                         */

+ /* Mode cbreak (raw mode).                                                 */

+ /*-------------------------------------------------------------------------*/

+-static void Set_TTY_Mode(struct termio *old,struct termio *new)

++static void Set_TTY_Mode(struct termios *old,struct termios *new)

+ 

+ {

+  *new = *old;

diff --git a/lang/gprolog/patches/patch-ac b/lang/gprolog/patches/patch-ac
new file mode 100644
index 00000000000..bfec5655c01
--- /dev/null
+++ b/lang/gprolog/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- Linedit/char_io.c.orig	Mon May 22 12:42:04 2000
++++ Linedit/char_io.c	Fri Jun 30 12:48:41 2000
+@@ -27,7 +27,6 @@
+ #include <sys/types.h>

+ #include <sys/uio.h>

+ #include <unistd.h>

+-#include <termio.h>

+ 

+ #elif defined(_WIN32)

+ 

diff --git a/lang/gprolog/patches/patch-ad b/lang/gprolog/patches/patch-ad
new file mode 100644
index 00000000000..229a5757fe9
--- /dev/null
+++ b/lang/gprolog/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- Linedit/Makefile.in.orig	Sat Jun 10 03:52:24 2000
++++ Linedit/Makefile.in	Fri Jun 30 12:48:41 2000
+@@ -16,7 +16,7 @@
+ 
+ $(LIBNAME): $(OBJLIB)
+ 	rm -f $(LIBNAME)
+-	$(AR_RC)$(LIBNAME) $(OBJLIB)
++	$(AR_RC) $(LIBNAME) $(OBJLIB)
+ 	$(RANLIB) $(LIBNAME)	
+ 
+ 
diff --git a/lang/gprolog/patches/patch-ae b/lang/gprolog/patches/patch-ae
new file mode 100644
index 00000000000..48bde711c88
--- /dev/null
+++ b/lang/gprolog/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- EnginePl/gp_config.h.in.orig	Wed Jun 28 03:26:54 2000
++++ EnginePl/gp_config.h.in	Fri Jun 30 12:48:42 2000
+@@ -25,6 +25,15 @@
+ #ifndef _GP_CONFIG_H
+ #define _GP_CONFIG_H
+ 
++/* Define if you have sys/ioctl_compat.h */
++#undef HAVE_SYS_IOCTL_COMPAT_H
++
++/* Define if you have termios.h */
++#undef HAVE_TERMIOS_H
++
++/* Define if you have termio.h */
++#undef HAVE_TERMIO_H
++
+ /* Define if you have a working `mmap' system call.  */
+ #undef HAVE_MMAP
+ 
diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af
new file mode 100644
index 00000000000..bc12957c2f8
--- /dev/null
+++ b/lang/gprolog/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- EnginePl/Makefile.in.orig	Wed Jun 28 03:34:38 2000
++++ EnginePl/Makefile.in	Fri Jun 30 12:48:42 2000
+@@ -18,7 +18,7 @@
+ 
+ $(LIBNAME): $(OBJLIB)
+ 	rm -f $(LIBNAME) 
+-	$(AR_RC)$(LIBNAME) $(OBJLIB)
++	$(AR_RC) $(LIBNAME) $(OBJLIB)
+ 	$(RANLIB) $(LIBNAME)
+ 
+ 
diff --git a/lang/gprolog/patches/patch-ag b/lang/gprolog/patches/patch-ag
new file mode 100644
index 00000000000..7641aaf8809
--- /dev/null
+++ b/lang/gprolog/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- EngineFD/Makefile.in.orig	Sat Jun 10 03:32:56 2000
++++ EngineFD/Makefile.in	Fri Jun 30 12:48:42 2000
+@@ -16,7 +16,7 @@
+ 
+ $(LIBNAME): $(OBJLIB)
+ 	rm -f $(LIBNAME) 
+-	$(AR_RC)$(LIBNAME) $(OBJLIB)
++	$(AR_RC) $(LIBNAME) $(OBJLIB)
+ 	$(RANLIB) $(LIBNAME)
+ 
+ 
diff --git a/lang/gprolog/patches/patch-ah b/lang/gprolog/patches/patch-ah
new file mode 100644
index 00000000000..14338be88b6
--- /dev/null
+++ b/lang/gprolog/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- BipsPl/Makefile.in.orig	Wed Jun 28 03:34:10 2000
++++ BipsPl/Makefile.in	Fri Jun 30 12:48:42 2000
+@@ -72,7 +72,7 @@
+ 
+ 
+ .SUFFIXES:
+-.SUFFIXES: @OBJ_SUFFIX@ .wam .pl $(SUFFIXES)
++.SUFFIXES: @OBJ_SUFFIX@ .c .wam .pl $(SUFFIXES)
+ 
+ 
+ .pl.wam:
+@@ -86,7 +86,7 @@
+ $(LIBNAME): $(OBJLIB) no_sockets.wam sockets.wam \
+                       no_le_interf.wam le_interf.wam
+ 	rm -f $(LIBNAME) 
+-	$(AR_RC)$(LIBNAME) $(OBJLIB)
++	$(AR_RC) $(LIBNAME) $(OBJLIB)
+ 	$(RANLIB) $(LIBNAME)
+ 
+ 
diff --git a/lang/gprolog/patches/patch-ai b/lang/gprolog/patches/patch-ai
new file mode 100644
index 00000000000..1938c217e72
--- /dev/null
+++ b/lang/gprolog/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- BipsFD/Makefile.in.orig	Sat Jun 10 03:32:52 2000
++++ BipsFD/Makefile.in	Fri Jun 30 12:48:43 2000
+@@ -35,7 +35,7 @@
+ 
+ $(LIBNAME): $(OBJLIB)
+ 	rm -f $(LIBNAME) 
+-	$(AR_RC)$(LIBNAME) $(OBJLIB)
++	$(AR_RC) $(LIBNAME) $(OBJLIB)
+ 	$(RANLIB) $(LIBNAME)
+ 
+ 
diff --git a/lang/gprolog/patches/patch-aj b/lang/gprolog/patches/patch-aj
new file mode 100644
index 00000000000..5e81f9702b4
--- /dev/null
+++ b/lang/gprolog/patches/patch-aj
@@ -0,0 +1,116 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- configure.in.orig	Wed Jun 28 03:23:30 2000
++++ configure.in	Fri Jun 30 12:48:43 2000
+@@ -73,6 +73,9 @@
+ AC_SUBST(ROOT_DIR)
+ AC_SUBST(INSTALL_DIRNAME)
+ AC_SUBST(INSTALL_DIR)
++AC_SUBST(DOC_DIR)
++AC_SUBST(EXAMPLE_DIR)
++AC_SUBST(HTML_DIR)
+ AC_SUBST(LINKS_DIR)
+ AC_SUBST(MAKE_LE_DIRS)
+ AC_SUBST(MAKE_W32GC_DIRS)
+@@ -104,6 +107,18 @@
+ dnl *******************
+ 
+ 
++AC_ARG_WITH(install-dir,[  --with-install-dir=DIR specify INSTALL_DIR],
++		[WITH_INSTALL_DIR="$withval"])
++
++AC_ARG_WITH(doc-dir,[  --with-doc-dir=DIR     specify DOC_DIR],
++		[WITH_DOC_DIR="$withval"])
++
++AC_ARG_WITH(example-dir,[  --with-example-dir=DIR specify EXAMPLES_DIR],
++		[WITH_EXAMPLE_DIR="$withval"])
++
++AC_ARG_WITH(html-dir,[  --with-html-dir=DIR    specify HTML_DIR],
++		[WITH_HTML_DIR="$withval"])
++
+ AC_ARG_WITH(msvc,[  --with-msvc            use MS VC++],
+ 		[WITH_MSVC="$withval"],
+ 		[WITH_MSVC=no])
+@@ -252,6 +267,7 @@
+ fi
+ 
+ AC_CHECK_SIZEOF(long)
++AC_CHECK_HEADERS(sys/ioctl_compat.h termios.h termio.h)
+ 
+ 
+ 
+@@ -385,7 +401,11 @@
+ 
+ case "$prefix" in
+         in-place)
+-	   INSTALL_DIR=$ROOT_DIR
++           if test -z "$WITH_INSTALL_DIR" ; then
++                INSTALL_DIR=$ROOT_DIR
++           else
++                INSTALL_DIR=$WITH_INSTALL_DIR
++           fi
+            MAKE_INSTALL_DOC=
+            MAKE_INSTALL_EXAMPLES=
+            MAKE_UNINSTALL_PKG='$(UNINSTALL_IN_PLACE)'
+@@ -396,19 +416,46 @@
+ 
+ 	none|NONE)
+ 	   PREFIX=/usr/local
+-           INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           if test -z "$WITH_INSTALL_DIR" ; then
++                INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           else
++                INSTALL_DIR=$WITH_INSTALL_DIR
++           fi
+            MAKE_INSTALL_DOC='$(INSTALL_DOC)'
+            MAKE_INSTALL_EXAMPLES='$(INSTALL_EXAMPLES)'
+            MAKE_UNINSTALL_PKG='$(UNINSTALL_ALL)';;
+ 
+ 	*) PREFIX=$prefix
+-           INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           if test -z "$WITH_INSTALL_DIR" ; then
++                INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           else
++                INSTALL_DIR=$WITH_INSTALL_DIR
++           fi
+            MAKE_INSTALL_DOC='$(INSTALL_DOC)'
+            MAKE_INSTALL_EXAMPLES='$(INSTALL_EXAMPLES)'
+            MAKE_UNINSTALL_PKG='$(UNINSTALL_ALL)';;
+ esac
+ 
+-echo "--> directory for the installation: $INSTALL_DIR"
++if test -z "$WITH_DOC_DIR" ; then
++     DOC_DIR=$INSTALL_DIR/doc
++else
++     DOC_DIR=$WITH_DOC_DIR
++fi
++if test -z "$WITH_EXAMPLE_DIR" ; then
++     EXAMPLE_DIR=$INSTALL_DIR
++else
++     EXAMPLE_DIR=$WITH_EXAMPLE_DIR
++fi
++if test -z "$WITH_HTML_DIR" ; then
++     HTML_DIR=$INSTALL_DIR/doc/Html
++else
++     HTML_DIR=$WITH_HTML_DIR
++fi
++
++echo "--> directory for the installation:       $INSTALL_DIR"
++echo "--> directory for the documentation:      $DOC_DIR"
++echo "--> directory for the HTML documentation: $HTML_DIR"
++echo "--> directory for the examples:           $EXAMPLE_DIR"
+ 
+ case "$WITH_LINKS" in
+ 	''|no)
+@@ -429,9 +476,9 @@
+ 
+ if test "$LINKS_DIR" = ""
+ then
+-           echo "--> directory for link to binaries: none (no links)"
++           echo "--> directory for link to binaries:       none (no links)"
+ else
+-           echo "--> directory for link to binaries: $LINKS_DIR"
++           echo "--> directory for link to binaries:       $LINKS_DIR"
+ fi
+ 
+ if test "$USE_GUI_CONSOLE" = yes -a \( "$USE_LINEDIT" = no -o "$WIN32" = no \)
diff --git a/lang/gprolog/patches/patch-ak b/lang/gprolog/patches/patch-ak
new file mode 100644
index 00000000000..75d830a992b
--- /dev/null
+++ b/lang/gprolog/patches/patch-ak
@@ -0,0 +1,270 @@
+$NetBSD: patch-ak,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- configure.orig	Fri Jun 30 03:53:32 2000
++++ configure	Fri Jun 30 12:48:43 2000
+@@ -12,6 +12,14 @@
+ ac_default_prefix=/usr/local
+ # Any additions from configure.in:
+ ac_help="$ac_help
++  --with-install-dir=DIR specify INSTALL_DIR"
++ac_help="$ac_help
++  --with-doc-dir=DIR     specify DOC_DIR"
++ac_help="$ac_help
++  --with-example-dir=DIR specify EXAMPLES_DIR"
++ac_help="$ac_help
++  --with-html-dir=DIR    specify HTML_DIR"
++ac_help="$ac_help
+   --with-msvc            use MS VC++"
+ ac_help="$ac_help
+   --with-c-flags[=FLAGS] specify C flags"
+@@ -629,6 +637,34 @@
+ 
+ 
+ 
++# Check whether --with-install-dir or --without-install-dir was given.
++if test "${with_install_dir+set}" = set; then
++  withval="$with_install_dir"
++  WITH_INSTALL_DIR="$withval"
++fi
++
++
++# Check whether --with-doc-dir or --without-doc-dir was given.
++if test "${with_doc_dir+set}" = set; then
++  withval="$with_doc_dir"
++  WITH_DOC_DIR="$withval"
++fi
++
++
++# Check whether --with-example-dir or --without-example-dir was given.
++if test "${with_example_dir+set}" = set; then
++  withval="$with_example_dir"
++  WITH_EXAMPLE_DIR="$withval"
++fi
++
++
++# Check whether --with-html-dir or --without-html-dir was given.
++if test "${with_html_dir+set}" = set; then
++  withval="$with_html_dir"
++  WITH_HTML_DIR="$withval"
++fi
++
++
+ # Check whether --with-msvc or --without-msvc was given.
+ if test "${with_msvc+set}" = set; then
+   withval="$with_msvc"
+@@ -1498,6 +1534,130 @@
+ 
+ 
+ 
++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:1463: checking how to run the C preprocessor" >&5
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    # This must be in double quotes, not single quotes, because CPP may get
++  # substituted into the Makefile and "${CC-cc}" will confuse make.
++  CPP="${CC-cc} -E"
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp.
++  cat > conftest.$ac_ext <<EOF
++#line 1478 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -E -traditional-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 1495 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1512 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP=/lib/cpp
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++  ac_cv_prog_CPP="$CPP"
++fi
++  CPP="$ac_cv_prog_CPP"
++else
++  ac_cv_prog_CPP="$CPP"
++fi
++echo "$ac_t""$CPP" 1>&6
++
++for ac_hdr in sys/ioctl_compat.h termios.h termio.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:1546: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1551 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++
++
++
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+ echo "configure:1503: checking for inline" >&5
+ if eval "test \"\${ac_cv_c_inline+set}\" = set"; then
+@@ -1917,7 +2077,11 @@
+ 
+ case "$prefix" in
+         in-place)
+-	   INSTALL_DIR=$ROOT_DIR
++           if test -z "$WITH_INSTALL_DIR" ; then
++                INSTALL_DIR=$ROOT_DIR
++           else
++                INSTALL_DIR=$WITH_INSTALL_DIR
++           fi
+            MAKE_INSTALL_DOC=
+            MAKE_INSTALL_EXAMPLES=
+            MAKE_UNINSTALL_PKG='$(UNINSTALL_IN_PLACE)'
+@@ -1928,19 +2092,46 @@
+ 
+ 	none|NONE)
+ 	   PREFIX=/usr/local
+-           INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           if test -z "$WITH_INSTALL_DIR" ; then
++                INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           else
++                INSTALL_DIR=$WITH_INSTALL_DIR
++           fi
+            MAKE_INSTALL_DOC='$(INSTALL_DOC)'
+            MAKE_INSTALL_EXAMPLES='$(INSTALL_EXAMPLES)'
+            MAKE_UNINSTALL_PKG='$(UNINSTALL_ALL)';;
+ 
+ 	*) PREFIX=$prefix
+-           INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           if test -z "$WITH_INSTALL_DIR" ; then
++                INSTALL_DIR=$PREFIX/$INSTALL_DIRNAME
++           else
++                INSTALL_DIR=$WITH_INSTALL_DIR
++           fi
+            MAKE_INSTALL_DOC='$(INSTALL_DOC)'
+            MAKE_INSTALL_EXAMPLES='$(INSTALL_EXAMPLES)'
+            MAKE_UNINSTALL_PKG='$(UNINSTALL_ALL)';;
+ esac
+ 
+-echo "--> directory for the installation: $INSTALL_DIR"
++if test -z "$WITH_DOC_DIR" ; then
++     DOC_DIR=$INSTALL_DIR/doc
++else
++     DOC_DIR=$WITH_DOC_DIR
++fi
++if test -z "$WITH_EXAMPLE_DIR" ; then
++     EXAMPLE_DIR=$INSTALL_DIR
++else
++     EXAMPLE_DIR=$WITH_EXAMPLE_DIR
++fi
++if test -z "$WITH_HTML_DIR" ; then
++     HTML_DIR=$INSTALL_DIR/doc/Html
++else
++     HTML_DIR=$WITH_HTML_DIR
++fi
++
++echo "--> directory for the installation:       $INSTALL_DIR"
++echo "--> directory for the documentation:      $DOC_DIR"
++echo "--> directory for the HTML documentation: $HTML_DIR"
++echo "--> directory for the examples:           $EXAMPLE_DIR"
+ 
+ case "$WITH_LINKS" in
+ 	''|no)
+@@ -1961,9 +2152,9 @@
+ 
+ if test "$LINKS_DIR" = ""
+ then
+-           echo "--> directory for link to binaries: none (no links)"
++           echo "--> directory for link to binaries:       none (no links)"
+ else
+-           echo "--> directory for link to binaries: $LINKS_DIR"
++           echo "--> directory for link to binaries:       $LINKS_DIR"
+ fi
+ 
+ if test "$USE_GUI_CONSOLE" = yes -a \( "$USE_LINEDIT" = no -o "$WIN32" = no \)
+@@ -2206,6 +2397,9 @@
+ s%@ROOT_DIR@%$ROOT_DIR%g
+ s%@INSTALL_DIRNAME@%$INSTALL_DIRNAME%g
+ s%@INSTALL_DIR@%$INSTALL_DIR%g
++s%@DOC_DIR@%$DOC_DIR%g
++s%@EXAMPLE_DIR@%$EXAMPLE_DIR%g
++s%@HTML_DIR@%$HTML_DIR%g
+ s%@LINKS_DIR@%$LINKS_DIR%g
+ s%@MAKE_LE_DIRS@%$MAKE_LE_DIRS%g
+ s%@MAKE_W32GC_DIRS@%$MAKE_W32GC_DIRS%g
diff --git a/lang/gprolog/patches/patch-al b/lang/gprolog/patches/patch-al
new file mode 100644
index 00000000000..abc45c6c432
--- /dev/null
+++ b/lang/gprolog/patches/patch-al
@@ -0,0 +1,55 @@
+$NetBSD: patch-al,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- Makefile.in.orig	Wed Jun 28 03:33:40 2000
++++ Makefile.in	Fri Jun 30 12:54:15 2000
+@@ -1,6 +1,7 @@
+ #                               MAIN MAKEFILE
+ #                               -------------
+ 
++PREFIX                = @prefix@
+ ROOT_DIR              = @ROOT_DIR@
+ INSTALL_DIRNAME       = @INSTALL_DIRNAME@
+ INSTALL_DIR           = @INSTALL_DIR@
+@@ -38,6 +39,11 @@
+ SUB_DIRS_ALL   = TopComp EnginePl Wam2Ma Ma2Asm \
+                  $(LE_DIRS) $(W32GC_DIRS) \
+                  BipsPl Pl2Wam $(FD_DIRS)
++
++DOC_DIR        = @DOC_DIR@
++EXAMPLE_DIR    = @EXAMPLE_DIR@
++HTML_DIR       = @HTML_DIR@
++
+ DOC_FILES      = ../doc/???*.dvi ../doc/???*.ps
+ DOC_FILES_HTML = ../doc/Html/???*.html ../doc/Html/???*.gif
+ 
+@@ -115,24 +121,24 @@
+ 
+ install-doc:
+ 	for i in $(DOC_FILES) ; do \
+-$(INSTALL_DATA) $$i $(INSTALL_DIR)/doc/; done
++$(INSTALL_DATA) $$i $(DOC_DIR); done
+ 	for i in $(DOC_FILES_HTML) ; do \
+-$(INSTALL_DATA) $$i $(INSTALL_DIR)/doc/Html; done
++$(INSTALL_DATA) $$i $(HTML_DIR); done
+ 
+ 
+ install-examples:
+ 	for i in ../ExamplesPl/*; do \
+-$(INSTALL_DATA) $$i $(INSTALL_DIR)/ExamplesPl/; done
++$(INSTALL_DATA) $$i $(EXAMPLE_DIR)/ExamplesPl; done
+ 	for i in ../ExamplesFD/*; do \
+-$(INSTALL_DATA) $$i $(INSTALL_DIR)/ExamplesFD/; done
++$(INSTALL_DATA) $$i $(EXAMPLE_DIR)/ExamplesFD; done
+ 
+ 
+ 
+ install-dirs:
+ 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
+                         $(INSTALL_DIR)/include $(INSTALL_DIR)/lib \
+-                        $(INSTALL_DIR)/doc $(INSTALL_DIR)/doc/Html \
+-	                $(INSTALL_DIR)/ExamplesPl $(INSTALL_DIR)/ExamplesFD
++                        $(DOC_DIR) $(HTML_DIR) \
++	                $(EXAMPLE_DIR)/ExamplesPl $(EXAMPLE_DIR)/ExamplesFD
+ 
+ 
+ install-links: clean-links
diff --git a/lang/gprolog/patches/patch-am b/lang/gprolog/patches/patch-am
new file mode 100644
index 00000000000..d2f430ed21c
--- /dev/null
+++ b/lang/gprolog/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+
+--- Ma2Asm/sparc_any.c	2000/07/03 10:18:06	1.1
++++ Ma2Asm/sparc_any.c	2000/07/03 10:18:52
+@@ -23,6 +23,7 @@
+ /*-------------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <string.h>
++#include <stdarg.h>
+ 
+ #include "../EnginePl/pl_params.h"
+ #include "../EnginePl/obj_chain.h"
diff --git a/lang/gprolog/pkg/COMMENT b/lang/gprolog/pkg/COMMENT
new file mode 100644
index 00000000000..ed9b627de23
--- /dev/null
+++ b/lang/gprolog/pkg/COMMENT
@@ -0,0 +1 @@
+GNU prolog compiler and interpreter
diff --git a/lang/gprolog/pkg/DESCR b/lang/gprolog/pkg/DESCR
new file mode 100644
index 00000000000..be100d584c1
--- /dev/null
+++ b/lang/gprolog/pkg/DESCR
@@ -0,0 +1,4 @@
+GNU Prolog is a native Prolog compiler with constraint solving over
+finite domains (FD) developed by Daniel Diaz. A lot of work has been
+devoted to the ISO compatibility. GNU Prolog is very close to the ISO
+standard (http://www.logic-programming.org/prolog_std.html).
diff --git a/lang/gprolog/pkg/PLIST b/lang/gprolog/pkg/PLIST
new file mode 100644
index 00000000000..17b4156dbb0
--- /dev/null
+++ b/lang/gprolog/pkg/PLIST
@@ -0,0 +1,210 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $
+bin/fd2c
+bin/gplc
+bin/gprolog
+bin/hexgplc
+bin/ma2asm
+bin/pl2wam
+bin/wam2ma
+libexec/gprolog-1.1.6/bin/fd2c
+libexec/gprolog-1.1.6/bin/gplc
+libexec/gprolog-1.1.6/bin/gprolog
+libexec/gprolog-1.1.6/bin/hexgplc
+libexec/gprolog-1.1.6/bin/ma2asm
+libexec/gprolog-1.1.6/bin/pl2wam
+libexec/gprolog-1.1.6/bin/wam2ma
+libexec/gprolog-1.1.6/include/arch_dep.h
+libexec/gprolog-1.1.6/include/atom.h
+libexec/gprolog-1.1.6/include/b_params.h
+libexec/gprolog-1.1.6/include/bc_supp.h
+libexec/gprolog-1.1.6/include/bips_fd.h
+libexec/gprolog-1.1.6/include/bips_pl.h
+libexec/gprolog-1.1.6/include/bool.h
+libexec/gprolog-1.1.6/include/c_supp.h
+libexec/gprolog-1.1.6/include/callinf_supp.h
+libexec/gprolog-1.1.6/include/dynam_supp.h
+libexec/gprolog-1.1.6/include/engine.h
+libexec/gprolog-1.1.6/include/engine_fd.h
+libexec/gprolog-1.1.6/include/engine_pl.h
+libexec/gprolog-1.1.6/include/error_supp.h
+libexec/gprolog-1.1.6/include/fd_hook_range.h
+libexec/gprolog-1.1.6/include/fd_inst.h
+libexec/gprolog-1.1.6/include/fd_range.h
+libexec/gprolog-1.1.6/include/fd_to_c.h
+libexec/gprolog-1.1.6/include/flag_supp.h
+libexec/gprolog-1.1.6/include/foreign_supp.h
+libexec/gprolog-1.1.6/include/gp_config.h
+libexec/gprolog-1.1.6/include/gprolog.h
+libexec/gprolog-1.1.6/include/hash.h
+libexec/gprolog-1.1.6/include/if_no_fd.h
+libexec/gprolog-1.1.6/include/inl_protos.h
+libexec/gprolog-1.1.6/include/linedit.h
+libexec/gprolog-1.1.6/include/machine.h
+libexec/gprolog-1.1.6/include/machine1.h
+libexec/gprolog-1.1.6/include/math_supp.h
+libexec/gprolog-1.1.6/include/mem_alloc.h
+libexec/gprolog-1.1.6/include/misc.h
+libexec/gprolog-1.1.6/include/obj_chain.h
+libexec/gprolog-1.1.6/include/oper.h
+libexec/gprolog-1.1.6/include/oper_supp.h
+libexec/gprolog-1.1.6/include/parse_supp.h
+libexec/gprolog-1.1.6/include/pl_params.h
+libexec/gprolog-1.1.6/include/pred.h
+libexec/gprolog-1.1.6/include/pred_supp.h
+libexec/gprolog-1.1.6/include/scan_supp.h
+libexec/gprolog-1.1.6/include/stream_supp.h
+libexec/gprolog-1.1.6/include/sys_conf.h
+libexec/gprolog-1.1.6/include/term_supp.h
+libexec/gprolog-1.1.6/include/test_oc_defs.h
+libexec/gprolog-1.1.6/include/wam_archi.h
+libexec/gprolog-1.1.6/include/wam_inst.h
+libexec/gprolog-1.1.6/include/wam_regs.h
+libexec/gprolog-1.1.6/include/write_supp.h
+libexec/gprolog-1.1.6/lib/all_fd_bips.o
+libexec/gprolog-1.1.6/lib/all_pl_bips.o
+libexec/gprolog-1.1.6/lib/debugger.o
+libexec/gprolog-1.1.6/lib/libbips_fd.a
+libexec/gprolog-1.1.6/lib/libbips_pl.a
+libexec/gprolog-1.1.6/lib/libengine_fd.a
+libexec/gprolog-1.1.6/lib/libengine_pl.a
+libexec/gprolog-1.1.6/lib/liblinedit.a
+libexec/gprolog-1.1.6/lib/obj_begin.o
+libexec/gprolog-1.1.6/lib/obj_end.o
+libexec/gprolog-1.1.6/lib/top_level.o
+share/doc/gprolog/manual.dvi
+share/doc/gprolog/manual.ps
+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/manual071.html
+share/doc/html/gprolog/next_motif.gif
+share/doc/html/gprolog/previous_motif.gif
+share/examples/gprolog/ExamplesFD/Makefile
+share/examples/gprolog/ExamplesFD/alpha.pl
+share/examples/gprolog/ExamplesFD/array.pl
+share/examples/gprolog/ExamplesFD/bdiag.pl
+share/examples/gprolog/ExamplesFD/bdonald.pl
+share/examples/gprolog/ExamplesFD/bpigeon.pl
+share/examples/gprolog/ExamplesFD/bqueens.pl
+share/examples/gprolog/ExamplesFD/bramsey.pl
+share/examples/gprolog/ExamplesFD/bridge.pl
+share/examples/gprolog/ExamplesFD/bridge1.pl
+share/examples/gprolog/ExamplesFD/bschur.pl
+share/examples/gprolog/ExamplesFD/bsend.pl
+share/examples/gprolog/ExamplesFD/cars.pl
+share/examples/gprolog/ExamplesFD/crypta.pl
+share/examples/gprolog/ExamplesFD/digit8.pl
+share/examples/gprolog/ExamplesFD/donald.pl
+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/magic.pl
+share/examples/gprolog/ExamplesFD/magsq.pl
+share/examples/gprolog/ExamplesFD/multipl.pl
+share/examples/gprolog/ExamplesFD/partit.pl
+share/examples/gprolog/ExamplesFD/qg5.pl
+share/examples/gprolog/ExamplesFD/queens.pl
+share/examples/gprolog/ExamplesFD/queens_fd.fd
+share/examples/gprolog/ExamplesFD/send.pl
+share/examples/gprolog/ExamplesFD/square.pl
+share/examples/gprolog/ExamplesFD/srq.pl
+share/examples/gprolog/ExamplesPl/Makefile
+share/examples/gprolog/ExamplesPl/boyer.pl
+share/examples/gprolog/ExamplesPl/browse.pl
+share/examples/gprolog/ExamplesPl/cal.pl
+share/examples/gprolog/ExamplesPl/chat_parser.pl
+share/examples/gprolog/ExamplesPl/crypt.pl
+share/examples/gprolog/ExamplesPl/ham.pl
+share/examples/gprolog/ExamplesPl/meta_qsort.pl
+share/examples/gprolog/ExamplesPl/nand.pl
+share/examples/gprolog/ExamplesPl/nrev.pl
+share/examples/gprolog/ExamplesPl/poly_10.pl
+share/examples/gprolog/ExamplesPl/queens.pl
+share/examples/gprolog/ExamplesPl/queens8.pl
+share/examples/gprolog/ExamplesPl/reducer.pl
+share/examples/gprolog/ExamplesPl/sdda.pl
+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
+@dirrm share/examples/gprolog/ExamplesPl
+@dirrm share/examples/gprolog/ExamplesFD
+@dirrm share/examples/gprolog
+@dirrm share/doc/html/gprolog
+@dirrm share/doc/gprolog
+@dirrm libexec/gprolog-1.1.6/lib
+@dirrm libexec/gprolog-1.1.6/include
+@dirrm libexec/gprolog-1.1.6/bin
+@dirrm libexec/gprolog-1.1.6