From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 27 08:25:38 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AF8F71065670;
	Fri, 27 Jul 2012 08:25:38 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B07B8FC1A;
	Fri, 27 Jul 2012 08:25:38 +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 q6R8PcPc082720;
	Fri, 27 Jul 2012 08:25:38 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6R8PcC4082718;
	Fri, 27 Jul 2012 08:25:38 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201207270825.q6R8PcC4082718@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 27 Jul 2012 08:25:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238826 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2012 08:25:38 -0000

Author: linimon (doc,ports committer)
Date: Fri Jul 27 08:25:37 2012
New Revision: 238826
URL: http://svn.freebsd.org/changeset/base/238826

Log:
  Allow PKGNG line to be commented out in make.conf, and check its value as well.

Modified:
  projects/portbuild/scripts/buildscript

Modified: projects/portbuild/scripts/buildscript
==============================================================================
--- projects/portbuild/scripts/buildscript	Fri Jul 27 08:24:12 2012	(r238825)
+++ projects/portbuild/scripts/buildscript	Fri Jul 27 08:25:37 2012	(r238826)
@@ -166,7 +166,7 @@ pkg_sufx=${PKG_SUFX}
 # Use pkgng if available.
 #if [ -x /usr/sbin/pkg ]; then
 use_pkgng="no"
-grep -q WITH_PKGNG /etc/make.conf && use_pkgng="yes"
+grep "^WITH_PKGNG[      ]*=" make.conf.* | sed -e "s/.*=//;s/ //"  | grep "[Yy][Ee][Ss]$" && use_pkgng="yes"
 
 # Keep restricted distfiles in a subdirectory for extra protection
 # against leakage