[Gsrc-commit] trunk r8305: mercury 22.01.1

[Carl Hansen]

------------------------------------------------------------
revno: 8305
revision-id: carlhansen1234@gmail.com-20220429015302-pmatxz096799rvhx
parent: carlhansen1234@gmail.com-20220428171302-q5pve5h9pqll3wl9
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Thu 2022-04-28 18:53:02 -0700
message:
  mercury 22.01.1
added:
  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/config.mk    config.mk-20181109194009-h0l0v02nsc5pw6mc-2
  pkg/other/mercury/sha256sums   sha256sums-20181109194009-h0l0v02nsc5pw6mc-4

=== modified file 'pkg/other/mercury/Makefile'
--- a/pkg/other/mercury/Makefile        2021-07-29 21:48:10 +0000
+++ b/pkg/other/mercury/Makefile        2022-04-29 01:53:02 +0000
@@ -1,4 +1,4 @@
-# Copyright ©2018,2019,2020,2021 Carl Hansen <carlhansen@gnu.org>
+# Copyright ©2018,2019,2020,2021,2022 Carl Hansen <carlhansen@gnu.org>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 # http://www.gnu.org/software/gsrc
@@ -21,7 +21,7 @@
 
 NAME =    Mercury
 GARNAME = mercury
-GARVERSION = 20.06.1
+GARVERSION = 22.01.1
 HOME_URL = http://www.mercurylang.org/
 DESCRIPTION =  Mercury logic programming language 
 define BLURB
@@ -43,12 +43,14 @@
 
 BUILDDEPS =
 LIBDEPS =
+PATCHFILES =  mercury.22.01.1.patch
 
 #DESTDIR = $(packageprefix)
 ######################################################################
 
 include ../../../gar/gar.lib/auto.mk
 include config.mk 
+
 # important
 # Does "minimal install. The READMEs may help about additions.
 #

=== modified file 'pkg/other/mercury/config.mk'
--- a/pkg/other/mercury/config.mk       2021-07-29 21:48:10 +0000
+++ b/pkg/other/mercury/config.mk       2022-04-29 01:53:02 +0000
@@ -6,3 +6,4 @@
 
 
 
+CFLAGS+=-I$(WORDSRC)/runtime

=== added directory 'pkg/other/mercury/files'
=== added file 'pkg/other/mercury/files/mercury.22.01.1.patch'
--- a/pkg/other/mercury/files/mercury.22.01.1.patch     1970-01-01 00:00:00 
+0000
+++ b/pkg/other/mercury/files/mercury.22.01.1.patch     2022-04-29 01:53:02 
+0000
@@ -0,0 +1,56 @@
+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      2021-07-29 20:57:48 +0000
+++ b/pkg/other/mercury/sha256sums      2022-04-29 01:53:02 +0000
@@ -1,1 +1,1 @@
-b1825d7d8efe5c794a234094c8f35ecebc7b22f8dbe8f78012445bf3cd1ead06  
download/mercury-srcdist-20.06.1.tar.xz
+71922737fe06ef9502ae9ecdd61aae8bef8a02652e5a164eba9d48ed85c0e7ca  
download/mercury-srcdist-22.01.1.tar.xz