aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-04-12 03:39:48 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-04-12 03:39:48 +0000
commitcc685d84fc87dc3b8c86945e6fc53e17f2d6eff1 (patch)
treef768dd424cb983911cd1cbaaa6551629c4076fca /ports-mgmt
parent4070b125519e180a901b0c14d163885f3c375957 (diff)
downloadports-cc685d84fc87dc3b8c86945e6fc53e17f2d6eff1.tar.gz
ports-cc685d84fc87dc3b8c86945e6fc53e17f2d6eff1.zip
Notes
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade/Makefile4
-rw-r--r--ports-mgmt/portupgrade/pkg-plist4
2 files changed, 3 insertions, 5 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index ab6ec9cf009d..db111f3ecc69 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -13,14 +13,14 @@ DISTNAME= pkgtools-${PORTVERSION}
MAINTAINER= bdrewery@FreeBSD.org
COMMENT= FreeBSD ports/packages administration and management tool suite
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
OPTIONS_DEFINE= DOCS
CONFLICTS_INSTALL= portupgrade-devel-*
DIST_SUBDIR= ${PORTNAME}
-USE_BZIP2= yes
+USES= tar:bzip2
USE_RUBY= yes
USE_LDCONFIG= ${PREFIX}/lib/compat/pkg
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 642f3880f9fb..3405d199c59e 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -53,9 +53,7 @@ sbin/portversion
%%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
+@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