diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-12-20 05:41:15 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-12-20 05:41:15 +0000 |
| commit | 0636c6b10d3f4ecd83de8b51eb1eefe20c0fb564 (patch) | |
| tree | 029ad21761ea11b7ef1fd1ffe336e9d2ff28a516 /shells/heirloom-sh | |
| parent | 49dd053a1d54f5022ee1b0c7b8627d98a895c6b6 (diff) | |
| download | freebsd-ports-0636c6b10d3f4ecd83de8b51eb1eefe20c0fb564.zip | |
shells/heirloom-sh: Use @shell instead of custom reimplementation
Diffstat (limited to 'shells/heirloom-sh')
| -rw-r--r-- | shells/heirloom-sh/Makefile | 6 | ||||
| -rw-r--r-- | shells/heirloom-sh/pkg-deinstall | 22 | ||||
| -rw-r--r-- | shells/heirloom-sh/pkg-install | 19 |
3 files changed, 2 insertions, 45 deletions
diff --git a/shells/heirloom-sh/Makefile b/shells/heirloom-sh/Makefile index becc941cf370..f90e9b390af4 100644 --- a/shells/heirloom-sh/Makefile +++ b/shells/heirloom-sh/Makefile @@ -3,6 +3,7 @@ PORTNAME= heirloom-sh PORTVERSION= 050706 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= SF/heirloom/${PORTNAME}/${PORTVERSION} @@ -13,13 +14,10 @@ BROKEN_aarch64= Fails to link: missing sbrk USES= tar:bzip2 MAKEFILE= makefile -PLIST_FILES= bin/jsh \ +PLIST_FILES= "@shell bin/jsh" \ man/man1/jsh.1.gz PORTDOCS= CALDERA.LICENSE OPENSOLARIS.LICENSE CHANGES README -PKGINSTALL= pkg-install -PKGDEINSTALL= pkg-deinstall - OPTIONS_DEFINE= DOCS do-install: diff --git a/shells/heirloom-sh/pkg-deinstall b/shells/heirloom-sh/pkg-deinstall deleted file mode 100644 index 439041a4af1b..000000000000 --- a/shells/heirloom-sh/pkg-deinstall +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -JSH="$(echo ${PKG_PREFIX-/usr/local}/bin/jsh | /usr/bin/sed -e 's|//|/|g')" -SHELLS="${PKG_DESTDIR-}/etc/shells" - -case $2 in -DEINSTALL) - if grep -qs "^$JSH\$" "$SHELLS"; then - if [ $(id -u) -eq 0 ]; then - TMPSHELLS=$(mktemp -t shells) - grep -v "^$JSH\$" "$SHELLS" > "$TMPSHELLS" - cat "$TMPSHELLS" > "$SHELLS" - rm "$TMPSHELLS" - else - echo "Not root, please remove $JSH from $SHELLS manually" - fi - fi - ;; -esac diff --git a/shells/heirloom-sh/pkg-install b/shells/heirloom-sh/pkg-install deleted file mode 100644 index 555ee92c82e7..000000000000 --- a/shells/heirloom-sh/pkg-install +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -JSH="$(echo ${PKG_PREFIX-/usr/local}/bin/jsh | /usr/bin/sed -e 's|//|/|g')" -SHELLS="/etc/shells" - -case $2 in -POST-INSTALL) - if [ -d "${SHELLS%/*}" ] && ! grep -qs "^$JSH\$" "$SHELLS"; then - if [ $(id -u) -eq 0 ]; then - echo "$JSH" >> "$SHELLS" - else - echo "Not root, please add $JSH to $SHELLS manually" - fi - fi - ;; -esac |