>Number:         22898
>Category:       pkg
>Synopsis:       Fix install target for shells/osh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 22 19:34:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        N/A
>Organization:
British Broadcasting Corporation
>Environment:
SunOS build1 5.9 Generic_112233-01 sun4u sparc SUNW,UltraSPARC-IIi-cEngine
>Description:
Cleanup osh install target to use standard pkgsrc macros, thereby
making the package install correctly under Solaris (or any other
system which doesn't have /usr/bin/install).
>How-To-Repeat:
===> Installing for osh-020214
/usr/bin/install -c -s osh /home/jonp/bulk/pkg/bin
bmake: Exec of `/usr/bin/install' failed (No such file or directory)
*** Error code 1
>Fix:
http://www.perkin.org.uk/projects/netbsd/osh.diff

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/shells/osh/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	2002/08/20 20:52:29	1.1.1.1
+++ distinfo	2003/09/22 19:32:30
@@ -2,4 +2,4 @@
 
 SHA1 (osh-020214.tar.gz) = 3626dd0bcd2152a9173fa9fc9183674699db8ec4
 Size (osh-020214.tar.gz) = 10639 bytes
-SHA1 (patch-aa) = 9f587d67a0db386b141e504fbd2b61a6c6e32d52
+SHA1 (patch-aa) = 213431251f3df82dd2b1405b115a64333838c4e2
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/shells/osh/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa	2002/08/20 20:52:29	1.1.1.1
+++ patches/patch-aa	2003/09/22 19:32:30
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.1.1.1 2002/08/20 20:52:29 cjep Exp $
 
 --- makefile.orig	Thu Feb 14 00:11:14 2002
-+++ makefile
-@@ -2,11 +2,10 @@
++++ makefile	Mon Sep 22 20:29:15 2003
+@@ -2,7 +2,6 @@
  
  # CONFIGURATION
  
@@ -10,18 +10,19 @@
  BINDIR     = $(PREFIX)/bin
  MANDIR     = $(PREFIX)/man
  MANSECT    = $(MANDIR)/man1
--INSTALL	   = /usr/ucb/install
-+INSTALL	   = /usr/bin/install
+@@ -29,9 +28,9 @@
+ 	rm -f osh osh.o goto goto.o if if.o core log *~
  
- # CONFIGURATION ENDS
- 
-@@ -32,6 +31,6 @@
- 	$(INSTALL) -c -s osh $(BINDIR)
- 	$(INSTALL) -c -s goto $(BINDIR)
- 	$(INSTALL) -c -s if $(BINDIR)
+ install: all
+-	$(INSTALL) -c -s osh $(BINDIR)
+-	$(INSTALL) -c -s goto $(BINDIR)
+-	$(INSTALL) -c -s if $(BINDIR)
 -	$(INSTALL) -c -m 644 osh.1 $(MANSECT)
 -	$(INSTALL) -c -m 644 goto.1 $(MANSECT)
 -	$(INSTALL) -c -m 644 if.1 $(MANSECT)
-+	$(INSTALL) -c -m 444 osh.1 $(MANSECT)
-+	$(INSTALL) -c -m 444 goto.1 $(MANSECT)
-+	$(INSTALL) -c -m 444 if.1 $(MANSECT)
++	$(BSD_INSTALL_PROGRAM) osh $(BINDIR)/osh
++	$(BSD_INSTALL_PROGRAM) goto $(BINDIR)/goto
++	$(BSD_INSTALL_PROGRAM) if $(BINDIR)/if
++	$(BSD_INSTALL_MAN) osh.1 $(MANSECT)/osh.1
++	$(BSD_INSTALL_MAN) goto.1 $(MANSECT)/goto.1
++	$(BSD_INSTALL_MAN) if.1 $(MANSECT)/if.1
>Release-Note:
>Audit-Trail:
>Unformatted: