From owner-svn-src-projects@FreeBSD.ORG  Fri Mar  8 15:01:41 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8C047703;
 Fri,  8 Mar 2013 15:01:41 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7DA938F3;
 Fri,  8 Mar 2013 15:01:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r28F1fKr050938;
 Fri, 8 Mar 2013 15:01:41 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r28F1fK3050936;
 Fri, 8 Mar 2013 15:01:41 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303081501.r28F1fK3050936@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 8 Mar 2013 15:01:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248056 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 08 Mar 2013 15:01:41 -0000

Author: bapt
Date: Fri Mar  8 15:01:40 2013
New Revision: 248056
URL: http://svnweb.freebsd.org/changeset/base/248056

Log:
  determine if the build will be a pkgng build or a pkg_install build base on
  bsd.port.mk, not on /etc/make.conf, this allows build to autodetermine that on
  current the default is pkgng
  
  Tested by:	erwin

Modified:
  projects/portbuild/scripts/buildscript
  projects/portbuild/scripts/portbuild

Modified: projects/portbuild/scripts/buildscript
==============================================================================
--- projects/portbuild/scripts/buildscript	Fri Mar  8 13:11:45 2013	(r248055)
+++ projects/portbuild/scripts/buildscript	Fri Mar  8 15:01:40 2013	(r248056)
@@ -180,7 +180,7 @@ pkg_sufx=${PKG_SUFX}
 # Use pkgng if available.
 #if [ -x /usr/sbin/pkg ]; then
 use_pkgng="no"
-grep "^WITH_PKGNG[      ]*=" /etc/make.conf | sed -e "s/.*=//;s/ //"  | grep -q "[Yy][Ee][Ss]$" && use_pkgng="yes"
+make -f /usr/ports/Mk/bsd.port.mk -V WITH_PKGNG | grep -q "[Yy][Ee][Ss]$" && use_pkgng="yes"
 
 # Keep restricted distfiles in a subdirectory for extra protection
 # against leakage

Modified: projects/portbuild/scripts/portbuild
==============================================================================
--- projects/portbuild/scripts/portbuild	Fri Mar  8 13:11:45 2013	(r248055)
+++ projects/portbuild/scripts/portbuild	Fri Mar  8 15:01:40 2013	(r248056)
@@ -260,7 +260,12 @@ mount_fs ${builddir}/src ${chroot}${CLIE
 # set overrides for uname
 buildenv.client ${arch} ${chroot}${CLIENT_SRCBASE}
 
-mount -t devfs foo ${chroot}/dev
+devfspath="null zero random urandom stdin stdout stderr fd fd/*"
+mount -t devfs devfs ${chroot}/dev
+devfs -m ${chroot}/dev rule apply hide
+for p in ${devfspath} ; do
+	devfs -m ${chroot}/dev/ rule apply path "${p}" unhide
+done
 mount -t fdescfs fdesc ${chroot}/dev/fd
 umount -f ${chroot}/compat/linux/proc > /dev/null 2>&1