Date: Sat, 20 Oct 2012 19:26:34 +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: r306210 - in head/ports-mgmt/portmaster: . files Message-ID: <201210201926.q9KJQY8N093130@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Oct 20 19:26:34 2012 New Revision: 306210 URL: http://svn.freebsd.org/changeset/ports/306210 Log: - Update ZSH completions to work on CURRENT with pkgng [1] - Don't depend on ports-mgmt/pkg on 7.x with PKGNGPATCH option Submitted by: ume [1] Feature safe: yes Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Sat Oct 20 19:19:07 2012 (r306209) +++ head/ports-mgmt/portmaster/Makefile Sat Oct 20 19:26:34 2012 (r306210) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ports-mgmt MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/portmaster/ @@ -30,10 +30,12 @@ PLIST_FILES= sbin/portmaster etc/portmas MAN8= portmaster.8 -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MPKGNGPATCH} +. if ${OSVERSION} >= 800505 RUN_DEPENDS+= pkg>0:${PORTSDIR}/ports-mgmt/pkg +. endif PATCH_SITES+= http://mirror.shatow.net/freebsd/portmaster/ PATCHFILES+= patch-portmaster-pkgng.gz EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::with_pkgng_current @@ -79,4 +81,4 @@ post-install: ${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions ============================================================================== --- head/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions Sat Oct 20 19:19:07 2012 (r306209) +++ head/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions Sat Oct 20 19:26:34 2012 (r306210) @@ -7,7 +7,7 @@ diff -u files/zsh-completions.orig files case "$state" in pkgs) - array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t)) -+ if [ -n "$(make -V WITH_PKGNG)" ]; then ++ if [ -n "$(make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG)" ]; then + array=($(pkg info -aq)) + else + array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t)) @@ -20,7 +20,7 @@ diff -u files/zsh-completions.orig files while _tags; do if _requested packages; then - array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t)) -+ if [ -n "$(make -V WITH_PKGNG)" ]; then ++ if [ -n "$(make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG)" ]; then + array=($(pkg info -aq)) + else + array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210201926.q9KJQY8N093130>