lang/algol68g: update to version 3.1.0

Most pkgsrc patches were incorporated.

From the NEWS file:

Version 3.1.0, November 2022
* Fix several bugs reported for 3.0.0-8.
* Apply several OS dependent patches reported for 3.0.0-8.
* READ and INCLUDE relative to the source file, not the present working directory.
  This conforms to the C preprocessor standard.

Versions 3.0.1-8, January/September 2022
* Fix several bugs reported for 3.0.0-7.
* Apply several OS dependent patches reported for 3.0.0-7.
* Update a68g.exe to GSL 2.7.1 and R mathlib 4.1.2.

8 files changed, 26 insertions, 123 deletions

diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index d27dbde9349..120ddd8c54c 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2022/04/03 13:56:50 rhialto Exp $
+# $NetBSD: Makefile,v 1.21 2022/12/04 17:11:13 rhialto Exp $
 
-DISTNAME=	algol68g-3.0.4
+DISTNAME=	algol68g-3.1.0
 CATEGORIES=	lang
 MASTER_SITES=	http://jmvdveer.home.xs4all.nl/
 
@@ -13,18 +13,6 @@ USE_LANGUAGES=	c
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir=${PREFIX}/share/doc/${PKGBASE}
 
-SUBST_CLASSES+=		fix-path
-SUBST_STAGE.fix-path=	pre-configure
-SUBST_MESSAGE.fix-path=	Fixing /usr/local path.
-SUBST_FILES.fix-path+=	Makefile.in
-SUBST_SED.fix-path=	-e 's,/usr/local/include/algol68g,${PREFIX}/include/algol68g,g'
-
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	pre-configure
-SUBST_MESSAGE.prefix=	Adding ${PREFIX}/include to compiler arguments.
-SUBST_FILES.prefix+=	src/a68g/a68g.c
-SUBST_VARS.prefix+=	PREFIX
-
 TEST_TARGET=	check
 
 .include "options.mk"
diff --git a/lang/algol68g/distinfo b/lang/algol68g/distinfo
index c0202bece95..506112e653f 100644
--- a/lang/algol68g/distinfo
+++ b/lang/algol68g/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.12 2022/03/02 01:41:34 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2022/12/04 17:11:13 rhialto Exp $
 
-BLAKE2s (algol68g-3.0.4.tar.gz) = 482deae56b1b8dde6147c24bd5938cca61ed2d3ac0a2c219147fa0776571bb2c
-SHA512 (algol68g-3.0.4.tar.gz) = 3f5fba11a2e43be6939639f7b376c38d64b3b9cea7e5c84fd02a9f17b09aada8828df5107e479f158b0ccaf8bcb8b1739a34baaed4b746c38f6065e4d5d09230
-Size (algol68g-3.0.4.tar.gz) = 622123 bytes
-SHA1 (patch-src_a68g_a68g.c) = 14cb8f465b7f490e170725822cbbbdc2d2e11ab2
-SHA1 (patch-src_a68g_a68glib.c) = 6b3dbdb227b1508aaa138ecea7ebbb4c14ef9035
-SHA1 (patch-src_a68g_options.c) = d3f93775816b8c698ee3988ffc10d06b3e2bf54d
-SHA1 (patch-src_include_a68g-includes.h) = e7e581f27bcd3c0e23e40608ef5d0b9e11cba1df
-SHA1 (patch-src_include_a68g-platform.h) = b996b309192e49b384ed34ed304ed11fe74da1db
-SHA1 (patch-src_include_a68g.h) = 6d47419c7133d96474fb9cb46beb880a33005032
+BLAKE2s (algol68g-3.1.0.tar.gz) = 43b0ff30bc2f4e453ea7e0f12215381d585e200abe7def717cef12da55f6b539
+SHA512 (algol68g-3.1.0.tar.gz) = 92370031432eb42c8de4486696827ed6b0716f4cd918cb722263c16cec03cbf6e07873b7d6a56ca6e52b762a45d9be1848eba62755dd5cacafdc3aac7abf4f2e
+Size (algol68g-3.1.0.tar.gz) = 630652 bytes
+SHA1 (patch-src_a68g_a68g.c) = 3ce7296f05afbd78500ec562968e533d34d18007
+SHA1 (patch-src_a68g_options.c) = 35d53f40b5874f0169a49641e73cbcc71dd143a0
diff --git a/lang/algol68g/patches/patch-src_a68g_a68g.c b/lang/algol68g/patches/patch-src_a68g_a68g.c
index 85fb504eb7e..010d40f6d80 100644
--- a/lang/algol68g/patches/patch-src_a68g_a68g.c
+++ b/lang/algol68g/patches/patch-src_a68g_a68g.c
@@ -1,15 +1,22 @@
-$NetBSD: patch-src_a68g_a68g.c,v 1.1 2022/03/02 01:41:34 ryoon Exp $
+$NetBSD: patch-src_a68g_a68g.c,v 1.2 2022/12/04 17:11:13 rhialto Exp $
 
