Changeset b5c75655


Ignore:
Timestamp:
10/03/13 09:43:33 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b
Parents:
d4a3b4c (diff), e7b4478 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge pull request #4 from williambr/feature/portsdepends

Use ports subsystem to gather PBI depends

File:
1 edited

Legend:

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

    r08c4fcf re7b4478  
    49564956        if [ "${PBI_PRUNEBUILDPORTS}" = "NO" ] ; then return ; fi 
    49574957 
    4958         local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
    4959  
    49604958        get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}" 
    49614959        echo "${PKGNAME}" > /.keepports 
    4962         grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     4960        make -C "${PORTSDIR}/${PBI_MAKEPORT}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports 
    49634961 
    49644962        # Do the same for any OTHERPORTS 
     
    49684966                get_pkgname "${PORTSDIR}/${port}" 
    49694967                echo "${PKGNAME}" >> /.keepports 
    4970                 grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     4968                make -C "${PORTSDIR}/${port}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports 
    49714969        done 
    49724970 
     
    49764974                get_pkgname "${PORTSDIR}/${port}" 
    49774975                echo "${PKGNAME}" >> /.keepports 
    4978                 grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     4976                make -C "${PORTSDIR}/${port}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports 
    49794977        done 
    49804978         
     
    73477345  local _lPort="$1" 
    73487346 
    7349   local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
    7350   if [ ! -e "$iFile" ] ; then 
    7351      echo "Creating $iFile " 
    7352      make -C ${PORTSDIR} index 
    7353   fi 
    7354  
    73557347  echo "Checking port: $_lPort" 
    73567348 
     
    73747366  fi 
    73757367 
    7376   # Parse the pkg deps  
    7377   for cPkg in `grep "^${pkgName}|" $iFile | cut -d '|' -f 8-9 | sed 's/|/ /g'` 
     7368  # Parse the pkg deps 
     7369  for _port in `make -C $_lPort PORTSDIR=${PORTSDIR} all-depends-list|sed 's,^${PORTSDIR}/,,g'` 
    73787370  do 
    7379     if [ -z "$cPkg" ] ; then continue ; fi 
     7371    if [ -z "${_port}" ] ; then continue ; fi 
    73807372 
    73817373    # is this installed? 
    73827374    if [ $PKGNG -eq 1 ] ; then 
    7383         pkg info -e ${cPkg} 
     7375        pkg info -e ${_port} 
    73847376        if [ $? -eq 0 ] ; then continue ; fi 
    73857377    else 
    7386         if [ -e "/var/db/pkg/${cPkg}" ] ; then continue ; fi 
     7378        if [ -e "/var/db/pkg/`make -V PKGNAME -C ${_port} PORTSDIR=${PORTSDIR}`" ] ; then continue ; fi 
    73877379    fi 
    7388  
    7389     local _port=`grep "^${cPkg}|" $iFile | cut -d '|' -f 2` 
    73907380 
    73917381    # Not installed, do this one now until we drill down to the base 
Note: See TracChangeset for help on using the changeset viewer.