aboutsummaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2019-12-20 05:51:02 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2019-12-20 05:51:02 +0000
commit59b25e8c8c4777e099ad8f976d8ad9c3552b6650 (patch)
treeb1ef215651affff34a5f9116376e4f331e2193b0 /shells
parent0636c6b10d3f4ecd83de8b51eb1eefe20c0fb564 (diff)
downloadports-59b25e8c8c4777e099ad8f976d8ad9c3552b6650.tar.gz
ports-59b25e8c8c4777e099ad8f976d8ad9c3552b6650.zip
Notes
Diffstat (limited to 'shells')
-rw-r--r--shells/psh/Makefile4
-rw-r--r--shells/psh/files/pkg-deinstall.in22
-rw-r--r--shells/psh/files/pkg-install.in19
-rw-r--r--shells/psh/pkg-plist2
4 files changed, 2 insertions, 45 deletions
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index b0c5537c228c..0b5e3ffa7cfc 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= psh
PORTVERSION= 1.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= shells perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:GREGOR
@@ -16,6 +16,4 @@ RUN_DEPENDS= ${SITE_PERL}/Term/ReadLine/Perl.pm:devel/p5-Term-ReadLine-Perl
USES= perl5
USE_PERL5= configure
-SUB_FILES= pkg-install pkg-deinstall
-
.include <bsd.port.mk>
diff --git a/shells/psh/files/pkg-deinstall.in b/shells/psh/files/pkg-deinstall.in
deleted file mode 100644
index 6528f0329c34..000000000000
--- a/shells/psh/files/pkg-deinstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PSH="%%PREFIX%%/bin/psh"
-SHELLS="/etc/shells"
-
-case $2 in
-DEINSTALL)
- if grep -qs "^$PSH\$" "$SHELLS"; then
- if [ `id -u` -eq 0 ]; then
- TMPSHELLS=`mktemp -t shells`
- grep -v "^$PSH\$" "$SHELLS" > "$TMPSHELLS"
- cat "$TMPSHELLS" > "$SHELLS"
- rm "$TMPSHELLS"
- else
- echo "Not root, please remove $PSH from $SHELLS manually"
- fi
- fi
- ;;
-esac
diff --git a/shells/psh/files/pkg-install.in b/shells/psh/files/pkg-install.in
deleted file mode 100644
index b14f461248b8..000000000000
--- a/shells/psh/files/pkg-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PSH="%%PREFIX%%/bin/psh"
-SHELLS="/etc/shells"
-
-case $2 in
-POST-INSTALL)
- if [ -d "${SHELLS%/*}" ] && ! grep -qs "^$PSH\$" "$SHELLS"; then
- if [ `id -u` -eq 0 ]; then
- echo "$PSH" >> "$SHELLS"
- else
- echo "Not root, please add $PSH to $SHELLS manually"
- fi
- fi
- ;;
-esac
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index 246cc4f5577f..61313bb4bd35 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -1,4 +1,4 @@
-bin/psh
+@shell bin/psh
%%DATADIR%%/complete/debian
%%DATADIR%%/complete/perl
%%DATADIR%%/complete/standard