-* Use header files from ${PREFIX}.
+* Add -rpath=. to the linker command line, so that --compile works.
+  Otherwise, you get errors like
 
---- src/a68g/a68g.c.orig	2022-02-01 20:45:41.000000000 +0000
+  test-set$ a68g --compile 20-quicksort.a68 
+  [20-quicksort.a68]
+  test-set$ ./20-quicksort
+  [.a68g.tmp.20-quicksort]
+  a68g: exiting: ./src/a68g/a68g.c: 497: cannot resolve symbol, /usr/pkg/bin/a68g: Shared object ".a68g.tmp.20-quicksort.so" not found
+
+--- src/a68g/a68g.c.orig	2022-11-06 16:02:39.000000000 +0000
 +++ src/a68g/a68g.c
-@@ -448,7 +448,7 @@ static void compiler_interpreter (void)
-       bufcat (options, " ", BUFFER_SIZE);
-       bufcat (options, HAVE_PIC, BUFFER_SIZE);
+@@ -437,7 +437,7 @@ void compiler_interpreter (void)
  #endif
--      ASSERT (snprintf (cmd, SNPRINTF_SIZE, "gcc %s -c -o \"%s\" \"%s\"", options, FILE_BINARY_NAME (&A68_JOB), FILE_OBJECT_NAME (&A68_JOB)) >= 0);
-+      ASSERT (snprintf (cmd, SNPRINTF_SIZE, "gcc %s -I@PREFIX@/include -c -o \"%s\" \"%s\"", options, FILE_BINARY_NAME (&A68_JOB), FILE_OBJECT_NAME (&A68_JOB)) >= 0);
+       ASSERT (snprintf (cmd, SNPRINTF_SIZE, "%s -I%s %s -c -o \"%s\" \"%s\"", C_COMPILER, INCLUDEDIR, options, FILE_BINARY_NAME (&A68_JOB), FILE_OBJECT_NAME (&A68_JOB)) >= 0);
        ABEND (system (cmd) != 0, ERROR_ACTION, cmd);
-       ASSERT (snprintf (cmd, SNPRINTF_SIZE, "ld -export-dynamic -shared -o \"%s\" \"%s\"", FILE_LIBRARY_NAME (&A68_JOB), FILE_BINARY_NAME (&A68_JOB)) >= 0);
+-      ASSERT (snprintf (cmd, SNPRINTF_SIZE, "ld -export-dynamic -shared -o \"%s\" \"%s\"", FILE_LIBRARY_NAME (&A68_JOB), FILE_BINARY_NAME (&A68_JOB)) >= 0);
++      ASSERT (snprintf (cmd, SNPRINTF_SIZE, "ld -rpath=. -export-dynamic -shared -o \"%s\" \"%s\"", FILE_LIBRARY_NAME (&A68_JOB), FILE_BINARY_NAME (&A68_JOB)) >= 0);
        ABEND (system (cmd) != 0, ERROR_ACTION, cmd);
