[Gsrc-commit] trunk r8772: update mercury to 22.01.3

[Carl Hansen]

------------------------------------------------------------
revno: 8772
revision-id: carlhansen1234@gmail.com-20221111072619-g02ypvkvrtqmm8kg
parent: carlhansen1234@gmail.com-20221111072556-0z6piu7zdsasnl2s
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Thu 2022-11-10 23:26:19 -0800
message:
  update mercury to 22.01.3
removed:
  pkg/other/mercury/files/       files-20220429015227-q62ho8v1zuig9sa4-1
  pkg/other/mercury/files/mercury.22.01.1.patch 
mercury.22.01.1.patc-20220429015227-q62ho8v1zuig9sa4-2
modified:
  pkg/other/mercury/Makefile     makefile-20181109194009-h0l0v02nsc5pw6mc-3
  pkg/other/mercury/sha256sums   sha256sums-20181109194009-h0l0v02nsc5pw6mc-4

=== modified file 'pkg/other/mercury/Makefile'
--- a/pkg/other/mercury/Makefile        2022-04-29 01:53:02 +0000
+++ b/pkg/other/mercury/Makefile        2022-11-11 07:26:19 +0000
@@ -21,7 +21,7 @@
 
 NAME =    Mercury
 GARNAME = mercury
-GARVERSION = 22.01.1
+GARVERSION = 22.01.3
 HOME_URL = http://www.mercurylang.org/
 DESCRIPTION =  Mercury logic programming language 
 define BLURB
@@ -40,10 +40,11 @@
 SIGFILES =
 LICENSE = Gnu GPL and LGPL
 WORKSRC = $(WORKDIR)/mercury-srcdist-$(GARVERSION)
+WORKOBJ = $(WORKSRC)
 
 BUILDDEPS =
 LIBDEPS =
-PATCHFILES =  mercury.22.01.1.patch
+#PATCHFILES =  mercury.22.01.1.patch
 
 #DESTDIR = $(packageprefix)
 ######################################################################
@@ -56,8 +57,12 @@
 #
 .PHONY: pre-install
 
-pre-install:
+pre-build:
+       echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+       echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
        echo Read the READMEs in the source to see if you need do something
        echo if you are not compiling on x86/x86_64 GNU/Linux
+       echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+       echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 

=== removed directory 'pkg/other/mercury/files'
=== removed file 'pkg/other/mercury/files/mercury.22.01.1.patch'
--- a/pkg/other/mercury/files/mercury.22.01.1.patch     2022-04-29 01:53:02 
+0000
+++ b/pkg/other/mercury/files/mercury.22.01.1.patch     1970-01-01 00:00:00 
+0000
@@ -1,56 +0,0 @@
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.1/util/info_to_mdb.c 
work/mercury-srcdist-22.01.1/util/info_to_mdb.c
---- tmp/mercury-srcdist-22.01.1/util/info_to_mdb.c     2020-10-10 
20:28:49.000000000 -0700
-+++ work/mercury-srcdist-22.01.1/util/info_to_mdb.c    2022-04-28 
17:39:38.124995557 -0700
-@@ -16,7 +16,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include "mercury_std.h"
-+#include "../runtime/mercury_std.h"
- 
- #define MAXLINELEN  160
- 
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.1/util/mdemangle.c 
work/mercury-srcdist-22.01.1/util/mdemangle.c
---- tmp/mercury-srcdist-22.01.1/util/mdemangle.c       2020-10-10 
20:28:49.000000000 -0700
-+++ work/mercury-srcdist-22.01.1/util/mdemangle.c      2022-04-28 
17:38:07.751578956 -0700
-@@ -25,7 +25,7 @@
- */
- 
- /* mercury_std.h includes mercury_regs.h, and must precede system headers */
--#include "mercury_std.h"
-+#include "../runtime/mercury_std.h"
- #include <ctype.h>
- #include <string.h>
- #include <stdlib.h>
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.1/util/mkinit.c 
work/mercury-srcdist-22.01.1/util/mkinit.c
---- tmp/mercury-srcdist-22.01.1/util/mkinit.c  2022-03-27 04:56:19.000000000 
-0700
-+++ work/mercury-srcdist-22.01.1/util/mkinit.c 2022-04-28 17:35:21.903814431 
-0700
-@@ -33,9 +33,9 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- // mercury_std.h includes mercury_regs.h, and must precede system headers.
--#include    "mercury_conf.h"
--#include    "mercury_std.h"
--#include    "mercury_array_macros.h"
-+#include    "../runtime/mercury_conf.h"
-+#include    "../runtime/mercury_std.h"
-+#include    "../runtime/mercury_array_macros.h"
- #include    "mkinit_common.h"
- 
- #include    <stdio.h>
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.1/util/mkinit_common.c 
work/mercury-srcdist-22.01.1/util/mkinit_common.c
---- tmp/mercury-srcdist-22.01.1/util/mkinit_common.c   2020-10-27 
01:57:07.000000000 -0700
-+++ work/mercury-srcdist-22.01.1/util/mkinit_common.c  2022-04-28 
17:37:27.390392899 -0700
-@@ -16,9 +16,9 @@
- */
- 
- /* mercury_std.h includes mercury_regs.h, and must precede system headers */
--#include    "mercury_conf.h"
--#include    "mercury_std.h"
--#include    "mercury_array_macros.h"
-+#include    "../runtime/mercury_conf.h"
-+#include    "../runtime/mercury_std.h"
-+#include    "../runtime/mercury_array_macros.h"
- #include    "mkinit_common.h"
- 
- #include    <stdio.h>

=== modified file 'pkg/other/mercury/sha256sums'
--- a/pkg/other/mercury/sha256sums      2022-04-29 01:53:46 +0000
+++ b/pkg/other/mercury/sha256sums      2022-11-11 07:26:19 +0000
@@ -1,2 +1,2 @@
-71922737fe06ef9502ae9ecdd61aae8bef8a02652e5a164eba9d48ed85c0e7ca  
download/mercury-srcdist-22.01.1.tar.xz
+4b0783ee9205021e4193b0404fd654e9c6fd288bc9bb7e144b1c1f6cd45dcd2e  
download/mercury-srcdist-22.01.3.tar.xz
 3a47b089068199843af502b9a997c9be1d9472e14f90ff8ef50b43899ace8d41  
download/mercury.22.01.1.patch