5 files changed, 44 insertions, 39 deletions

diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index 585edfe48463..37dea2774f38 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	perlsh
-PORTVERSION=	1.8
+PORTVERSION=	1.8.1
 CATEGORIES=	shells perl5
-MASTER_SITES=	http://www.cpan.org/authors/id/G/GR/GREGOR/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/modules\/by-module\/%SUBDIR%/authors\/id\/G\/GR\/GREGOR/}
 DISTNAME=	psh-${PORTVERSION}
 
 MAINTAINER=	garga@FreeBSD.org
@@ -16,8 +16,13 @@ COMMENT=	New shell made entirely out of a Perl script
 
 PERL_CONFIGURE=	yes
 
-MAN1=	psh.1 pshcomplete.1 pshconfig.1 pshdevel.1
+SUB_FILES=	pkg-install pkg-deinstall
+DATADIR=	${PREFIX}/share/psh
 
+MAN1=	psh.1 \
+	pshcomplete.1 \
+	pshconfig.1 \
+	pshdevel.1
 MAN3=	Psh::Completion.3 \
 	Psh::Joblist.3 \
 	Psh::Locale.3 \
diff --git a/shells/psh/distinfo b/shells/psh/distinfo
index 33d5c8aba93a..c8603a2ff72a 100644
--- a/shells/psh/distinfo
+++ b/shells/psh/distinfo
@@ -1,3 +1,3 @@
-MD5 (psh-1.8.tar.gz) = bb2040c519e6b263239d6f795a6515b5
-SHA256 (psh-1.8.tar.gz) = f72bc721bd563de6badaf893052cdbb201c15a16b8d50a01f02fd28a83385d1c
-SIZE (psh-1.8.tar.gz) = 119989
+MD5 (psh-1.8.1.tar.gz) = 0b992dbfb907b571249923b51b213133
+SHA256 (psh-1.8.1.tar.gz) = 9c6d276f98a3e62086bda76e1eddc0eaba6b003b903c94261bd53e80700ef88f
+SIZE (psh-1.8.1.tar.gz) = 120036
diff --git a/shells/psh/pkg-deinstall b/shells/psh/files/pkg-deinstall.in
index ad9fcef929e1..6528f0329c34 100644
--- a/shells/psh/pkg-deinstall
+++ b/shells/psh/files/pkg-deinstall.in
@@ -3,8 +3,8 @@
 # $FreeBSD$
 #
 
-PSH="${PKG_PREFIX-/usr/local}/bin/psh"
-SHELLS="${PKG_DESTDIR-}/etc/shells"
+PSH="%%PREFIX%%/bin/psh"
+SHELLS="/etc/shells"
 
 case $2 in
 DEINSTALL)
diff --git a/shells/psh/pkg-install b/shells/psh/files/pkg-install.in
index ff6fa57b1f71..b14f461248b8 100644
--- a/shells/psh/pkg-install
+++ b/shells/psh/files/pkg-install.in
@@ -3,8 +3,8 @@
 # $FreeBSD$
 #
 
-PSH="${PKG_PREFIX-/usr/local}/bin/psh"
-SHELLS="${PKG_DESTDIR-}/etc/shells"
+PSH="%%PREFIX%%/bin/psh"
+SHELLS="/etc/shells"
 
 case $2 in
 POST-INSTALL)
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index c34c69a29dc7..2c91ac26fbe2 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -1,31 +1,31 @@
 @comment $FreeBSD$
 bin/psh
-share/psh/complete/debian
-share/psh/complete/perl
-share/psh/complete/standard
-share/psh/themes/aix
-share/psh/themes/blank
-share/psh/themes/blight
-share/psh/themes/bold
-share/psh/themes/clock
-share/psh/themes/combo
-share/psh/themes/cyngus
-share/psh/themes/elite2
-share/psh/themes/fade
-share/psh/themes/gilbert
-share/psh/themes/hermann
-share/psh/themes/kax
-share/psh/themes/largo
-share/psh/themes/lxtips2
-share/psh/themes/nate
-share/psh/themes/nextstep
-share/psh/themes/openbsd
-share/psh/themes/plan-9
-share/psh/themes/rasterman
-share/psh/themes/simple
-share/psh/themes/stereophonic
-share/psh/themes/sunos
-share/psh/themes/vms
+%%DATADIR%%/complete/debian
+%%DATADIR%%/complete/perl
+%%DATADIR%%/complete/standard
+%%DATADIR%%/themes/aix
+%%DATADIR%%/themes/blank
+%%DATADIR%%/themes/blight
+%%DATADIR%%/themes/bold
+%%DATADIR%%/themes/clock
+%%DATADIR%%/themes/combo
+%%DATADIR%%/themes/cyngus
+%%DATADIR%%/themes/elite2
+%%DATADIR%%/themes/fade
+%%DATADIR%%/themes/gilbert
+%%DATADIR%%/themes/hermann
+%%DATADIR%%/themes/kax
+%%DATADIR%%/themes/largo
+%%DATADIR%%/themes/lxtips2
+%%DATADIR%%/themes/nate
+%%DATADIR%%/themes/nextstep
+%%DATADIR%%/themes/openbsd
+%%DATADIR%%/themes/plan-9
+%%DATADIR%%/themes/rasterman
+%%DATADIR%%/themes/simple
+%%DATADIR%%/themes/stereophonic
+%%DATADIR%%/themes/sunos
+%%DATADIR%%/themes/vms
 %%SITE_PERL%%/Psh.pm
 %%SITE_PERL%%/Psh/Builtins/Alias.pm
 %%SITE_PERL%%/Psh/Builtins/Bg.pm
@@ -113,9 +113,9 @@ share/psh/themes/vms
 %%SITE_PERL%%/Psh/Support/TiedOption.pm
 %%SITE_PERL%%/Psh/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
-@dirrm share/psh/complete
-@dirrm share/psh/themes
-@dirrm share/psh
+@dirrm %%DATADIR%%/complete
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh
 @dirrm %%SITE_PERL%%/Psh/Builtins/Fallback
 @dirrm %%SITE_PERL%%/Psh/Builtins