summaryrefslogtreecommitdiff
path: root/shells/osh
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-02-23 01:58:41 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-02-23 01:58:41 +0000
commit445013e6e37e5ea01dddfbe9d63d62e445bf0156 (patch)
treec8603db4322f588cb8b78f9c4664b8fb7491370f /shells/osh
parent34bcf63195418289045e81c97fa347a6702f1a73 (diff)
downloadpkgsrc-445013e6e37e5ea01dddfbe9d63d62e445bf0156.tar.gz
Upgrade shells/osh to 040216, this closes PR pkg/24501.
Too many changes to copy here, previous package was 2 years old, please review the Changelog file.
Diffstat (limited to 'shells/osh')
-rw-r--r--shells/osh/DESCR3
-rw-r--r--shells/osh/Makefile12
-rw-r--r--shells/osh/PLIST2
-rw-r--r--shells/osh/distinfo7
-rw-r--r--shells/osh/patches/patch-aa28
5 files changed, 11 insertions, 41 deletions
diff --git a/shells/osh/DESCR b/shells/osh/DESCR
index b092e1c7817..99e2d357d3e 100644
--- a/shells/osh/DESCR
+++ b/shells/osh/DESCR
@@ -3,6 +3,3 @@ which was in standard use up to UNIX 6th Edition and was supplied
as osh with UNIX 7th Edition. Its command language is a sparse
subset of those of modern shells and is mostly common both to sh(1)
and csh(1).
-
-- George Reid
-greid@ukug.uk.freebsd.org
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index b818710d26d..a2775a6c81d 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:23 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/23 01:58:41 xtraeme Exp $
# FreeBSD Id: ports/shells/osh/Makefile,v 1.3 2002/01/29 11:58:43 knu Exp
-DISTNAME= osh-020214
+DISTNAME= osh-040216
CATEGORIES= shells
-MASTER_SITES= http://omnibus.ruf.uni-freiburg.de/~gritter/archive/
+MASTER_SITES= http://jneitzel.sdf1.org/osh/src/
+HOMEPAGE= http://jneitzel.sdf1.org/osh/
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Implementation of the UNIX 6th Edition shell
-MAKEFILE= makefile
-
+USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/osh
+TEST_TARGET= check
+
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/osh/PLIST b/shells/osh/PLIST
index 555970aefa2..6104561e61a 100644
--- a/shells/osh/PLIST
+++ b/shells/osh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:01 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/23 01:58:41 xtraeme Exp $
bin/goto
bin/if
bin/osh
diff --git a/shells/osh/distinfo b/shells/osh/distinfo
index 607dbbc18ad..07fc1c9f555 100644
--- a/shells/osh/distinfo
+++ b/shells/osh/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/09/22 20:57:12 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/02/23 01:58:41 xtraeme Exp $
-SHA1 (osh-020214.tar.gz) = 3626dd0bcd2152a9173fa9fc9183674699db8ec4
-Size (osh-020214.tar.gz) = 10639 bytes
-SHA1 (patch-aa) = 213431251f3df82dd2b1405b115a64333838c4e2
+SHA1 (osh-040216.tar.gz) = faa372d7efda3e7235a5c5f1d1091c440841bef8
+Size (osh-040216.tar.gz) = 34235 bytes
diff --git a/shells/osh/patches/patch-aa b/shells/osh/patches/patch-aa
deleted file mode 100644
index b5a15bbe5e5..00000000000
--- a/shells/osh/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/09/22 20:57:13 jmmv Exp $
-
---- makefile.orig Thu Feb 14 00:11:14 2002
-+++ makefile Mon Sep 22 20:29:15 2003
-@@ -2,7 +2,6 @@
-
- # CONFIGURATION
-
--PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/man
- MANSECT = $(MANDIR)/man1
-@@ -29,9 +28,9 @@
- rm -f osh osh.o goto goto.o if if.o core log *~
-
- 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)
-+ $(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