svn commit: r238826 - projects/portbuild/scripts

[Mark Linimon]

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