CVS commit: pkgsrc/lang/clisp

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat May 13 00:44:31 UTC 2023

Modified Files:
        pkgsrc/lang/clisp: distinfo
        pkgsrc/lang/clisp/patches: patch-aa

Log Message:
PR 45012 Michael Wildpaner: clisp build fix for ubuntu with dash


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/clisp/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/clisp/patches/patch-aa

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

Modified files:

Index: pkgsrc/lang/clisp/distinfo
diff -u pkgsrc/lang/clisp/distinfo:1.41 pkgsrc/lang/clisp/distinfo:1.42
--- pkgsrc/lang/clisp/distinfo:1.41     Tue Nov  8 12:47:01 2022
+++ pkgsrc/lang/clisp/distinfo  Sat May 13 00:44:31 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2022/11/08 12:47:01 nros Exp $
+$NetBSD: distinfo,v 1.42 2023/05/13 00:44:31 dholland Exp $
 
 BLAKE2s (clisp-2.49.tar.gz) = b9f656df562cbe46fc550bb9bd44399efb2c7a87b024b22d07637c4d75c51866
 SHA512 (clisp-2.49.tar.gz) = 7885956b373a4c1d04a0b43c229fe8c8694d89982cadce09da6ef03cb56a5705b92f94b564981075c36bb9773a9f16b0b95fef23e942f6245604aefa6600ef98
 Size (clisp-2.49.tar.gz) = 9823111 bytes
-SHA1 (patch-aa) = fd03e7e3d7904a2efc8227c4d58c4782a6f070a8
+SHA1 (patch-aa) = c3beebe75cdaccb862589bfe2db5613ca8ad6820
 SHA1 (patch-ab) = 93aef2c423ce9e5eabebc20cdc144c83845b19cb
 SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b
 SHA1 (patch-modules_readline_readline.lisp) = 1463cb15f6a21374dffc0e585670ac89bb758ff3

Index: pkgsrc/lang/clisp/patches/patch-aa
diff -u pkgsrc/lang/clisp/patches/patch-aa:1.21 pkgsrc/lang/clisp/patches/patch-aa:1.22
--- pkgsrc/lang/clisp/patches/patch-aa:1.21     Tue Nov  8 12:47:01 2022
+++ pkgsrc/lang/clisp/patches/patch-aa  Sat May 13 00:44:31 2023
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.21 2022/11/08 12:47:01 nros Exp $
+$NetBSD: patch-aa,v 1.22 2023/05/13 00:44:31 dholland Exp $
 
 Override library subdirectory name for consistency.
 Don't use cache file to avoid trailing space problem.
 Support staged installation of modules.
 Fix SunOS linking.
 Fix NetBSD module linking.
+Don't use -nt on nonexistent files because the behavior isn't portable.
 
 https://mail-index.netbsd.org/pkgsrc-users/2019/11/02/msg029846.html
 https://sourceforge.net/p/clisp/bugs/740/ (macOS build failure)
@@ -99,6 +100,15 @@ https://sourceforge.net/p/clisp/bugs/740
  test -n "$USE_GETTEXT" && echol "localedir = ${LOCALEDIR}"
  echol "elispdir = ${ELISPDIR}"
  echol "vimdir = ${VIMDIR}"
+@@ -3301,7 +3301,7 @@ echotab "m=\`cd ${MODULESDIR_}\$@; pwd\`
+ if [ "@TEST_NT@" = no ]; then # re-making a module requires rm -rf module
+   newer(){ echo 'test -f $$m/'$1' -a '"'!'"' -f $@/'$2; }
+ else # re-making a module just works
+-  newer(){ echo 'test -f $$m/'$1' -a $$m/'$1' -nt $@/'$2; }
++  newer(){ echo 'test -f $$m/'$1' -a \( ! -f $@/'$2' -o $$m/'$1' -nt $@/'$2' )'; }
+ fi
+ # srcdir has to be passed to ./configure because it must be able to find
+ # src/build-aux/install-sh _AND_ also its own sources, thus we must
 @@ -3315,7 +3315,7 @@ for var in ${PRECIOUS_VARS}; do
  done
  # we must use $(SHELL) for sub-configures because when the top CONFIG_SHELL