diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2012-10-19 00:02:29 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2012-10-19 00:02:29 +0800 |
| commit | 2d427836efba9d32b1bf35fe78baa86dd385c229 (patch) | |
| tree | 5b722fb6d0a8137858761e710ddad7fe5b1d0c23 | |
| parent | a17b593db7953eed98469cfbaaf2144e7f55f2f4 (diff) | |
| download | freebsd-ports-gnome-2d427836efba9d32b1bf35fe78baa86dd385c229.tar.gz freebsd-ports-gnome-2d427836efba9d32b1bf35fe78baa86dd385c229.tar.zst freebsd-ports-gnome-2d427836efba9d32b1bf35fe78baa86dd385c229.zip | |
- Fix WITH_PKGNG detection on CURRENT, as it may
not be defined in /etc/make.conf.
Submitted by: dim
Feature safe: yes
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current | 13 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/pkg-descr | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 67524fa89eb3..8354c28a7713 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.14 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ports-mgmt MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/portmaster/ @@ -36,6 +36,7 @@ MAN8= portmaster.8 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 . if ${PORT_OPTIONS:MZSH} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::zsh-completions . endif diff --git a/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current b/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current new file mode 100644 index 000000000000..3f0c39052d37 --- /dev/null +++ b/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current @@ -0,0 +1,13 @@ +diff --git a/portmaster b/portmaster +index ee95f41..3abb942 100755 +--- portmaster ++++ portmaster +@@ -385,7 +385,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then + [ -n "$port_dbdir" ] && export port_dbdir + + # Detect if pkgng is being used +- use_pkgng="`pm_make_b -V WITH_PKGNG`" ++ use_pkgng=`pm_make_b -f/usr/share/mk/bsd.port.mk -V WITH_PKGNG 2>/dev/null` + [ -n "$use_pkgng" ] && export use_pkgng + fi + diff --git a/ports-mgmt/portmaster/pkg-descr b/ports-mgmt/portmaster/pkg-descr index ce7fe6adf609..5f2e632f5add 100644 --- a/ports-mgmt/portmaster/pkg-descr +++ b/ports-mgmt/portmaster/pkg-descr @@ -19,4 +19,4 @@ Portmaster has the following features: * Packages can be used for installation either exclusively, if available, or only for build dependencies -WWW: http://www.github.com/portmaster/portmaster +WWW: http://portmaster.github.com |