Fri Dec 1 18:35:12 2023 UTC (177d)
lang/algol68g: update to 3.4.4.

Version 3.4.0-4, October 2023
* Fix Darwin configuration issue.
* Enable plugin compiler on Apple Silicon Macs.
* C17 compliant code.
* Procedure "http content" now requires libcurl.
* Procedure "tcp request" is deprecated.
* Minor fixes.

Version 3.3.1-24, August/September 2023
* Fix configuration issue for 32-bit systems.
* Minor fixes.
* Distribution updates.


(rhialto)
diff -r1.25 -r1.26 pkgsrc/lang/algol68g/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/algol68g/PLIST
diff -r1.17 -r1.18 pkgsrc/lang/algol68g/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/algol68g/options.mk
diff -r0 -r1.1 pkgsrc/lang/algol68g/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/lang/algol68g/patches/patch-src_a68g_a68g-options.c
cvs diff -r1.25 -r1.26 pkgsrc/lang/algol68g/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/algol68g/Makefile 2023/08/26 15:18:57 1.25
+++ pkgsrc/lang/algol68g/Makefile 2023/12/01 18:35:11 1.26
@@ -1,23 +1,36 @@ @@ -1,23 +1,36 @@
1# $NetBSD: Makefile,v 1.25 2023/08/26 15:18:57 rhialto Exp $ 1# $NetBSD: Makefile,v 1.26 2023/12/01 18:35:11 rhialto Exp $
2 2
3DISTNAME= algol68g-3.3.5 3DISTNAME= algol68g-3.4.4
4CATEGORIES= lang 4CATEGORIES= lang
5MASTER_SITES= http://jmvdveer.home.xs4all.nl/ 5MASTER_SITES= http://jmvdveer.home.xs4all.nl/
6 6
7MAINTAINER= rhialto@NetBSD.org 7MAINTAINER= rhialto@NetBSD.org
8HOMEPAGE= https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html 8HOMEPAGE= https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html
9COMMENT= Algol 68genie compiler 9COMMENT= Algol 68genie compiler
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12USE_LANGUAGES= c 12USE_LANGUAGES= c c17
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14CONFIGURE_ARGS= --docdir=${PREFIX}/share/doc/${PKGBASE} 14CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PKGBASE}
 15CONFIGURE_ARGS+= --enable-compiler
 16CONFIGURE_ARGS+= --enable-parallel
 17CONFIGURE_ARGS+= --enable-curl
 18CONFIGURE_ARGS+= --enable-curses
 19CONFIGURE_ARGS+= --enable-gsl
 20CONFIGURE_ARGS+= --enable-readline
 21CONFIGURE_ARGS+= --disable-mathlib # no -lRmath
 22
 23SUBST_CLASSES+= pkg
 24SUBST_STAGE.pkg= pre-configure
 25SUBST_FILES.pkg= configure
 26SUBST_VARS.pkg= PREFIX
15 27
16TEST_TARGET= check 28TEST_TARGET= check
17 29
18.include "options.mk" 30.include "options.mk"
19 31
20.include "../../mk/readline.buildlink3.mk" 
21.include "../../math/gsl/buildlink3.mk" 32.include "../../math/gsl/buildlink3.mk"
22.include "../../mk/termcap.buildlink3.mk" 33.include "../../mk/readline.buildlink3.mk"
 34.include "../../mk/curses.buildlink3.mk"
 35.include "../../www/curl/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/algol68g/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/algol68g/PLIST 2023/08/26 15:18:57 1.6
+++ pkgsrc/lang/algol68g/PLIST 2023/12/01 18:35:11 1.7
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1@comment $NetBSD: PLIST,v 1.6 2023/08/26 15:18:57 rhialto Exp $ 1@comment $NetBSD: PLIST,v 1.7 2023/12/01 18:35:11 rhialto Exp $
2bin/a68g 2bin/a68g
3include/algol68g/a68g-common.h 3include/algol68g/a68g-common.h
4include/algol68g/a68g-config.h 4include/algol68g/a68g-config.h
5include/algol68g/a68g-config.win32.h 5include/algol68g/a68g-config.win32.h
6include/algol68g/a68g-defines.h 6include/algol68g/a68g-defines.h
7include/algol68g/a68g-diagnostics.h 7include/algol68g/a68g-diagnostics.h
8include/algol68g/a68g-double.h 8include/algol68g/a68g-double.h
9include/algol68g/a68g-enums.h 9include/algol68g/a68g-enums.h
10include/algol68g/a68g-environ.h 10include/algol68g/a68g-environ.h
11include/algol68g/a68g-frames.h 11include/algol68g/a68g-frames.h
12include/algol68g/a68g-generic.h 12include/algol68g/a68g-generic.h
13include/algol68g/a68g-genie.h 13include/algol68g/a68g-genie.h
14include/algol68g/a68g-includes.h 14include/algol68g/a68g-includes.h
15include/algol68g/a68g-level-3.h 15include/algol68g/a68g-level-3.h
16include/algol68g/a68g-lib.h 16include/algol68g/a68g-lib.h
17include/algol68g/a68g-listing.h 17include/algol68g/a68g-listing.h
 18include/algol68g/a68g-mach.h
