Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Oct 2012 16:02:30 +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: r306077 - in head/ports-mgmt/portmaster: . files
Message-ID:  <201210181602.q9IG2U8K072568@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Thu Oct 18 16:02:29 2012
New Revision: 306077
URL: http://svn.freebsd.org/changeset/ports/306077

Log:
  - Fix WITH_PKGNG detection on CURRENT, as it may
    not be defined in /etc/make.conf.
  
  Submitted by:	dim
  Feature safe:	yes

Added:
  head/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current   (contents, props changed)
Modified:
  head/ports-mgmt/portmaster/Makefile
  head/ports-mgmt/portmaster/pkg-descr

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Thu Oct 18 15:29:09 2012	(r306076)
+++ head/ports-mgmt/portmaster/Makefile	Thu Oct 18 16:02:29 2012	(r306077)
@@ -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

Added: head/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current	Thu Oct 18 16:02:29 2012	(r306077)
@@ -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
+ 

Modified: head/ports-mgmt/portmaster/pkg-descr
==============================================================================
--- head/ports-mgmt/portmaster/pkg-descr	Thu Oct 18 15:29:09 2012	(r306076)
+++ head/ports-mgmt/portmaster/pkg-descr	Thu Oct 18 16:02:29 2012	(r306077)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210181602.q9IG2U8K072568>