+       a68_rm (FILE_BINARY_NAME (&A68_JOB));
+     }
diff --git a/lang/algol68g/patches/patch-src_a68g_a68glib.c b/lang/algol68g/patches/patch-src_a68g_a68glib.c
deleted file mode 100644
index f45644f1ddf..00000000000
--- a/lang/algol68g/patches/patch-src_a68g_a68glib.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_a68g_a68glib.c,v 1.1 2022/03/02 01:41:34 ryoon Exp $
-
-* Fix build under NetBSD at least.
-
---- src/a68g/a68glib.c.orig	2022-02-01 20:45:41.000000000 +0000
-+++ src/a68g/a68glib.c
-@@ -43,7 +43,9 @@ int snprintf (char *s, size_t n, const c
- {
-   va_list ap;
-   va_start (ap, format);
-+#if 0
-   int vsnprintf (char *, size_t, const char *, va_list);
-+#endif
-   int result = vsnprintf (s, n, format, ap);
-   va_end (ap);
-   return result;
diff --git a/lang/algol68g/patches/patch-src_a68g_options.c b/lang/algol68g/patches/patch-src_a68g_options.c
index 8565f3dba4c..46eb26a2b75 100644
--- a/lang/algol68g/patches/patch-src_a68g_options.c
+++ b/lang/algol68g/patches/patch-src_a68g_options.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_a68g_options.c,v 1.1 2022/03/02 01:41:34 ryoon Exp $
+$NetBSD: patch-src_a68g_options.c,v 1.2 2022/12/04 17:11:13 rhialto Exp $
 
 * Enable compiler for *BSD.
 
 --- src/a68g/options.c.orig	2022-02-01 20:45:41.000000000 +0000
 +++ src/a68g/options.c
-@@ -544,7 +544,7 @@ BOOL_T set_options (OPTION_LIST_T * i, B
+@@ -548,7 +548,7 @@ BOOL_T set_options (OPTION_LIST_T * i, B
  #endif
              }
              if (eq (q, "linux")) {
@@ -13,30 +13,3 @@ $NetBSD: patch-src_a68g_options.c,v 1.1 2022/03/02 01:41:34 ryoon Exp $
                io_close_tty_line ();
                WRITE (STDOUT_FILENO, "linux required - exiting graciously");
                a68_exit (EXIT_SUCCESS);
-@@ -701,7 +701,7 @@ BOOL_T set_options (OPTION_LIST_T * i, B
-         }
- // COMPILE and NOCOMPILE switch on/off compilation.
-         else if (eq (p, "Compile")) {
--#if defined (BUILD_LINUX)
-+#if defined (BUILD_LINUX) || defined(BUILD_BSD)
-           OPTION_COMPILE (&A68_JOB) = A68_TRUE;
-           OPTION_COMPILE_CHECK (&A68_JOB) = A68_TRUE;
-           if (OPTION_OPT_LEVEL (&A68_JOB) < OPTIMISE_1) {
-@@ -745,7 +745,7 @@ BOOL_T set_options (OPTION_LIST_T * i, B
-         }
- // RUN-SCRIPT runs a compiled .sh script.
-         else if (eq (p, "RUN-SCRIPT")) {
--#if defined (BUILD_LINUX)
-+#if defined (BUILD_LINUX) || defined(BUILD_BSD)
-           FORWARD (i);
-           if (i != NO_OPTION_LIST) {
-             if (!name_set) {
-@@ -766,7 +766,7 @@ BOOL_T set_options (OPTION_LIST_T * i, B
-         }
- // RUN-QUOTE-SCRIPT runs a compiled .sh script.
-         else if (eq (p, "RUN-QUOTE-SCRIPT")) {
--#if defined (BUILD_LINUX)
-+#if defined (BUILD_LINUX) || defined(BUILD_BSD)
-           FORWARD (i);
-           if (i != NO_OPTION_LIST) {
-             if (!name_set) {
diff --git a/lang/algol68g/patches/patch-src_include_a68g-includes.h b/lang/algol68g/patches/patch-src_include_a68g-includes.h
deleted file mode 100644
index 00b65541bf0..00000000000
--- a/lang/algol68g/patches/patch-src_include_a68g-includes.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_include_a68g-includes.h,v 1.1 2022/03/02 01:41:34 ryoon Exp $
-
-* Fix compiler build for *BSD.
-
---- src/include/a68g-includes.h.orig	2022-02-01 20:45:41.000000000 +0000
-+++ src/include/a68g-includes.h
-@@ -66,7 +66,7 @@
- #include <dirent.h>
- #endif
- 
--#if defined (HAVE_DL)
-+#if defined (HAVE_DL) || defined(BUILD_BSD)
- #include <dlfcn.h>
- #endif
- 
diff --git a/lang/algol68g/patches/patch-src_include_a68g-platform.h b/lang/algol68g/patches/patch-src_include_a68g-platform.h
deleted file mode 100644
index 44bd23b551b..00000000000
--- a/lang/algol68g/patches/patch-src_include_a68g-platform.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_include_a68g-platform.h,v 1.1 2022/03/02 01:41:34 ryoon Exp $
-
-* Fix *BSD compiler runtime error.
-
---- src/include/a68g-platform.h.orig	2022-02-01 20:45:41.000000000 +0000
-+++ src/include/a68g-platform.h
-@@ -24,8 +24,6 @@
- 
- #if defined (BUILD_WIN32)
- #include "a68g-config.win32.h"
--#elif defined (BUILD_BSD)
--#include "a68g-config.bsd.h"
- #else
- #include "a68g-config.h"
- #endif
diff --git a/lang/algol68g/patches/patch-src_include_a68g.h b/lang/algol68g/patches/patch-src_include_a68g.h
deleted file mode 100644
index 7ec0190159e..00000000000
--- a/lang/algol68g/patches/patch-src_include_a68g.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_include_a68g.h,v 1.1 2022/03/02 01:41:34 ryoon Exp $
-
-* Enable compiler for *BSD.
-
---- src/include/a68g.h.orig	2022-02-01 20:45:41.000000000 +0000
-+++ src/include/a68g.h
-@@ -32,7 +32,7 @@
- 
- // Build switches depending on platform.
- 
--#if (defined (BUILD_LINUX) && defined (HAVE_GCC) && defined (HAVE_DL))
-+#if (defined (BUILD_LINUX) && defined (HAVE_GCC) && defined (HAVE_DL)) || defined(BUILD_BSD)
- #  define BUILD_A68_COMPILER
- #else
- // Untested, so disabled.