From owner-svn-ports-all@FreeBSD.ORG Thu Oct 18 16:02:30 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B04DA30E; Thu, 18 Oct 2012 16:02:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E3E78FC08; Thu, 18 Oct 2012 16:02:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9IG2Uia072572; Thu, 18 Oct 2012 16:02:30 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9IG2U8K072568; Thu, 18 Oct 2012 16:02:30 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201210181602.q9IG2U8K072568@svn.freebsd.org> From: Bryan Drewery Date: Thu, 18 Oct 2012 16:02:30 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2012 16:02:30 -0000 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