diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2012-10-30 03:06:13 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2012-10-30 03:06:13 +0800 |
| commit | 19523dfafe68f6241aa944cec64069376e7828b5 (patch) | |
| tree | 2230f7b8054aa39e975d2d58d58306233fc5d1ed /ports-mgmt | |
| parent | 99a7424dd96882eee163963b6ba581e0251252d9 (diff) | |
| download | freebsd-ports-gnome-19523dfafe68f6241aa944cec64069376e7828b5.tar.gz freebsd-ports-gnome-19523dfafe68f6241aa944cec64069376e7828b5.tar.zst freebsd-ports-gnome-19523dfafe68f6241aa944cec64069376e7828b5.zip | |
- 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
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index d7d21b1c5490..f834ef1f5ab3 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -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-mgmt/pkg 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 diff --git a/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss b/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss new file mode 100644 index 000000000000..bf0a72e6700d --- /dev/null +++ b/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss @@ -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}:" + |