aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorAlex Kozlov <ak@FreeBSD.org>2014-03-24 07:39:33 +0000
committerAlex Kozlov <ak@FreeBSD.org>2014-03-24 07:39:33 +0000
commit9370f6b6a7635c91c65ff4c49654c53c7bacc38b (patch)
tree326aec0f21db2695e9a240d01f875560eecb9770 /ports-mgmt
parentcc3a79f3d7ded4bd37831c5720172ce3fd0e21da (diff)
downloadports-9370f6b6a7635c91c65ff4c49654c53c7bacc38b.tar.gz
ports-9370f6b6a7635c91c65ff4c49654c53c7bacc38b.zip
- Update pkgng patch to 8.0.9
* Improvement of the pkgng detection logic [1] * Improvement of the speed of "pkg_replace -a" [2] PR: ports/187723 Submitted by: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp> (maintainer) Requested by: Michael Gmelin <freebsd@grem.de> [1], Martin Dieringer <martin.dieringer@gmx.de> [2]
Notes
Notes: svn path=/head/; revision=348922
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/pkg_replace/Makefile19
-rw-r--r--ports-mgmt/pkg_replace/distinfo4
-rw-r--r--ports-mgmt/pkg_replace/pkg-plist2
3 files changed, 13 insertions, 12 deletions
diff --git a/ports-mgmt/pkg_replace/Makefile b/ports-mgmt/pkg_replace/Makefile
index 9220c54dae90..abb8b0ac0524 100644
--- a/ports-mgmt/pkg_replace/Makefile
+++ b/ports-mgmt/pkg_replace/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pkg_replace
PORTVERSION= 0.8.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= portutil/22116
@@ -14,21 +14,17 @@ PATCHFILES= ${PKGNAME}.patch
MAINTAINER= kdeguchi@sz.tokoha-u.ac.jp
COMMENT= Utility for upgrading installed packages
-USE_BZIP2= yes
+USES= tar:bzip2
MAKE_ARGS= PREFIX="${PREFIX}" \
PORTSDIR="${PORTSDIR}" PKG_DBDIR="${PKG_DBDIR}"
-OPTIONS_DEFINE= ZSH
-
-.if empty(WITH_PKGNG)
-OPTIONS_DEFINE+= PKGDB_FIX
+OPTIONS_DEFINE= PKGDB_FIX ZSH
PKGDB_FIX_DESC= Fixing tool of installed package dependencies
-.else
-PLIST_SUB+= PKGDB_FIX="@comment "
-.endif
OPTIONS_SUB= yes
+.include <bsd.port.options.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/' ${WRKSRC}/sbin/Makefile
@${REINPLACE_CMD} -e 's/mkdir -p $${FILESDIR}/@true/' ${WRKSRC}/share/zsh/Makefile
@@ -36,4 +32,9 @@ post-patch:
pre-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+.if defined(WITH_PKGNG)
+post-install:
+ @${REINPLACE_CMD} -e '/pkgdb_fix/d' ${TMPPLIST}
+.endif
+
.include <bsd.port.mk>
diff --git a/ports-mgmt/pkg_replace/distinfo b/ports-mgmt/pkg_replace/distinfo
index 3bb117c97cbb..f4814060d3d1 100644
--- a/ports-mgmt/pkg_replace/distinfo
+++ b/ports-mgmt/pkg_replace/distinfo
@@ -1,4 +1,4 @@
SHA256 (pkg_replace-0.8.0.tar.bz2) = 3092f5fc0d18529eb5d38776941c0ee4d0073ecb524ab17671c81ca69c29e214
SIZE (pkg_replace-0.8.0.tar.bz2) = 17296
-SHA256 (pkg_replace-0.8.0_8.patch) = c66579918c99277c6ef18e3c8d9f5fad3a452c1e0e32096f97918103271167c4
-SIZE (pkg_replace-0.8.0_8.patch) = 11601
+SHA256 (pkg_replace-0.8.0_9.patch) = 5025b8cdf05f91c5f0d110cba908c0c04c39cbb8d3255c0100e745c3526db2b9
+SIZE (pkg_replace-0.8.0_9.patch) = 12219
diff --git a/ports-mgmt/pkg_replace/pkg-plist b/ports-mgmt/pkg_replace/pkg-plist
index fc930a45a2ce..9ee4b50e5f86 100644
--- a/ports-mgmt/pkg_replace/pkg-plist
+++ b/ports-mgmt/pkg_replace/pkg-plist
@@ -1,7 +1,7 @@
etc/pkg_replace.conf.sample
man/man1/pkg_replace.1.gz
-sbin/pkg_replace
%%PKGDB_FIX%%man/man1/pkgdb_fix.1.gz
+sbin/pkg_replace
%%PKGDB_FIX%%sbin/pkgdb_fix
%%ZSH%%share/zsh/site-functions/_pkg_replace
%%ZSH%%@dirrmtry share/zsh/site-functions