Ignore:
Timestamp:
Oct 3, 2013 9:49:11 AM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
3890273
Parents:
8b37108
Message:

Merge the patch from William into pbi-manager10

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    rb2a8744 r72d26c47  
    49724972        if [ "${PBI_PRUNEBUILDPORTS}" = "NO" ] ; then return ; fi 
    49734973 
    4974         local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
    4975  
    49764974        get_pkgname "${PBI_MAKEPORT}" 
    49774975        echo "${PKGNAME}" > /.keepports 
    4978         grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     4976        make -C "${PORTSDIR}/${PBI_MAKEPORT}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports 
    49794977 
    49804978        # Do the same for any OTHERPORTS 
     
    49844982                get_pkgname "${port}" 
    49854983                echo "${PKGNAME}" >> /.keepports 
    4986                 grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     4984                make -C "${PORTSDIR}/${port}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports 
    49874985        done 
    49884986 
     
    49924990                get_pkgname "${port}" 
    49934991                echo "${PKGNAME}" >> /.keepports 
    4994                 grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     4992                make -C "${PORTSDIR}/${port}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports 
    49954993        done 
    49964994 
     
    73597357  local _lPort="/usr/ports/$1" 
    73607358 
    7361   local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
    7362   if [ ! -e "$iFile" ] ; then 
    7363      echo "Creating $iFile " 
    7364      make -C ${PORTSDIR} index 
    7365   fi 
    7366  
    73677359  echo "Checking port: $_lPort" 
    73687360 
     
    73987390 
    73997391  # Parse the pkg deps  
    7400   for cPkg in `grep "^${pkgName}|" $iFile | cut -d '|' -f 8-9 | sed 's/|/ /g'` 
     7392  for _port in `make -C $_lPort PORTSDIR=${PORTSDIR} all-depends-list|sed 's,^${PORTSDIR}/,,g'` 
    74017393  do 
    7402     if [ -z "$cPkg" ] ; then continue ; fi 
     7394    if [ -z "${_port}" ] ; then continue ; fi 
    74037395 
    74047396    # is this installed? 
    7405     pkg info -e ${cPkg} 
     7397    pkg info -e ${_port} 
    74067398    if [ $? -eq 0 ] ; then continue ; fi 
    7407  
    7408     local _port=`grep "^${cPkg}|" $iFile | cut -d '|' -f 2` 
    74097399 
    74107400    # Not installed, do this one now until we drill down to the base 
Note: See TracChangeset for help on using the changeset viewer.