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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to