Subject: pkg/20239: Fix x11/eterm install on machines with broken /bin/sh
To: None <gnats-bugs@gnats.netbsd.org>
From: Jonathan Perkin <sketch@rd.bbc.co.uk>
List: netbsd-bugs
Date: 02/07/2003 18:06:04
>Number:         20239
>Category:       pkg
>Synopsis:       Install of eterm runs #! line instead of pkgsrc's SHELL var
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 07 10:07:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        NetBSD 1.6M
>Organization:
	British Broadcasting Corporation
>Environment:
System: NetBSD munkeh.intra.nut 1.6M NetBSD 1.6M (GENERIC) #0: Tue Jan 21 11:42:54 GMT 2003 sketch@munkeh.intra.nut:/usr/src/sys/arch/sparc64/compile/GENERIC sparc64
Architecture: sparc64
Machine: sparc64
>Description:
	eterm install includes a small shell script named Etbg_update_list
	which doesn't execute on machines with a buggy /bin/sh (fails on
	test argument unexpected errors).  Easy fix, as pkgsrc passes down
	the correct shell to use on each architecture, so use that.
>How-To-Repeat:
>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/distinfo,v
retrieving revision 1.7
diff -u -u -r1.7 distinfo
--- distinfo	2002/12/26 04:58:44	1.7
+++ distinfo	2003/02/07 18:00:32
@@ -8,6 +8,7 @@
 Size (Eterm-bg-scale-2.tar.gz) = 3145775 bytes
 SHA1 (Eterm-bg-tile.tar.gz) = 2ccb31a8fd0e80e5dd92aebef6baf5554f66e361
 Size (Eterm-bg-tile.tar.gz) = 1568166 bytes
+SHA1 (patch-aa) = 97f564fad19c0d5615a53ef7993897adf6573a18
 SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8
 SHA1 (patch-ah) = 81dac9571b5184d803003a0681c9cc8a0a62e389
 SHA1 (patch-ai) = 9a173c2d8dc7a9b3f6cd1a09e9a04586f6c82f93
--- /dev/null	Fri Feb  7 17:50:48 2003
+++ patches/patch-aa	Fri Feb  7 17:34:39 2003
@@ -0,0 +1,12 @@
+$NetBSD$
+--- bg/Makefile.in.orig	Fri Feb  7 17:33:33 2003
++++ bg/Makefile.in	Fri Feb  7 17:33:42 2003
+@@ -237,7 +237,7 @@
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir}/$$j/ ; \
+ 	  done) ; \
+ 	done)
+-	$(UPDATE_SCRIPT) $(DESTDIR)${pixmapdir}
++	$(SHELL) $(UPDATE_SCRIPT) $(DESTDIR)${pixmapdir}
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
>Release-Note:
>Audit-Trail:
>Unformatted: