diff options
| -rw-r--r-- | lang/gprolog/Makefile | 4 | ||||
| -rw-r--r-- | lang/gprolog/PLIST | 4 | ||||
| -rw-r--r-- | lang/gprolog/distinfo | 17 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-aa | 18 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ab | 32 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ac | 22 | ||||
| -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 | 22 | ||||
| -rw-r--r-- | lang/gprolog/patches/patch-ba | 40 |
10 files changed, 34 insertions, 160 deletions
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile index ca522c121e1..83002d4c923 100644 --- a/lang/gprolog/Makefile +++ b/lang/gprolog/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2008/09/07 04:35:41 dholland Exp $ +# $NetBSD: Makefile,v 1.13 2010/05/19 09:10:55 asau Exp $ -DISTNAME= gprolog-1.3.0 +DISTNAME= gprolog-1.3.1 CATEGORIES= lang MASTER_SITES= ${HOMEPAGE} diff --git a/lang/gprolog/PLIST b/lang/gprolog/PLIST index d54a63874f6..48829c4f59d 100644 --- a/lang/gprolog/PLIST +++ b/lang/gprolog/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:03:33 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/05/19 09:10:55 asau Exp $ bin/fd2c bin/gplc bin/gprolog @@ -114,6 +114,8 @@ 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/gprolog072.html +share/doc/gprolog/html/gprolog073.html share/doc/gprolog/html/index.html share/doc/gprolog/html/next_motif.gif share/doc/gprolog/html/previous_motif.gif diff --git a/lang/gprolog/distinfo b/lang/gprolog/distinfo index 07528563291..d8c85220687 100644 --- a/lang/gprolog/distinfo +++ b/lang/gprolog/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.9 2009/06/04 05:29:33 hasso Exp $ +$NetBSD: distinfo,v 1.10 2010/05/19 09:10:55 asau Exp $ -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-aa) = 6c63d651aee30a9933a302469018e39b06cb7a0a -SHA1 (patch-ab) = 41863a6f02d675a2526966fdb7a7354df161c657 -SHA1 (patch-ac) = edd1fbe7816fd07cf377dc513cd48c11aaf9470d -SHA1 (patch-ad) = bf95eace095f8a0ce92f678b0401c86db4f89ffa -SHA1 (patch-ae) = 10d1af60aed05009a08f95c90e7c8607d64c7b9b -SHA1 (patch-af) = 228a7b4f5a3d1c30a8f8f00b83b19304c29e9ca9 -SHA1 (patch-ba) = ccf0dc3c57fcd611ac03ef16dc28b08348d620fd +SHA1 (gprolog-1.3.1.tar.gz) = d2912847725a0d917c6937c9402bcc21072b1a73 +RMD160 (gprolog-1.3.1.tar.gz) = f942f82e4034a59fd0bc5276542872375d7dc801 +Size (gprolog-1.3.1.tar.gz) = 2949369 bytes +SHA1 (patch-aa) = ed0551e82547c6bce9dab37b1628812976399d2e +SHA1 (patch-ab) = cd0305c3c407e815f92a36af7e30c5085e8d7aa7 diff --git a/lang/gprolog/patches/patch-aa b/lang/gprolog/patches/patch-aa index 100621719b3..79f6442a3f7 100644 --- a/lang/gprolog/patches/patch-aa +++ b/lang/gprolog/patches/patch-aa @@ -1,21 +1,21 @@ -$NetBSD: patch-aa,v 1.6 2009/06/04 05:29:33 hasso Exp $ +$NetBSD: patch-aa,v 1.7 2010/05/19 09:10:55 asau Exp $ ---- src/configure.in.orig 2007-01-04 12:21:52 +0200 -+++ src/configure.in 2009-06-04 05:40:57 +0300 -@@ -318,6 +318,7 @@ else +--- src/configure.in.orig 2009-02-10 15:52:55.000000000 +0300 ++++ src/configure.in 2010-05-19 12:23:09.000000000 +0400 +@@ -327,6 +327,7 @@ + mingw*) AC_DEFINE(M_mingw) MINGW=yes; WIN32=yes;; *sco*) AC_DEFINE(M_sco);; *bsd*) AC_DEFINE(M_bsd);; - *darwin*) AC_DEFINE(M_bsd);; + *dragonfly*) AC_DEFINE(M_bsd);; + *darwin*) AC_DEFINE(M_darwin);; esac - case "$host" in -@@ -328,10 +329,13 @@ else - alpha*osf*) AC_DEFINE(M_alpha_osf);; +@@ -339,11 +340,13 @@ alpha*linux*) AC_DEFINE(M_alpha_linux);; x86_64*linux*) AC_DEFINE(M_x86_64_linux);; -+ x86_64*bsd*) AC_DEFINE(M_x86_64_bsd);; + x86_64*bsd*) AC_DEFINE(M_x86_64_bsd);; + x86_64*dragonfly*) AC_DEFINE(M_x86_64_bsd);; + x86_64*solaris*) AC_DEFINE(M_x86_64_solaris);; i*86*linux*) AC_DEFINE(M_ix86_linux);; i*86*solaris*) AC_DEFINE(M_ix86_solaris);; i*86*sco*) AC_DEFINE(M_ix86_sco);; diff --git a/lang/gprolog/patches/patch-ab b/lang/gprolog/patches/patch-ab index e42db432d30..26150cb39fe 100644 --- a/lang/gprolog/patches/patch-ab +++ b/lang/gprolog/patches/patch-ab @@ -1,34 +1,30 @@ -$NetBSD: patch-ab,v 1.7 2009/06/04 05:29:33 hasso Exp $ +$NetBSD: patch-ab,v 1.8 2010/05/19 09:10:55 asau Exp $ ---- src/configure.orig 2007-01-05 14:13:28 +0200 -+++ src/configure 2009-06-04 05:45:38 +0300 -@@ -3523,6 +3523,10 @@ _ACEOF +--- src/configure.orig 2009-02-10 18:16:50.000000000 +0300 ++++ src/configure 2010-05-19 12:27:07.000000000 +0400 +@@ -3529,6 +3529,10 @@ #define M_bsd 1 _ACEOF ;; -+ *dragonfly*) cat >>confdefs.h <<\_ACEOF ++ *dragonfly*) cat >>confdefs.h <<\_ACEOF +#define M_bsd 1 +_ACEOF +;; - esac - - case "$host" in -@@ -3554,6 +3558,14 @@ _ACEOF - #define M_x86_64_linux 1 + *darwin*) cat >>confdefs.h <<\_ACEOF + #define M_darwin 1 + _ACEOF +@@ -3568,6 +3572,10 @@ + #define M_x86_64_bsd 1 _ACEOF ;; -+ x86_64*bsd*) cat >>confdefs.h <<\_ACEOF -+#define M_x86_64_bsd 1 -+_ACEOF -+;; -+ x86_64*dragonfly*) cat >>confdefs.h <<\_ACEOF ++ x86_64*dragonfly*) cat >>confdefs.h <<\_ACEOF +#define M_x86_64_bsd 1 +_ACEOF +;; - i*86*linux*) cat >>confdefs.h <<\_ACEOF - #define M_ix86_linux 1 + x86_64*solaris*) cat >>confdefs.h <<\_ACEOF + #define M_x86_64_solaris 1 _ACEOF -@@ -3570,6 +3582,10 @@ _ACEOF +@@ -3588,6 +3596,10 @@ #define M_ix86_bsd 1 _ACEOF ;; diff --git a/lang/gprolog/patches/patch-ac b/lang/gprolog/patches/patch-ac deleted file mode 100644 index e995462b600..00000000000 --- a/lang/gprolog/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2008/09/07 04:35:41 dholland Exp $ - ---- src/Ma2Asm/FromC/mach.h~ 2007-01-04 05:21:48.000000000 -0500 -+++ src/Ma2Asm/FromC/mach.h 2008-09-07 00:03:37.000000000 -0400 -@@ -13,7 +13,7 @@ - - #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_x86_64_linux) || \ -+ defined(M_x86_64_linux) || defined(m_x86_64_bsd) || \ - defined(M_powerpc_bsd) || defined(M_sparc_bsd) || defined(__ELF__) - - # define M_Asm_Symbol1(name) #name -@@ -64,7 +64,7 @@ - - # define M_Direct_Goto(lab) {_asm {jmp M_Asm_Symbol(lab)}; return;} - --#elif defined(M_x86_64_linux) -+#elif defined(M_x86_64) - - # define M_Direct_Goto(lab) {asm("jmp " M_Asm_Symbol(lab)); return;} - diff --git a/lang/gprolog/patches/patch-ad b/lang/gprolog/patches/patch-ad deleted file mode 100644 index 32c47715b18..00000000000 --- a/lang/gprolog/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2008/09/07 04:35:41 dholland Exp $ - ---- src/EnginePl/gp_config.h.in~ 2007-01-04 05:21:49.000000000 -0500 -+++ src/EnginePl/gp_config.h.in 2008-09-07 00:04:54.000000000 -0400 -@@ -177,6 +177,8 @@ - /* Define if the system is a x86-64/linux */ - #undef M_x86_64_linux - -+/* Define if the system is a x86-64/bsd */ -+#undef M_x86_64_bsd - - - /* Constant definitions */ diff --git a/lang/gprolog/patches/patch-ae b/lang/gprolog/patches/patch-ae deleted file mode 100644 index cbfbd205294..00000000000 --- a/lang/gprolog/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2008/09/07 04:35:41 dholland Exp $ - ---- src/EnginePl/engine1.c~ 2007-01-04 05:35:13.000000000 -0500 -+++ src/EnginePl/engine1.c 2008-09-07 00:09:12.000000000 -0400 -@@ -100,7 +100,7 @@ Call_Compiled(CodePtr codep) - register WamWord *rb asm("%l0") = reg_bank; - ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */ - --#elif defined(M_x86_64_linux) -+#elif defined(M_x86_64) - - register WamWord *rb asm("%r12") = reg_bank; - ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */ -@@ -113,7 +113,7 @@ Call_Compiled(CodePtr codep) - #if defined(M_ix86_darwin) /* see comment in Ma2Asm/ix86_any.c */ - asm("andl $0xfffffff0,%esp"); - asm("addl $4,%esp"); --#elif defined(M_x86_64_linux) /* see comment in Ma2Asm/x86_64_any.c */ -+#elif defined(M_x86_64) /* see comment in Ma2Asm/x86_64_any.c */ - asm("andq $0xfffffffffffffff0,%rsp"); - asm("addq $8,%rsp"); - #endif diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af deleted file mode 100644 index 4faef71b39b..00000000000 --- a/lang/gprolog/patches/patch-af +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-af,v 1.6 2008/09/07 04:35:41 dholland Exp $ - ---- src/EnginePl/engine.c~ 2007-01-04 05:35:13.000000000 -0500 -+++ src/EnginePl/engine.c 2008-09-07 00:10:33.000000000 -0400 -@@ -455,7 +455,7 @@ Call_Prolog_Fail(void) - { - #ifdef M_ix86_darwin /* see comment in Ma2Asm/ix86_any.c */ - asm("subl $4,%esp"); --#elif defined(M_x86_64_linux) /* see comment in Ma2Asm/x86_64_any.c */ -+#elif defined(M_x86_64) /* see comment in Ma2Asm/x86_64_any.c */ - asm("subq $8,%rsp"); - #endif - Save_Machine_Regs(p_buff_save); -@@ -475,7 +475,7 @@ Call_Prolog_Success(void) - { - #ifdef M_ix86_darwin /* see comment in Ma2Asm/ix86_any.c */ - asm("subl $4,%esp"); --#elif defined(M_x86_64_linux) /* see comment in Ma2Asm/x86_64_any.c */ -+#elif defined(M_x86_64) /* see comment in Ma2Asm/x86_64_any.c */ - asm("subq $8,%rsp"); - #endif - Save_Machine_Regs(p_buff_save); diff --git a/lang/gprolog/patches/patch-ba b/lang/gprolog/patches/patch-ba deleted file mode 100644 index 0bc53a237c8..00000000000 --- a/lang/gprolog/patches/patch-ba +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2008/09/07 04:35:41 dholland Exp $ - ---- src/EnginePl/machine.c.orig 2007-01-04 05:35:13.000000000 -0500 -+++ src/EnginePl/machine.c 2008-09-07 00:07:29.000000000 -0400 -@@ -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) - -@@ -482,7 +482,7 @@ SIGSEGV_Handler(WamWord *addr) - void - SIGSEGV_Handler(int sig, int code, struct sigcontext *scp) - --#elif defined(M_x86_64_linux) -+#elif defined(M_x86_64_linux) || defined(M_x86_64_bsd) - void - SIGSEGV_Handler(int sig, siginfo_t *sip, void *scp) - -@@ -509,7 +509,7 @@ SIGSEGV_Handler(int sig) - - WamWord *addr = (WamWord *) scp.cr2; - --#elif defined(M_x86_64_linux) -+#elif defined(M_x86_64_linux) || defined(M_x86_64_bsd) - - WamWord *addr = (WamWord *) sip->si_addr; - -@@ -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; - |