Hello ports@ and Pascal,
I've attached a diff to, in effect, move shells/osh to shells/etsh
and update it to the latest upstream version. Other changes include:
1) remove @conflict omake, since there is no longer a conflict; and
2) add a static flavor;
It's pretty straightforward otherwise I think. My contact addresses are
in Cc:, BTW. Comments / questions? OK?
--
Regards,
Jeff
Index: shells/Makefile
===================================================================
RCS file: /cvs/ports/shells/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- shells/Makefile 5 Mar 2017 21:13:27 -0000 1.31
+++ shells/Makefile 30 Aug 2017 15:29:22 -0000
@@ -5,8 +5,9 @@
SUBDIR += dash
SUBDIR += dash,static
SUBDIR += es
+ SUBDIR += etsh
+ SUBDIR += etsh,static
SUBDIR += ksh93
- SUBDIR += osh
SUBDIR += nsh
SUBDIR += nsh,static
SUBDIR += perlsh
Index: shells/etsh/Makefile
===================================================================
RCS file: /cvs/ports/shells/osh/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- shells/etsh/Makefile 26 May 2017 21:27:10 -0000 1.12
+++ shells/etsh/Makefile 30 Aug 2017 15:29:22 -0000
@@ -2,40 +2,39 @@
COMMENT = Sixth Edition UNIX Shell
-V = 4.3.2
-DISTNAME = osh-$V
+V = 4.7.0
+DISTNAME = etsh-$V
EPOCH = 0
SUBST_VARS += V
CATEGORIES = shells
-HOMEPAGE = http://v6shell.org
+HOMEPAGE = https://etsh.io
MAINTAINER = Pascal Stumpf <pas...@stumpf.co>
# BSD
PERMIT_PACKAGE_CDROM = Yes
+MASTER_SITES = ${HOMEPAGE}/src/
+
WANTLIB = c
-MASTER_SITES = ${HOMEPAGE}/src/
+CONFIGURE_STYLE = simple
+
+FLAVORS = static
+FLAVOR ?=
+.if ${FLAVOR:Mstatic}
+MAKE_ENV=LDFLAGS="${STATIC}"
+.endif
MAKE_FLAGS = SYSCONFDIR="${SYSCONFDIR}" PREFIX="${TRUEPREFIX}" \
BINGRP="-g ${BINGRP}" MANGRP="-g ${MANGRP}" \
- BINMODE="-m ${BINMODE}" MANMODE="-m ${MANMODE}" \
- MANDIR="${PREFIX}/man/man1"
+ BINMODE="-m ${BINMODE}" MANMODE="-m ${MANMODE}"
TEST_TARGET = check
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/osh
- ${INSTALL_DATA} ${WRKSRC}/examples/etc.osh.login \
- ${PREFIX}/share/examples/osh/osh.login
- ${INSTALL_DATA} ${WRKSRC}/examples/etc.osh.logout \
- ${PREFIX}/share/examples/osh/osh.logout
- ${INSTALL_DATA} ${WRKSRC}/examples/etc.osh.oshrc \
- ${PREFIX}/share/examples/osh/osh.oshrc
+INSTALL_TARGET = install install-exp
.include <bsd.port.mk>
Index: shells/etsh/distinfo
===================================================================
RCS file: /cvs/ports/shells/osh/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- shells/etsh/distinfo 26 May 2017 21:27:10 -0000 1.10
+++ shells/etsh/distinfo 30 Aug 2017 15:29:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (osh-4.3.2.tar.gz) = YSOyTNh+cMv5nybOXeqZKr7ffk8MatlkhTQnkZtH3Mc=
-SIZE (osh-4.3.2.tar.gz) = 138180
+SHA256 (etsh-4.7.0.tar.gz) = HfraFwzcxkJ/i4F30Oydr+UFwFYH0NqN1LX2rG/FQIc=
+SIZE (etsh-4.7.0.tar.gz) = 145093
Index: shells/etsh/pkg/DESCR
===================================================================
RCS file: /cvs/ports/shells/osh/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- shells/etsh/pkg/DESCR 15 May 2016 15:34:45 -0000 1.2
+++ shells/etsh/pkg/DESCR 30 Aug 2017 15:29:22 -0000
@@ -1,9 +1,9 @@
-Osh(1) is an enhanced, backward-compatible port of the Sixth Edition
-Thompson shell. Sh6(1) is an unenhanced port of the shell, and
-glob(1) is a port of its global command. Together, sh6 and glob
+Etsh(1) is an enhanced, backward-compatible port of the Sixth Edition
+Thompson shell. Tsh(1) is an unenhanced port of the shell, and
+glob(1) is a port of its global command. Together, tsh and glob
provide a user interface which is backward compatible with that
provided by the Sixth Edition Thompson shell and global command,
-but without the obvious enhancements found in osh.
+but without the obvious enhancements found in etsh.
The original Thompson shell was principally written by Ken Thompson
of Bell Labs.
Index: shells/etsh/pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/osh/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- shells/etsh/pkg/PLIST 28 Jan 2017 21:54:34 -0000 1.5
+++ shells/etsh/pkg/PLIST 30 Aug 2017 15:29:22 -0000
@@ -1,31 +1,35 @@
@comment $OpenBSD: PLIST,v 1.5 2017/01/28 21:54:34 pascal Exp $
-@conflict omake-*
-@shell bin/osh
-@shell bin/sh6
-libexec/osh-${V}/
-libexec/osh-${V}/README
-libexec/osh-${V}/osh/
-libexec/osh-${V}/osh/README
-libexec/osh-${V}/osh/SetTandCTTY
-libexec/osh-${V}/osh/history
-libexec/osh-${V}/osh/history.help
-libexec/osh-${V}/osh/oshdir
-libexec/osh-${V}/sh6/
-libexec/osh-${V}/sh6/README
-@bin libexec/osh-${V}/sh6/fd2
-@bin libexec/osh-${V}/sh6/glob
-@bin libexec/osh-${V}/sh6/goto
-@bin libexec/osh-${V}/sh6/if
+@shell bin/etsh
+@shell bin/tsh
+libexec/etsh-${V}/
+libexec/etsh-${V}/README
+libexec/etsh-${V}/etsh/
+libexec/etsh-${V}/etsh/README
+libexec/etsh-${V}/etsh/SetP
+libexec/etsh-${V}/etsh/SetTandCTTY
+libexec/etsh-${V}/etsh/SetV
+libexec/etsh-${V}/etsh/history
+libexec/etsh-${V}/etsh/history.help
+libexec/etsh-${V}/etsh/etshdir
+libexec/etsh-${V}/tsh/
+libexec/etsh-${V}/tsh/README
+@bin libexec/etsh-${V}/tsh/fd2
+@bin libexec/etsh-${V}/tsh/glob
+@bin libexec/etsh-${V}/tsh/goto
+@bin libexec/etsh-${V}/tsh/if
+@man man/man1/etsh.1
@man man/man1/fd2.1
@man man/man1/glob.1
@man man/man1/goto.1
@man man/man1/if.1
-@man man/man1/osh.1
-@man man/man1/sh6.1
-share/examples/osh/
-share/examples/osh/osh.login
-@sample ${SYSCONFDIR}/osh.login
-share/examples/osh/osh.logout
-@sample ${SYSCONFDIR}/osh.logout
-share/examples/osh/osh.oshrc
-@sample ${SYSCONFDIR}/osh.oshrc
+@man man/man1/tsh.1
+share/examples/etsh/
+share/examples/etsh/etsh.login
+@sample ${SYSCONFDIR}/etsh.login
+share/examples/etsh/etsh.logout
+@sample ${SYSCONFDIR}/etsh.logout
+share/examples/etsh/etsh.etshrc
+@sample ${SYSCONFDIR}/etsh.etshrc
+share/examples/etsh/.etsh.login
+share/examples/etsh/.etsh.logout
+share/examples/etsh/.etshrc
