Date: Wed, 19 Mar 2014 08:35:09 GMT From: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187723: [maintainer-update] ports-mgmt/pkg_replace update Message-ID: <201403190835.s2J8Z9GK092866@cgiserv.freebsd.org> Resent-Message-ID: <201403190840.s2J8e11c016225@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187723
>Category: ports
>Synopsis: [maintainer-update] ports-mgmt/pkg_replace update
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 19 08:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Ken DEGUCHI
>Release: FreeBSD 10.0-STABLE
>Organization:
TOKOHA University
>Environment:
FreeBSD lagrange.tokoha-u.ac.jp 10.0-STABLE FreeBSD 10.0-STABLE #19 r262958M: Mon Mar 10 07:10:56 JST 2014 root@lagrange.tokoha-u.ac.jp:/usr/obj/usr/src/sys/LAGRANGE amd64
>Description:
Michael Gmelin and Martin Dieringer requested as follows.
-Improvement of the PKGNG detection logic.
-Improvement of the speed of "pkg_replace -a".
I made a patch for these issues.
However, the second improvement does not check the dependencies of packages.
If you want to check the dependencies, you run the command with the option "-r" or "-R".
>How-To-Repeat:
>Fix:
I made a patch.
Patch attached with submission follows:
diff -ur ports-mgmt/pkg_replace/Makefile.orig ports-mgmt/pkg_replace/Makefile
--- ports-mgmt/pkg_replace/Makefile.orig 2014-02-05 05:48:39.952480069 +0900
+++ ports-mgmt/pkg_replace/Makefile 2014-03-19 14:45:13.252201027 +0900
@@ -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,16 @@
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
-PKGDB_FIX_DESC= Fixing tool of installed package dependencies
-.else
-PLIST_SUB+= PKGDB_FIX="@comment "
-.endif
-
+OPTIONS_DEFINE= PKGDB_FIX ZSH
+PKGDB_FIX_DESC= Fixing tool of installed package dependencies (not supported pkgng)
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 +31,9 @@
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 -ur ports-mgmt/pkg_replace/distinfo.orig ports-mgmt/pkg_replace/distinfo
--- ports-mgmt/pkg_replace/distinfo.orig 2014-02-05 05:48:38.406478686 +0900
+++ ports-mgmt/pkg_replace/distinfo 2014-03-19 07:38:20.405964626 +0900
@@ -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 -ur ports-mgmt/pkg_replace/pkg-plist.orig ports-mgmt/pkg_replace/pkg-plist
--- ports-mgmt/pkg_replace/pkg-plist.orig 2013-09-27 04:05:35.405884267 +0900
+++ ports-mgmt/pkg_replace/pkg-plist 2014-03-19 11:21:05.517044968 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403190835.s2J8Z9GK092866>