CVS commit: pkgsrc/lang/algol68g

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/algol68g
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Fri, 1 Dec 2023 18:35:12 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Fri Dec  1 18:35:12 UTC 2023

Modified Files:
        pkgsrc/lang/algol68g: Makefile PLIST distinfo options.mk
        pkgsrc/lang/algol68g/patches: patch-src_a68g_a68g-options.c
Added Files:
        pkgsrc/lang/algol68g/patches: patch-configure

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/algol68g/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/algol68g/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/algol68g/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/algol68g/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/algol68g/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/algol68g/patches/patch-src_a68g_a68g-options.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/algol68g/Makefile
diff -u pkgsrc/lang/algol68g/Makefile:1.25 pkgsrc/lang/algol68g/Makefile:1.26
--- pkgsrc/lang/algol68g/Makefile:1.25  Sat Aug 26 15:18:57 2023
+++ pkgsrc/lang/algol68g/Makefile       Fri Dec  1 18:35:11 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2023/08/26 15:18:57 rhialto Exp $
+# $NetBSD: Makefile,v 1.26 2023/12/01 18:35:11 rhialto Exp $
 
-DISTNAME=      algol68g-3.3.5
+DISTNAME=      algol68g-3.4.4
 CATEGORIES=    lang
 MASTER_SITES=  http://jmvdveer.home.xs4all.nl/
 
@@ -9,15 +9,28 @@ HOMEPAGE=     https://jmvdveer.home.xs4all.n
 COMMENT=       Algol 68genie compiler
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= c
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS=        --docdir=${PREFIX}/share/doc/${PKGBASE}
+USE_LANGUAGES=         c c17
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --docdir=${PREFIX}/share/doc/${PKGBASE}
+CONFIGURE_ARGS+=       --enable-compiler
+CONFIGURE_ARGS+=       --enable-parallel
+CONFIGURE_ARGS+=       --enable-curl
+CONFIGURE_ARGS+=       --enable-curses
+CONFIGURE_ARGS+=       --enable-gsl
+CONFIGURE_ARGS+=       --enable-readline
+CONFIGURE_ARGS+=       --disable-mathlib       # no -lRmath
+
+SUBST_CLASSES+=                pkg
+SUBST_STAGE.pkg=       pre-configure
+SUBST_FILES.pkg=       configure
+SUBST_VARS.pkg=                PREFIX
 
-TEST_TARGET=   check
+TEST_TARGET=           check
 
 .include "options.mk"
 
-.include "../../mk/readline.buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/algol68g/PLIST
diff -u pkgsrc/lang/algol68g/PLIST:1.6 pkgsrc/lang/algol68g/PLIST:1.7
--- pkgsrc/lang/algol68g/PLIST:1.6      Sat Aug 26 15:18:57 2023
+++ pkgsrc/lang/algol68g/PLIST  Fri Dec  1 18:35:11 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/08/26 15:18:57 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.7 2023/12/01 18:35:11 rhialto Exp $
 bin/a68g
 include/algol68g/a68g-common.h
 include/algol68g/a68g-config.h
@@ -15,6 +15,7 @@ include/algol68g/a68g-includes.h
 include/algol68g/a68g-level-3.h
 include/algol68g/a68g-lib.h
 include/algol68g/a68g-listing.h
+include/algol68g/a68g-mach.h
 include/algol68g/a68g-masks.h
 include/algol68g/a68g-math.h
 include/algol68g/a68g-moids.h

Index: pkgsrc/lang/algol68g/distinfo
diff -u pkgsrc/lang/algol68g/distinfo:1.17 pkgsrc/lang/algol68g/distinfo:1.18
--- pkgsrc/lang/algol68g/distinfo:1.17  Sat Aug 26 15:18:57 2023
+++ pkgsrc/lang/algol68g/distinfo       Fri Dec  1 18:35:11 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2023/08/26 15:18:57 rhialto Exp $
+$NetBSD: distinfo,v 1.18 2023/12/01 18:35:11 rhialto Exp $
 
-BLAKE2s (algol68g-3.3.5.tar.gz) = 48e3e00a3e59fed6d7bab565301bf70aa760653e8a78f6ec966688401ff5eb87
-SHA512 (algol68g-3.3.5.tar.gz) = a1f18f482613c34c6e2efbbf20a8c106da9153f09b85ad5ff741d420425f73e6340ab4ab2fd8b70cc31d0b5c983373fa3be6e499c4e7008787c75fd81dd3ae4b
-Size (algol68g-3.3.5.tar.gz) = 659011 bytes
-SHA1 (patch-src_a68g_a68g-options.c) = bd659a155d0a6ee835e42868a0eaac9c4a7d9824
+BLAKE2s (algol68g-3.4.4.tar.gz) = 23d0e3bd00652313db915c4d984aba59c806a16bf08600602f7ff710c6d635f8
+SHA512 (algol68g-3.4.4.tar.gz) = d3d9b1aac61871475877c4dd1078bc856fd6f1726bd374e16d8ac9530aee00cdd7fb618c96afa98b28fd66dee343cc7bf92e201787d4598e41dbd794ec3d0a9a
+Size (algol68g-3.4.4.tar.gz) = 661980 bytes
+SHA1 (patch-configure) = d56ff5b3ffe585d2afbeb78f57d4a33d3141578b
+SHA1 (patch-src_a68g_a68g-options.c) = 5b7b7bb4b1db581bf5cc6a456bb61a327bfcbb7a

Index: pkgsrc/lang/algol68g/options.mk
diff -u pkgsrc/lang/algol68g/options.mk:1.3 pkgsrc/lang/algol68g/options.mk:1.4
--- pkgsrc/lang/algol68g/options.mk:1.3 Thu May 21 07:02:56 2020
+++ pkgsrc/lang/algol68g/options.mk     Fri Dec  1 18:35:11 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2020/05/21 07:02:56 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2023/12/01 18:35:11 rhialto Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.a68g
-PKG_SUPPORTED_OPTIONS= plotutils pgsql
+PKG_SUPPORTED_OPTIONS= plotutils pgsql longtypes
 PKG_SUGGESTED_OPTIONS= plotutils
 
 .include "../../mk/bsd.options.mk"
@@ -13,12 +13,22 @@ CONFIGURE_ARGS+=    --enable-plotutils
 CONFIGURE_ARGS+=       --disable-plotutils
 .endif
 
+# The implementation of this is somewhat Linux-centric so
+# it may not fully work as expected when enabled elsewhere.
+.if !empty(PKG_OPTIONS:Mlongtypes)
+.  include "../../math/mpfr/buildlink3.mk" # fails some configure checks
+.  include "../../math/libquadmath/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-long-types
+.else
+CONFIGURE_ARGS+=       --disable-long-types
+.endif
+
 # It seems that when including PostgreSQL support it doesn't actually
 # need to have it installed at build time, just at run time.
 # So maybe this DEPENDS is undesirable.
 .if !empty(PKG_OPTIONS:Mpgsql)
 CONFIGURE_ARGS+=       --enable-postgresql
-.include "../../mk/pgsql.buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-postgresql
 .endif

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

Added files:

Index: pkgsrc/lang/algol68g/patches/patch-configure
diff -u /dev/null pkgsrc/lang/algol68g/patches/patch-configure:1.1
--- /dev/null   Fri Dec  1 18:35:12 2023
+++ pkgsrc/lang/algol68g/patches/patch-configure        Fri Dec  1 18:35:12 2023
@@ -0,0 +1,33 @@
+$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
+

Prev by Date: CVS commit: pkgsrc/lang/libunwind
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/libunwind
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index