svn commit: r327895 - in head/ports-mgmt/pkg_replace: . files

[Alex Kozlov]

Author: ak
Date: Sun Sep 22 20:25:06 2013
New Revision: 327895
URL: http://svnweb.freebsd.org/changeset/ports/327895

Log:
  - Fix PKGDB_FIX option
  - Improvements to pkgng patch
  
  PR:	ports/182268
  Submitted by:	Ken DEGUCHI <kdeguchi at sz.tokoha-u.ac.jp> (maintainer)

Modified:
  head/ports-mgmt/pkg_replace/Makefile
  head/ports-mgmt/pkg_replace/files/patch-pkg_replace_pkgng

Modified: head/ports-mgmt/pkg_replace/Makefile
==============================================================================
--- head/ports-mgmt/pkg_replace/Makefile	Sun Sep 22 20:14:42 2013	(r327894)
+++ head/ports-mgmt/pkg_replace/Makefile	Sun Sep 22 20:25:06 2013	(r327895)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pkg_replace
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=portutil/22116
@@ -23,6 +23,8 @@ 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_SUB=	yes

Modified: head/ports-mgmt/pkg_replace/files/patch-pkg_replace_pkgng
==============================================================================
--- head/ports-mgmt/pkg_replace/files/patch-pkg_replace_pkgng	Sun Sep 22 20:14:42 2013	(r327894)
+++ head/ports-mgmt/pkg_replace/files/patch-pkg_replace_pkgng	Sun Sep 22 20:25:06 2013	(r327895)
@@ -1,5 +1,5 @@
 --- sbin/pkg_replace/pkg_replace.sh.orig	2007-01-25 21:55:46.000000000 +0900
-+++ sbin/pkg_replace/pkg_replace.sh	2013-05-31 04:13:29.000000000 +0900
++++ sbin/pkg_replace/pkg_replace.sh	2013-09-03 06:58:43.000000000 +0900
 @@ -125,14 +125,27 @@
  	: ${PACKAGEROOT="ftp://ftp.NetBSD.org"}
  	: ${PKG_SUFX=".tgz"}
@@ -184,6 +184,15 @@
  			pkg_depends '_deps' "${_arg}"
  
  			for p in ${_deps}; do
+@@ -715,7 +783,7 @@
+ 	if empty ${_log}; then
+ 		try "$@" || return $?
+ 	else
+-		_cookie="${tmpdir}/.$1_failed"
++		_cookie="${tmpdir}/.${1##*/}_failed"
+ 
+ 		{ try "$@" || echo $? > "${_cookie}"; } | tee -a "${_log}" ||
+ 			warn "tee(1) failed."
 @@ -757,9 +825,11 @@
  	info "Installing '$1'"
  
@@ -292,7 +301,7 @@
  update_dependencies() {
 +	if is_yes ${use_pkgng}; then
 +		info "Updating the dependencies"
-+		${PKG_SET} -y -o $1:$2 || return 1
++		[ "x$1" = "x$2" ] && return 0 || ${PKG_SET} -y -o $1:$2
 +		info "	$1 -> $2"
 +	else
  	local p req_by