CVS commit: pkgsrc/lang/gambc

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Sun Apr 30 19:32:30 UTC 2023

Modified Files:
        pkgsrc/lang/gambc: Makefile PLIST distinfo
Added Files:
        pkgsrc/lang/gambc/patches: patch-bb

Log Message:
gambc: fix binary name conflict, add reproducibility fix, and some more.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/gambc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gambc/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/gambc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gambc/patches/patch-bb

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

Modified files:

Index: pkgsrc/lang/gambc/Makefile
diff -u pkgsrc/lang/gambc/Makefile:1.22 pkgsrc/lang/gambc/Makefile:1.23
--- pkgsrc/lang/gambc/Makefile:1.22     Wed Apr 26 20:59:56 2023
+++ pkgsrc/lang/gambc/Makefile  Sun Apr 30 19:32:30 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2023/04/26 20:59:56 nikita Exp $
+# $NetBSD: Makefile,v 1.23 2023/04/30 19:32:30 nikita Exp $
 #
 
 DISTNAME=      gambit-${GAMBC_DIST_VERSION:S,.,_,}
 PKGNAME=       gambc-${GAMBC_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://gambitscheme.org/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tgz
@@ -10,12 +11,10 @@ EXTRACT_SUFX=       .tgz
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gambitscheme.org/
 COMMENT=       GambitC Scheme System
+LICENSE=       apache-2.0 AND gnu-lgpl-v2.1
 
 # bin/scheme-r5rs
 CONFLICTS+=    scheme48>=1.2
-# TODO: adjust the binary name.
-# bin/gsc
-CONFLICTS+=    ghostscript-agpl>=10.0.0
 
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++03
@@ -26,13 +25,9 @@ CONFIGURE_ARGS+=     --enable-cplusplus
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --disable-absolute-shared-libs # DESTDIR bug?
 CONFIGURE_ARGS+=       --enable-default-runtime-options=f8,-8,t8
-###
-### XXX On NetBSD/amd64 4.99.61, gcc had a resident memory size of over 384MB
-###    while building this and ultimately exhausted all 1GB of swap I had.
-###    See the documentation for more information.  (This was due to using
-###    -fmodulo-sched, gcc 4.1.3).
-###
-CONFIGURE_ARGS+=       --disable-gcc-opts
+CONFIGURE_ARGS+=       --enable-compiler-name=gsc-gambit
+CONFIGURE_ARGS+=       --enable-interpreter-name=gsi-gambit
+CONFIGURE_ARGS+=       --enable-gcc-opts
 
 INFO_FILES=            yes
 MAKE_FILE=             makefile
@@ -67,6 +62,13 @@ SUBST_SED.build+=    -e 's|@target_vendor@|
 SUBST_STAGE.build=     pre-configure
 SUBST_VARS.build+=     PACKAGE_SUBDIR PACKAGE_VERSION PACKAGE_STRING
 
+SUBST_CLASSES+=                flags
+SUBST_FILES.flags=     makefile.in gsc/makefile.in gsi/makefile.in lib/makefile.in
+SUBST_MESSAGE.flags=   putting flags first
+SUBST_SED.flags=       -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|'
+SUBST_SED.flags+=      -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|'
+SUBST_STAGE.flags=     pre-configure
+
 PACKAGE_SUBDIR=                # empty
 PACKAGE_VERSION=       ${PKGVERSION_NOREV}
 PACKAGE_STRING=                ${${PKGBASE} ${PKGVERSION_NOREV}:L}

Index: pkgsrc/lang/gambc/PLIST
diff -u pkgsrc/lang/gambc/PLIST:1.6 pkgsrc/lang/gambc/PLIST:1.7
--- pkgsrc/lang/gambc/PLIST:1.6 Sat Apr 29 10:17:39 2023
+++ pkgsrc/lang/gambc/PLIST     Sun Apr 30 19:32:30 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/04/29 10:17:39 nikita Exp $
+@comment $NetBSD: PLIST,v 1.7 2023/04/30 19:32:30 nikita Exp $
 bin/gambdoc
 bin/gambuild-C
 bin/gambuild-arm
@@ -12,9 +12,9 @@ bin/gambuild-ruby
 bin/gambuild-x86
 bin/gambuild-x86-64
 bin/gambvcs
-bin/gsc
+bin/gsc-gambit
 bin/gsc-script
-bin/gsi
+bin/gsi-gambit
 bin/gsi-script
 bin/scheme-ieee-1178-1990
 bin/scheme-r4rs

Index: pkgsrc/lang/gambc/distinfo
diff -u pkgsrc/lang/gambc/distinfo:1.12 pkgsrc/lang/gambc/distinfo:1.13
--- pkgsrc/lang/gambc/distinfo:1.12     Wed Apr 26 20:53:23 2023
+++ pkgsrc/lang/gambc/distinfo  Sun Apr 30 19:32:30 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.12 2023/04/26 20:53:23 nikita Exp $
+$NetBSD: distinfo,v 1.13 2023/04/30 19:32:30 nikita Exp $
 
 BLAKE2s (gambit-v4_9_4.tgz) = 24c9ab525103e55cb74d6c30791d79a122e57f939a053a8a6cff237efcc6f503
 SHA512 (gambit-v4_9_4.tgz) = 3471062618949fe4e1eba19ca3170b8334065797d0c2f440050520ebca2af8bb6d57d9434b1756e5d67d4d4ec108c8e6a0c2900f01d8a35b71c979d776995ab1
 Size (gambit-v4_9_4.tgz) = 15452771 bytes
 SHA1 (patch-aa) = 627aa9d41238f117133413de64dd2a2c36e51166
+SHA1 (patch-bb) = 789c634a9449655548e57806e4ee50828728abda
 SHA1 (patch-configure) = 7586e75b7eea6566a3bddfb1337d6d1a00204e4c
 SHA1 (patch-contrib_GambitREPL_make-keys) = 54b8e023feae823381f85ccc0c3465516134b7b8
 SHA1 (patch-misc_build-gambit-android) = 754690aca858a43f2ac2b9244ed510a8179f45b4

Added files:

Index: pkgsrc/lang/gambc/patches/patch-bb
diff -u /dev/null pkgsrc/lang/gambc/patches/patch-bb:1.1
--- /dev/null   Sun Apr 30 19:32:30 2023
+++ pkgsrc/lang/gambc/patches/patch-bb  Sun Apr 30 19:32:30 2023
@@ -0,0 +1,56 @@
+$NetBSD: patch-bb,v 1.1 2023/04/30 19:32:30 nikita Exp $
+
+https://salsa.debian.org/abdelq/gambc/-/blob/ca233c8bd3c8279e755e34287417aafe3c649629/debian/patches/reproducibility.patch
+
+Workaround for reproducibility issues
+
+--- doc/makefile.in
++++ doc/makefile.in
+@@ -70,7 +70,7 @@
+ 
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+-TEXI2HTML = ./texi2html
++TEXI2HTML = PERL_HASH_SEED=0 ./texi2html
+ PDF2PS = pdf2ps
+ 
+ .SUFFIXES:
+
+--- doc/texi2html
++++ doc/texi2html
+@@ -2520,7 +2520,7 @@
+     print $fh <<EOT;
+ $DOCTYPE
+ <html>
+-$Texi2HTML::THISDOC{'copying_comment'}<!-- Created on $Texi2HTML::THISDOC{today} by $Texi2HTML::THISDOC{program}
++$Texi2HTML::THISDOC{'copying_comment'}<!-- Created by $Texi2HTML::THISDOC{program}
+ $Texi2HTML::THISDOC{program_authors}-->
+ <head>
+ <title>$longtitle</title>
+@@ -2543,7 +2543,7 @@
+ sub T2H_DEFAULT_program_string()
+ {
+     my $user = $Texi2HTML::THISDOC{'user'};
+-    my $date = $Texi2HTML::THISDOC{'today'};
++    #my $date = $Texi2HTML::THISDOC{'today'};
+     $user = '' if (!defined($user));
+     $date = '' if (!defined($date));
+     if (($user ne '') and ($date ne ''))
+@@ -3137,7 +3137,7 @@
+     print $fh <<EOT;
+ $DOCTYPE
+ <html>
+-<!-- Created on $Texi2HTML::THISDOC{'today'} by $Texi2HTML::THISDOC{'program'} -->
++<!-- Created by $Texi2HTML::THISDOC{'program'} -->
+ <!--
+ $Texi2HTML::THISDOC{'program_authors'}
+ -->
+@@ -7403,7 +7403,7 @@
+ sub t2h_default_address($$)
+ {
+     my $user = shift;
+-    my $date = shift;
++    #my $date = shift;
+     $user = '' if (!defined($user));
+     $date = '' if (!defined($date));
+     if (($user ne '') and ($date ne ''))