diff options
| author | jmmv <jmmv> | 2003-09-22 20:57:12 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-09-22 20:57:12 +0000 |
| commit | 835be6ff7a15b7754d6c846a6350deb8997bf1a3 (patch) | |
| tree | d85079bc8350569faaad75c67bc2fe853eab2120 /shells/osh | |
| parent | 617048ccd92d5aa041db649b1695841e7b9851a0 (diff) | |
| download | pkgsrc-835be6ff7a15b7754d6c846a6350deb8997bf1a3.tar.gz | |
Use the right install program for correctness and to fix problems under SunOS.
From PR pkg/22898 by Jonathan Perkin.
Diffstat (limited to 'shells/osh')
| -rw-r--r-- | shells/osh/distinfo | 4 | ||||
| -rw-r--r-- | shells/osh/patches/patch-aa | 29 |
2 files changed, 17 insertions, 16 deletions
diff --git a/shells/osh/distinfo b/shells/osh/distinfo index c6bb734e205..607dbbc18ad 100644 --- a/shells/osh/distinfo +++ b/shells/osh/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/20 20:52:29 cjep Exp $ +$NetBSD: distinfo,v 1.2 2003/09/22 20:57:12 jmmv Exp $ SHA1 (osh-020214.tar.gz) = 3626dd0bcd2152a9173fa9fc9183674699db8ec4 Size (osh-020214.tar.gz) = 10639 bytes -SHA1 (patch-aa) = 9f587d67a0db386b141e504fbd2b61a6c6e32d52 +SHA1 (patch-aa) = 213431251f3df82dd2b1405b115a64333838c4e2 diff --git a/shells/osh/patches/patch-aa b/shells/osh/patches/patch-aa index 3292d846392..b5a15bbe5e5 100644 --- a/shells/osh/patches/patch-aa +++ b/shells/osh/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/08/20 20:52:29 cjep Exp $ +$NetBSD: patch-aa,v 1.2 2003/09/22 20:57:13 jmmv 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 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/20 20:52:29 cjep Exp $ 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 |