18include/algol68g/a68g-masks.h 19include/algol68g/a68g-masks.h
19include/algol68g/a68g-math.h 20include/algol68g/a68g-math.h
20include/algol68g/a68g-moids.h 21include/algol68g/a68g-moids.h
21include/algol68g/a68g-mp.h 22include/algol68g/a68g-mp.h
22include/algol68g/a68g-nil.h 23include/algol68g/a68g-nil.h
23include/algol68g/a68g-numbers.h 24include/algol68g/a68g-numbers.h
24include/algol68g/a68g-optimiser.h 25include/algol68g/a68g-optimiser.h
25include/algol68g/a68g-options.h 26include/algol68g/a68g-options.h
26include/algol68g/a68g-parser.h 27include/algol68g/a68g-parser.h
27include/algol68g/a68g-physics.h 28include/algol68g/a68g-physics.h
28include/algol68g/a68g-platform.h 29include/algol68g/a68g-platform.h
29include/algol68g/a68g-plugin.h 30include/algol68g/a68g-plugin.h
30include/algol68g/a68g-postulates.h 31include/algol68g/a68g-postulates.h
cvs diff -r1.17 -r1.18 pkgsrc/lang/algol68g/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/algol68g/distinfo 2023/08/26 15:18:57 1.17
+++ pkgsrc/lang/algol68g/distinfo 2023/12/01 18:35:11 1.18
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.17 2023/08/26 15:18:57 rhialto Exp $ 1$NetBSD: distinfo,v 1.18 2023/12/01 18:35:11 rhialto Exp $
2 2
3BLAKE2s (algol68g-3.3.5.tar.gz) = 48e3e00a3e59fed6d7bab565301bf70aa760653e8a78f6ec966688401ff5eb87 3BLAKE2s (algol68g-3.4.4.tar.gz) = 23d0e3bd00652313db915c4d984aba59c806a16bf08600602f7ff710c6d635f8
4SHA512 (algol68g-3.3.5.tar.gz) = a1f18f482613c34c6e2efbbf20a8c106da9153f09b85ad5ff741d420425f73e6340ab4ab2fd8b70cc31d0b5c983373fa3be6e499c4e7008787c75fd81dd3ae4b 4SHA512 (algol68g-3.4.4.tar.gz) = d3d9b1aac61871475877c4dd1078bc856fd6f1726bd374e16d8ac9530aee00cdd7fb618c96afa98b28fd66dee343cc7bf92e201787d4598e41dbd794ec3d0a9a
5Size (algol68g-3.3.5.tar.gz) = 659011 bytes 5Size (algol68g-3.4.4.tar.gz) = 661980 bytes
6SHA1 (patch-src_a68g_a68g-options.c) = bd659a155d0a6ee835e42868a0eaac9c4a7d9824 6SHA1 (patch-configure) = d56ff5b3ffe585d2afbeb78f57d4a33d3141578b
 7SHA1 (patch-src_a68g_a68g-options.c) = 5b7b7bb4b1db581bf5cc6a456bb61a327bfcbb7a
cvs diff -r1.3 -r1.4 pkgsrc/lang/algol68g/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/algol68g/options.mk 2020/05/21 07:02:56 1.3
+++ pkgsrc/lang/algol68g/options.mk 2023/12/01 18:35:11 1.4
@@ -1,24 +1,34 @@ @@ -1,24 +1,34 @@
1# $NetBSD: options.mk,v 1.3 2020/05/21 07:02:56 rillig Exp $ 1# $NetBSD: options.mk,v 1.4 2023/12/01 18:35:11 rhialto Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.a68g 3PKG_OPTIONS_VAR= PKG_OPTIONS.a68g
4PKG_SUPPORTED_OPTIONS= plotutils pgsql 4PKG_SUPPORTED_OPTIONS= plotutils pgsql longtypes
5PKG_SUGGESTED_OPTIONS= plotutils 5PKG_SUGGESTED_OPTIONS= plotutils
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mplotutils) 9.if !empty(PKG_OPTIONS:Mplotutils)
10. include "../../graphics/plotutils/buildlink3.mk" 10. include "../../graphics/plotutils/buildlink3.mk"
11CONFIGURE_ARGS+= --enable-plotutils 11CONFIGURE_ARGS+= --enable-plotutils
12.else 12.else
13CONFIGURE_ARGS+= --disable-plotutils 13CONFIGURE_ARGS+= --disable-plotutils
14.endif 14.endif
15 15
 16# The implementation of this is somewhat Linux-centric so
 17# it may not fully work as expected when enabled elsewhere.
 18.if !empty(PKG_OPTIONS:Mlongtypes)
 19. include "../../math/mpfr/buildlink3.mk" # fails some configure checks
 20. include "../../math/libquadmath/buildlink3.mk"
 21CONFIGURE_ARGS+= --enable-long-types
 22.else
 23CONFIGURE_ARGS+= --disable-long-types
 24.endif
 25
