diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2012-10-20 19:26:34 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2012-10-20 19:26:34 +0000 |
| commit | fc79661a53f871f01ade5fc43c58934a91ba523f (patch) | |
| tree | 735c1e15f68824e4dca5916e90cb9eff38b124cf /ports-mgmt | |
| parent | ce7f111d8bdcdc34c68fc8afdcc2ce0c857ef6d3 (diff) | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 8 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/extra-patch-files::zsh-completions | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 8354c28a7713..d7d21b1c5490 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -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/portmaster.rc.sample 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> diff --git a/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions b/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions index 49051fe3dcdb..d7cc34157c70 100644 --- a/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions +++ b/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions @@ -7,7 +7,7 @@ diff -u files/zsh-completions.orig files/zsh-completions 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/zsh-completions 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)) |