diff options
| -rw-r--r-- | lang/mercury/Makefile | 10 | ||||
| -rw-r--r-- | lang/mercury/distinfo | 8 | ||||
| -rw-r--r-- | lang/mercury/patches/patch-ad | 24 | ||||
| -rw-r--r-- | lang/mercury/patches/patch-ai | 13 | ||||
| -rw-r--r-- | lang/mercury/patches/patch-aj | 12 | ||||
| -rw-r--r-- | lang/mercury/patches/patch-ak | 22 | ||||
| -rw-r--r-- | lang/mercury/patches/patch-al | 24 |
7 files changed, 107 insertions, 6 deletions
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index dd2a04aca0d..1e26d9cdf80 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/27 00:53:11 heinz Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 03:04:31 kristerw Exp $ DISTNAME= mercury-compiler-0.11.0 PKGNAME= mercury-0.11.0 @@ -24,6 +24,14 @@ CONFIGURE_ENV+= CC=gcc MAKE_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline} +post-patch: + ${TOUCH} \ + ${WRKSRC}/library/table_builtin.date3 \ + ${WRKSRC}/library/table_builtin.date \ + ${WRKSRC}/library/table_builtin.optdate \ + ${WRKSRC}/library/table_builtin.trans_opt_date \ + ${WRKSRC}/library/table_builtin.c_date + do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE} INSTALL_PREFIX=${WRKSRC}/tmp \ diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo index 6cde3da7d38..7f0d4026297 100644 --- a/lang/mercury/distinfo +++ b/lang/mercury/distinfo @@ -1,12 +1,16 @@ -$NetBSD: distinfo,v 1.5 2003/07/05 21:16:37 seb Exp $ +$NetBSD: distinfo,v 1.6 2004/02/14 03:04:31 kristerw Exp $ SHA1 (mercury-compiler-0.11.0.tar.gz) = 17feadfa8e8783738fc18428c6ab59b61c1e8a73 Size (mercury-compiler-0.11.0.tar.gz) = 15598754 bytes SHA1 (patch-aa) = 4cfe2e7cc82d98f7338e8e3e4b753f6bdec0472f SHA1 (patch-ab) = b253e9a8da66e44b94d621a8b212d4229e269e8f SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681 -SHA1 (patch-ad) = 890e8330e7d1d668a8d67668ed805b61274c2ae5 +SHA1 (patch-ad) = a76030a9c15d160c46d2003aba5b74e6b7bed6e2 SHA1 (patch-ae) = 0d9105492d30e915da33d1679ce65ab615866875 SHA1 (patch-af) = 2ed2b8d098c01ad1b79a8308885ba0af9b5bf05f SHA1 (patch-ag) = cb846e04ad686ebafbd1826235f9c5cbea619eed SHA1 (patch-ah) = 460ff322fda6ad3dcde3de459a15cdb2a35d3946 +SHA1 (patch-ai) = 4f1df99df946118a0c2eb4a5e2481036d5c44177 +SHA1 (patch-aj) = fb0df25aeb55a1c466fa0def40b7096269ba8d6c +SHA1 (patch-ak) = 20223ebfa573659d2217b6177bf2e2b523eb248d +SHA1 (patch-al) = 5eb7f071049b163807f7a0c833eeecd941e7cbfb diff --git a/lang/mercury/patches/patch-ad b/lang/mercury/patches/patch-ad index de77d8cfc9e..b628844eba3 100644 --- a/lang/mercury/patches/patch-ad +++ b/lang/mercury/patches/patch-ad @@ -1,7 +1,25 @@ -$NetBSD: patch-ad,v 1.2 2003/05/02 17:48:30 jtb Exp $ +$NetBSD: patch-ad,v 1.3 2004/02/14 03:04:31 kristerw Exp $ ---- doc/Mmakefile.orig -+++ doc/Mmakefile +--- doc/Mmakefile.orig Fri Nov 29 08:06:19 2002 ++++ doc/Mmakefile Fri Feb 13 23:26:07 2004 +@@ -177,7 +177,7 @@ + # Note that some modules are just implementation details of the library, + # so they are not documented. + +-library-menu.texi_pp: $(LIBRARY_DIR)/*.m ++library-menu.texi_pp: + { \ + echo ""; \ + for filename in $(LIBRARY_DIR)/*.m; do \ +@@ -199,7 +199,7 @@ + done; \ + } > library-menu.texi_pp + +-library-chapters.texi_pp: $(LIBRARY_DIR)/[a-z]*.m ++library-chapters.texi_pp: + for filename in $(LIBRARY_DIR)/[a-z]*.m; do \ + case $$filename in \ + $(LIBRARY_DIR)/mer_std.m) \ @@ -271,7 +271,7 @@ .PHONY: install_info diff --git a/lang/mercury/patches/patch-ai b/lang/mercury/patches/patch-ai new file mode 100644 index 00000000000..718a701d470 --- /dev/null +++ b/lang/mercury/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.4 2004/02/14 03:04:31 kristerw Exp $ + +--- scripts/mgnuc.in.orig Fri Feb 13 16:49:12 2004 ++++ scripts/mgnuc.in Wed Oct 30 17:35:37 2002 +@@ -51,7 +51,7 @@ + # -Wenum-clash is for C++ only + # -Wunused causes various spurious warnings + +- OPT_OPTS="-O2 -fomit-frame-pointer" ++ OPT_OPTS="-O2 -fomit-frame-pointer -fno-strict-aliasing" + DEBUG_OPT="-g" + COMPILER=gcc + ;; diff --git a/lang/mercury/patches/patch-aj b/lang/mercury/patches/patch-aj new file mode 100644 index 00000000000..b6244596f2f --- /dev/null +++ b/lang/mercury/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.3 2004/02/14 03:04:31 kristerw Exp $ + +--- runtime/mercury_memory_zones.c.orig Fri Feb 13 16:18:20 2004 ++++ runtime/mercury_memory_zones.c Fri Feb 13 16:22:11 2004 +@@ -30,6 +30,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <signal.h> + + #ifdef MR_HAVE_SYS_SIGINFO_H + #include <sys/siginfo.h> diff --git a/lang/mercury/patches/patch-ak b/lang/mercury/patches/patch-ak new file mode 100644 index 00000000000..77be9ac8bb5 --- /dev/null +++ b/lang/mercury/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.3 2004/02/14 03:04:31 kristerw Exp $ + +--- library/table_builtin.m.orig Fri Feb 13 18:47:59 2004 ++++ library/table_builtin.m Fri Feb 13 18:48:23 2004 +@@ -537,7 +537,7 @@ + + #ifdef MR_DEBUG_RETRY + if (MR_io_tabling_debug) { +- printf("" in range\n""); ++ printf("" in range\\n""); + } + #endif + +@@ -546,7 +546,7 @@ + + #ifdef MR_DEBUG_RETRY + if (MR_io_tabling_debug) { +- printf("" not in range\n""); ++ printf("" not in range\\n""); + } + #endif + SUCCESS_INDICATOR = MR_FALSE; diff --git a/lang/mercury/patches/patch-al b/lang/mercury/patches/patch-al new file mode 100644 index 00000000000..7aeeaa7b1db --- /dev/null +++ b/lang/mercury/patches/patch-al @@ -0,0 +1,24 @@ +$NetBSD: patch-al,v 1.3 2004/02/14 03:04:31 kristerw Exp $ + +--- library/table_builtin.c.orig Fri Feb 13 16:29:53 2004 ++++ library/table_builtin.c Fri Feb 13 16:31:20 2004 +@@ -652,8 +652,7 @@ + + #ifdef MR_DEBUG_RETRY + if (MR_io_tabling_debug) { +- printf(" in range +-"); ++ printf(" in range\n"); + } + #endif + +@@ -662,8 +661,7 @@ + + #ifdef MR_DEBUG_RETRY + if (MR_io_tabling_debug) { +- printf(" not in range +-"); ++ printf(" not in range\n"); + } + #endif + SUCCESS_INDICATOR = MR_FALSE; |