From owner-svn-src-head@FreeBSD.ORG  Mon Dec  1 22:39:36 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 460CB985;
 Mon,  1 Dec 2014 22:39:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3226C230;
 Mon,  1 Dec 2014 22:39:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1Mdak6001089;
 Mon, 1 Dec 2014 22:39:36 GMT (envelope-from phk@FreeBSD.org)
Received: (from phk@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1MdaOS001088;
 Mon, 1 Dec 2014 22:39:36 GMT (envelope-from phk@FreeBSD.org)
Message-Id: <201412012239.sB1MdaOS001088@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: phk set sender to phk@FreeBSD.org
 using -f
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 1 Dec 2014 22:39:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275384 - head/tools/tools/nanobsd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Dec 2014 22:39:36 -0000

Author: phk
Date: Mon Dec  1 22:39:35 2014
New Revision: 275384
URL: https://svnweb.freebsd.org/changeset/base/275384

Log:
  Make this work with pkgng, and allow PORTS_OPTS to be passed in

Modified:
  head/tools/tools/nanobsd/fill_pkg.sh

Modified: head/tools/tools/nanobsd/fill_pkg.sh
==============================================================================
--- head/tools/tools/nanobsd/fill_pkg.sh	Mon Dec  1 22:37:36 2014	(r275383)
+++ head/tools/tools/nanobsd/fill_pkg.sh	Mon Dec  1 22:39:35 2014	(r275384)
@@ -57,8 +57,8 @@ ports_recurse() (
 		else
 			(
 			cd $d
-			rd=`make -V RUN_DEPENDS`	
-			ld=`make -V LIB_DEPENDS`	
+			rd=`make -V RUN_DEPENDS ${PORTS_OPTS}`
+			ld=`make -V LIB_DEPENDS ${PORTS_OPTS}`
 			
 			for x in $rd $ld
 			do
@@ -84,8 +84,8 @@ done
 for i in `cat $PL`
 do
 	p=`(cd $i && make -V PKGNAME)`
-	if [ -f $NANO_PKG_DUMP/$p.tbz ] ; then
-		ln -s $NANO_PKG_DUMP/$p.tbz $NANO_PACKAGE_DIR
+	if [ -f $NANO_PKG_DUMP/$p.t[bx]z ] ; then
+		ln -s $NANO_PKG_DUMP/$p.t[bx]z $NANO_PACKAGE_DIR
 	else
 		echo "Package $p misssing in $NANO_PKG_DUMP" 1>&2
 		exit 1