16# It seems that when including PostgreSQL support it doesn't actually 26# It seems that when including PostgreSQL support it doesn't actually
17# need to have it installed at build time, just at run time. 27# need to have it installed at build time, just at run time.
18# So maybe this DEPENDS is undesirable. 28# So maybe this DEPENDS is undesirable.
19.if !empty(PKG_OPTIONS:Mpgsql) 29.if !empty(PKG_OPTIONS:Mpgsql)
20CONFIGURE_ARGS+= --enable-postgresql 30CONFIGURE_ARGS+= --enable-postgresql
21.include "../../mk/pgsql.buildlink3.mk" 31. include "../../mk/pgsql.buildlink3.mk"
22.else 32.else
23CONFIGURE_ARGS+= --disable-postgresql 33CONFIGURE_ARGS+= --disable-postgresql
24.endif 34.endif
File Added: pkgsrc/lang/algol68g/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2023/12/01 18:35:12 rhialto Exp $

* don't assume glibc is required for --enable-long-types.
* Unconditionally use -I ${PREFIX}/include for the compiler.

--- configure.orig	2023-10-27 20:16:54.000000000 +0000
+++ configure
@@ -5689,7 +5689,7 @@ fi
 
 if test "x$enable_generic" = "xyes"; then
   enable_standard_types=yes
-  enable_long_types=no
+  #enable_long_types=no
 fi
 
 if test "x$enable_core" = "xyes"; then
@@ -5717,11 +5717,11 @@ EXTRA_INCLUDES=""
 
 # Set -I/usr/local/include for *BSD
 
-if test "x$bsd_include_dirs" = "xyes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ... /usr/local/include" >&5
-printf "%s\n" "$as_me: ... /usr/local/include" >&6;}
-  EXTRA_INCLUDES="-I/usr/local/include"
-fi
+#if test "x$bsd_include_dirs" = "xyes"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ... @PREFIX@/include" >&5
+printf "%s\n" "$as_me: ... @PREFIX@/include" >&6;}
+  EXTRA_INCLUDES="-I@PREFIX@/include"
+#fi
 
 # Homebrew on macOS
cvs diff -r1.1 -r1.2 pkgsrc/lang/algol68g/patches/patch-src_a68g_a68g-options.c (expand / switch to unified diff)

--- pkgsrc/lang/algol68g/patches/patch-src_a68g_a68g-options.c 2023/03/29 10:11:13 1.1
+++ pkgsrc/lang/algol68g/patches/patch-src_a68g_a68g-options.c 2023/12/01 18:35:12 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_a68g_a68g-options.c,v 1.1 2023/03/29 10:11:13 rhialto Exp $ 1$NetBSD: patch-src_a68g_a68g-options.c,v 1.2 2023/12/01 18:35:12 rhialto Exp $
2 2
3* Enable compiler for *BSD. 3* Enable compiler for *BSD.
4 4
5--- src/a68g/a68g-options.c.orig 2023-03-19 20:10:12.000000000 +0000 5--- src/a68g/a68g-options.c.orig 2023-10-27 20:14:34.000000000 +0000
6+++ src/a68g/a68g-options.c 6+++ src/a68g/a68g-options.c
7@@ -552,7 +552,7 @@ BOOL_T set_options (OPTION_LIST_T * i, B 7@@ -478,7 +478,7 @@ BOOL_T need_library (OPTION_LIST_T *i)
8 #endif 8 #endif
9 } 9 }
10 if (eq (q, "linux")) { 10 if (eq (q, "linux")) {
11-#if !defined (BUILD_LINUX) 11-#if defined (BUILD_LINUX)
12+#if (!defined (BUILD_LINUX) && !defined(BUILD_BSD)) 12+#if defined (BUILD_LINUX) || defined(BUILD_BSD)
13 io_close_tty_line (); 13 return (A68_TRUE);
14 WRITE (STDOUT_FILENO, "linux required - exiting graciously"); 14 #else
15 a68_exit (EXIT_SUCCESS); 15 io_close_tty_line ();