From owner-svn-ports-all@FreeBSD.ORG Mon Oct 29 19:06:14 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 365896C1; Mon, 29 Oct 2012 19:06:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 039718FC08; Mon, 29 Oct 2012 19:06:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9TJ6DDf025455; Mon, 29 Oct 2012 19:06:13 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9TJ6DWP025452; Mon, 29 Oct 2012 19:06:13 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201210291906.q9TJ6DWP025452@svn.freebsd.org> From: Bryan Drewery Date: Mon, 29 Oct 2012 19:06:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306629 - in head/ports-mgmt/portmaster: . 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: Mon, 29 Oct 2012 19:06:14 -0000 Author: bdrewery Date: Mon Oct 29 19:06:13 2012 New Revision: 306629 URL: http://svn.freebsd.org/changeset/ports/306629 Log: - Fix PKGNG patch trying to call pkg(8) when not actually using pkgng due to improper short-circuit logic Submitted by: John Hein Feature safe: yes Added: head/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss (contents, props changed) Modified: head/ports-mgmt/portmaster/Makefile Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Mon Oct 29 19:04:44 2012 (r306628) +++ head/ports-mgmt/portmaster/Makefile Mon Oct 29 19:06:13 2012 (r306629) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.14 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= ports-mgmt MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/portmaster/ @@ -39,6 +39,7 @@ RUN_DEPENDS+= pkg>0:${PORTSDIR}/ports-mg PATCH_SITES+= http://mirror.shatow.net/freebsd/portmaster/ PATCHFILES+= patch-portmaster-pkgng.gz EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::with_pkgng_current +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::pkg_install-pkgng-ss . if ${PORT_OPTIONS:MZSH} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::zsh-completions . endif Added: head/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss Mon Oct 29 19:06:13 2012 (r306629) @@ -0,0 +1,19 @@ +commit 8d713d8a417e6d4540f3f826870f670fc503df83 +Author: John Hein +Date: Sun Oct 28 14:48:33 2012 -0600 + + Fix short-circuit logic for pkg_install to not call pkg(8) + +diff --git portmaster portmaster +index 3abb942..ff06955 100755 +--- portmaster ++++ portmaster +@@ -4304,7 +4304,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then + fi + + INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n" +-[ -z "$use_pkgng" -a -e "$pdb/$new_port/+DISPLAY" -o -n "$use_pkgng" -a -n "`pkg query "%M" $new_port`" ] && ++[ -z "$use_pkgng" -a -e "$pdb/$new_port/+DISPLAY" ] || ( [ -n "$use_pkgng" ] && [ -n "`pkg query %M $new_port`" ] ) && + DISPLAY_LIST="${DISPLAY_LIST}$new_port " + CUR_DEPS="${CUR_DEPS}${new_port}:${portdir}:" +