Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Oct 2012 19:06:13 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
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
Message-ID:  <201210291906.q9TJ6DWP025452@svn.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
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 <jhein@symmetricom.com>
  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 <jhein@symmetricom.com>
+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}:"
+ 



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201210291906.q9TJ6DWP025452>