4 files changed, 6 insertions, 26 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 8868b0af68f1..baeaa2f8367b 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	20140524
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
@@ -40,18 +41,10 @@ INSTALL_TARGET+=	install-doc
 .endif
 
 # Reported that ruby-bdb is BROKEN with 2.0
-.if ${RUBY_VER} != 2.0
+.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 .endif
 
-# Need to install working script(1)
-.if ${OSVERSION} < 801000
-PLIST_SUB+=	SCRIPT=""
-MAKE_ENV+=	NEED_COMPAT_SCRIPT=yes
-.else
-PLIST_SUB+=	SCRIPT="@comment "
-.endif
-
 regression-test: patch
 	cd ${WRKSRC} && ${MAKE} test
 
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index ff409a6d6557..f5bc902bacd4 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -47,15 +47,12 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkgtools/revision.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
 @dirrm %%RUBY_SITELIBDIR%%/pkgtools
-%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null
-%%SCRIPT%%libexec/pkgtools/script
-%%SCRIPT%%@dirrm libexec/pkgtools
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
 etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
-@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@dirrmtry share/zsh/site-functions
 @dirrmtry share/zsh
 %%EXAMPLESDIR%%/bash/complete.sample
 %%EXAMPLESDIR%%/tcsh/complete.sample
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index db111f3ecc69..24eb9f3b96c9 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.4.12
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	SF/portupgrade/pkgtools/dist/ \
@@ -39,19 +40,11 @@ INSTALL_TARGET+=	install-doc
 .endif
 
 # Reported that ruby-bdb is BROKEN with 2.0
-.if ${RUBY_VER} != 2.0
+.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 .endif
 
-# Need to install working script(1)
-.if ${OSVERSION} < 801000
-PLIST_SUB+=	SCRIPT=""
-MAKE_ENV+=	NEED_COMPAT_SCRIPT=yes
-.else
-PLIST_SUB+=	SCRIPT="@comment "
-.endif
-
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index b27b624522d0..1e14136d5bf4 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -47,13 +47,10 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkgtools/revision.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
 @dirrm %%RUBY_SITELIBDIR%%/pkgtools
-%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null
-%%SCRIPT%%libexec/pkgtools/script
-%%SCRIPT%%@dirrm libexec/pkgtools
 @sample etc/pkgtools.conf.sample
 etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
-@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@dirrmtry share/zsh/site-functions
 @dirrmtry share/zsh
 %%EXAMPLESDIR%%/bash/complete.sample
 %%EXAMPLESDIR%%/tcsh/complete.sample