CVS commit: pkgsrc/lang/snobol

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Jan 16 03:46:29 UTC 2023

Modified Files:
        pkgsrc/lang/snobol: Makefile distinfo
Added Files:
        pkgsrc/lang/snobol/patches: patch-configure

Log Message:
lang/snobol: fix installation on solaris by not using /etc/install

While here, tidy some pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/snobol/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/snobol/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/snobol/patches/patch-configure

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

Modified files:

Index: pkgsrc/lang/snobol/Makefile
diff -u pkgsrc/lang/snobol/Makefile:1.34 pkgsrc/lang/snobol/Makefile:1.35
--- pkgsrc/lang/snobol/Makefile:1.34    Sun Nov  3 19:04:08 2019
+++ pkgsrc/lang/snobol/Makefile Mon Jan 16 03:46:28 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2019/11/03 19:04:08 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2023/01/16 03:46:28 dholland Exp $
 #
 
 DISTNAME=      snobol4-1.3
-DIST_SUBDIR=   snobol4-1.3bis
 PKGNAME=       snobol-1.3
 PKGREVISION=   1
 CATEGORIES=    lang
@@ -10,6 +9,7 @@ MASTER_SITES=  ftp://ftp.snobol4.org/snob
 MASTER_SITES+= ftp://ftp.ultimate.com/snobol/
 MASTER_SITES+= ftp://ftp.snobol4.org/snobol/old/
 MASTER_SITES+= ftp://ftp.ultimate.com/snobol/old/
+DIST_SUBDIR=   snobol4-1.3bis
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} vanilla.tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -22,7 +22,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
 SUBST_CLASSES+=                        snobol-config
 SUBST_STAGE.snobol-config=     pre-configure
 SUBST_FILES.snobol-config=     Makefile
-SUBST_SED.snobol-config+=      -e s\|M4=m4\|M4=${TOOLS_PATH.m4:Q}\|
+SUBST_SED.snobol-config+=      -e s\|M4=m4\|M4=${TOOLS_PATH.m4}\|
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=      --mandir=${PREFIX}/${PK
 
 BUILD_TARGET=  all pv
 
-USE_TOOLS+=            gzip m4
+USE_TOOLS+=            gzip m4 tar
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 MAKE_JOBS_SAFE=                NO
 

Index: pkgsrc/lang/snobol/distinfo
diff -u pkgsrc/lang/snobol/distinfo:1.18 pkgsrc/lang/snobol/distinfo:1.19
--- pkgsrc/lang/snobol/distinfo:1.18    Tue Oct 26 10:51:56 2021
+++ pkgsrc/lang/snobol/distinfo Mon Jan 16 03:46:28 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 10:51:56 nia Exp $
+$NetBSD: distinfo,v 1.19 2023/01/16 03:46:28 dholland Exp $
 
 BLAKE2s (snobol4-1.3bis/snobol4-1.3.tar.gz) = 4165d49fab481c8667037e70c97c9e6008feb80cc9f790fd9c6a4a939a0958dc
 SHA512 (snobol4-1.3bis/snobol4-1.3.tar.gz) = 2ed768434c816dd728f8013b8f713a26b43e21c5fa9dec6e8ad5f178ed9f4fd4154f738d0add58a26f239dcfb33c81440a140f6e1af4729c5f6518eb497e46c2
@@ -8,3 +8,4 @@ SHA512 (snobol4-1.3bis/vanilla.tar.gz) =
 Size (snobol4-1.3bis/vanilla.tar.gz) = 188502 bytes
 SHA1 (patch-aa) = 02b759eb25bd46678d96eb281247ae326822d8f4
 SHA1 (patch-ab) = 7d3b10c2784e2732a3f9226a4263ff3cfe312282
+SHA1 (patch-configure) = 9ec8465e634c9e637345dac3c3612b50098d9e53

Added files:

Index: pkgsrc/lang/snobol/patches/patch-configure
diff -u /dev/null pkgsrc/lang/snobol/patches/patch-configure:1.1
--- /dev/null   Mon Jan 16 03:46:29 2023
+++ pkgsrc/lang/snobol/patches/patch-configure  Mon Jan 16 03:46:29 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2023/01/16 03:46:29 dholland Exp $
+
+Don't attempt to use /etc/install. It apparently exists on Solaris
+(even today) and does horrible things.
+
+--- configure~ 2010-02-27 21:09:03.000000000 +0000
++++ configure
+@@ -1632,7 +1632,7 @@ for DIR in /usr/bin /usr/ucb /usr/local/
+               continue
+           fi
+           case $IPATH in
+-          /usr/sbin/install|/bin/install|/usr/etc/install|\
++          /usr/sbin/install|/bin/install|/usr/etc/install|/etc/install|\
+               /sbin/install) continue;;
+           esac
+           if [ -x $IPATH ]; then