From owner-svn-ports-all@FreeBSD.ORG Sun Sep 22 20:25:07 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7B381980; Sun, 22 Sep 2013 20:25:07 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CC962484; Sun, 22 Sep 2013 20:25:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8MKP73V053760; Sun, 22 Sep 2013 20:25:07 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8MKP6qt053754; Sun, 22 Sep 2013 20:25:06 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201309222025.r8MKP6qt053754@svn.freebsd.org> From: Alex Kozlov Date: Sun, 22 Sep 2013 20:25:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327895 - in head/ports-mgmt/pkg_replace: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2013 20:25:07 -0000 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 (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