diff options
| author | jschauma <jschauma> | 2002-11-13 20:15:10 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2002-11-13 20:15:10 +0000 |
| commit | b9e3bbe8a79375367b0cdadb11ca3e769c5321cc (patch) | |
| tree | 0289e1bafa810440c4448d9f289eca3c58b1ba4f | |
| parent | 46355afbf2e665c16ca20f72f6cedf4f4abc065f (diff) | |
| download | pkgsrc-b9e3bbe8a79375367b0cdadb11ca3e769c5321cc.tar.gz | |
Update to gprolog 1.2.16.
NetBSD patches were apparently merged in version 1.1.7
Since then, several releases have been made, so that the list of changes
is too extensive to be included here. Please see
ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/NEWS and/or the
documentation in this package.
This addresses PR pkg/18962 by Mr. Jan Schaumann.
| -rw-r--r-- | lang/gprolog/Makefile | 10 | ||||
| -rw-r--r-- | lang/gprolog/PLIST | 220 | ||||
| -rw-r--r-- | lang/gprolog/distinfo | 24 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-aa | 22 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ab | 68 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ac | 12 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ad | 13 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ae | 22 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-af | 13 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ag | 13 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ah | 22 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ai | 13 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-aj | 116 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ak | 270 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-al | 62 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-am | 12 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-an | 10 |
17 files changed, 144 insertions, 778 deletions
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile index 61e3a71d3b1..e8181b832de 100644 --- a/lang/gprolog/Makefile +++ b/lang/gprolog/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:10 agc Exp $ +# $NetBSD: Makefile,v 1.4 2002/11/13 20:15:10 jschauma Exp $ # -DISTNAME= gprolog-1.1.6 +DISTNAME= gprolog-1.2.16 CATEGORIES= lang -MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/contraintes/gnu-prolog/unstable/ +MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/ MAINTAINER= brook@nmsu.edu HOMEPAGE= http://gnu-prolog.inria.fr/ @@ -12,10 +12,10 @@ COMMENT= GNU prolog compiler and interpreter ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-install-dir=${PREFIX}/libexec/gprolog-1.1.6 \ +CONFIGURE_ARGS+= --with-install-dir=${PREFIX}/libexec/${PKGNAME} \ --with-doc-dir=${PREFIX}/share/doc/gprolog \ --with-html-dir=${PREFIX}/share/doc/html/gprolog \ - --with-example-dir=${PREFIX}/share/examples/gprolog \ + --with-examples-dir=${PREFIX}/share/examples/gprolog \ --with-c-flags='-O3 -finline-functions -fomit-frame-pointer -D__unix__=1' WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/lang/gprolog/PLIST b/lang/gprolog/PLIST index d6d8d695a65..c4577f18c4f 100644 --- a/lang/gprolog/PLIST +++ b/lang/gprolog/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:28 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/11/13 20:15:11 jschauma Exp $ bin/fd2c bin/gplc bin/gprolog @@ -6,73 +6,98 @@ 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 +libexec/${PKGNAME}/COPYING +libexec/${PKGNAME}/ChangeLog +share/examples/gprolog/ExamplesC/Makefile +share/examples/gprolog/ExamplesC/README +share/examples/gprolog/ExamplesC/examp.pl +share/examples/gprolog/ExamplesC/examp_c.c +share/examples/gprolog/ExamplesC/new_main.pl +share/examples/gprolog/ExamplesC/new_main_c.c +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/PROGS +share/examples/gprolog/ExamplesPl/README +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/common.pl +share/examples/gprolog/ExamplesPl/crypt.pl +share/examples/gprolog/ExamplesPl/ham.pl +share/examples/gprolog/ExamplesPl/hook.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/qsort.pl +share/examples/gprolog/ExamplesPl/queens.pl +share/examples/gprolog/ExamplesPl/queensn.pl +share/examples/gprolog/ExamplesPl/query.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 +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 @@ -147,64 +172,17 @@ 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 -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/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/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 diff --git a/lang/gprolog/distinfo b/lang/gprolog/distinfo index d92344ff031..89f478c27d5 100644 --- a/lang/gprolog/distinfo +++ b/lang/gprolog/distinfo @@ -1,18 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 15:00:51 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/11/13 20:15:11 jschauma Exp $ -SHA1 (gprolog-1.1.6.tar.gz) = 61578cccaf8fa888dc41519dc3a293658d470219 -Size (gprolog-1.1.6.tar.gz) = 1392424 bytes -SHA1 (patch-aa) = 30e60e40beeaadff6ec67c0b7f04df6bdb0fd9d7 -SHA1 (patch-ab) = 112857bae84dc0e72a4c31c4131f0ba99d97f817 -SHA1 (patch-ac) = b55718ecfab2b4c817316866bcd3f539ced9218a -SHA1 (patch-ad) = e05b23a90f5c4be13bd60fa47147258a2aa6353d -SHA1 (patch-ae) = 46b185aeb644bddeb487335e8c71fd4e5ec43587 -SHA1 (patch-af) = 07e0d8296e0fc1134059dfd354f3b3b39e3cc291 -SHA1 (patch-ag) = 3bf82fd13451b8c5eb3198ec0e1a94bd1864d174 -SHA1 (patch-ah) = 895b36c625d1cb599b448c223f3fd588ecd052a6 -SHA1 (patch-ai) = 178cfb03ef829be3aaea14a1e7522ed359266dc0 -SHA1 (patch-aj) = 64ab46ac10250b92971fcebee4dd79acd27dd41a -SHA1 (patch-ak) = 9de57154b861372ac9060eb99973f855de56faac -SHA1 (patch-al) = 332a123e2587b3126638f4a48b2077925eed4c45 -SHA1 (patch-am) = 52f690c6d58b5d063871d57050170bd444c18eb1 -SHA1 (patch-an) = 61bbe4ec61f8b7db13a47f0b9a66ed3e460af823 +SHA1 (gprolog-1.2.16.tar.gz) = 128071ff640be38782b943218762e09ef0287dc6 +Size (gprolog-1.2.16.tar.gz) = 2478633 bytes +SHA1 (patch-aa) = 11cef0fd91bcfa21c264f5d2f44d1a06c6075177 +SHA1 (patch-ae) = 76b3303531f950a57145c4b713559e3fbb98ef10 +SHA1 (patch-al) = 5745b485e5cfc82142148f49ab69f307fe7b71cf +SHA1 (patch-an) = 83ad8ca1db7188bca13f1df031ac37399c35f004 diff --git a/lang/gprolog/patches/patch-aa b/lang/gprolog/patches/patch-aa index 320e0a29cca..2eac1163418 100644 --- a/lang/gprolog/patches/patch-aa +++ b/lang/gprolog/patches/patch-aa @@ -1,23 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2000/08/25 13:37:51 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2002/11/13 20:15:11 jschauma 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 @@ +--- 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 --#ifdef M_ix86_cygwin -+#if defined(M_ix86_cygwin) || !defined(__ELF__) +-#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 "_" -@@ -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 deleted file mode 100644 index 0b25eba78e6..00000000000 --- a/lang/gprolog/patches/patch-ab +++ /dev/null @@ -1,68 +0,0 @@ -$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 deleted file mode 100644 index bfec5655c01..00000000000 --- a/lang/gprolog/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 229a5757fe9..00000000000 --- a/lang/gprolog/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$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 index 48bde711c88..3128a684f24 100644 --- a/lang/gprolog/patches/patch-ae +++ b/lang/gprolog/patches/patch-ae @@ -1,20 +1,16 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $ +$NetBSD: patch-ae,v 1.2 2002/11/13 20:15:12 jschauma 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 +--- EnginePl/gp_config.h.orig Wed Nov 13 13:35:46 2002 ++++ EnginePl/gp_config.h Wed Nov 13 13:36:56 2002 +@@ -30,7 +30,10 @@ + /* #undef HAVE_SYS_IOCTL_COMPAT_H */ -+/* Define if you have sys/ioctl_compat.h */ -+#undef HAVE_SYS_IOCTL_COMPAT_H -+ -+/* Define if you have termios.h */ + /* Define if you have termios.h */ +-#define HAVE_TERMIOS_H 1 +#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 + /* Define if you have termios.h */ + #define HAVE_MALLOC_H 1 diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af deleted file mode 100644 index bc12957c2f8..00000000000 --- a/lang/gprolog/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 7641aaf8809..00000000000 --- a/lang/gprolog/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 14338be88b6..00000000000 --- a/lang/gprolog/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index 1938c217e72..00000000000 --- a/lang/gprolog/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 5e81f9702b4..00000000000 --- a/lang/gprolog/patches/patch-aj +++ /dev/null @@ -1,116 +0,0 @@ -$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 deleted file mode 100644 index 75d830a992b..00000000000 --- a/lang/gprolog/patches/patch-ak +++ /dev/null @@ -1,270 +0,0 @@ -$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 index abc45c6c432..5595c1ed2a6 100644 --- a/lang/gprolog/patches/patch-al +++ b/lang/gprolog/patches/patch-al @@ -1,55 +1,21 @@ -$NetBSD: patch-al,v 1.1.1.1 2000/07/03 10:27:50 agc Exp $ +$NetBSD: patch-al,v 1.2 2002/11/13 20:15:14 jschauma Exp $ ---- Makefile.in.orig Wed Jun 28 03:33:40 2000 -+++ Makefile.in Fri Jun 30 12:54:15 2000 +--- 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@ - 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 ++PREFIX = @prefix@ + ROOT_DIR = @ROOT_DIR@ + PKG_NAME = @PKG_NAME@ -@@ -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: +@@ -57,7 +58,7 @@ + install-system: ./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 + $(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 d2f430ed21c..00000000000 --- a/lang/gprolog/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$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/patches/patch-an b/lang/gprolog/patches/patch-an index fb9d45c1243..694602de0e0 100644 --- a/lang/gprolog/patches/patch-an +++ b/lang/gprolog/patches/patch-an @@ -1,11 +1,9 @@ -$NetBSD: patch-an,v 1.1 2000/08/25 13:37:51 wiz Exp $ +$NetBSD: patch-an,v 1.2 2002/11/13 20:15:14 jschauma Exp $ -On ELF machines, don't try to add a '_' prefix to external funcs - ---- Ma2Asm/FromC/mach.h 2000/08/25 10:17:32 1.1 -+++ Ma2Asm/FromC/mach.h 2000/08/25 10:18:26 +--- Ma2Asm/FromC/mach.h.orig Wed Nov 13 13:46:19 2002 ++++ Ma2Asm/FromC/mach.h Wed Nov 13 13:47:00 2002 @@ -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) |