Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge the patch from William into pbi-manager10

  • Loading branch information...
commit 72d26c47aebefb1b1136b0316254af18ebc9c9b7 1 parent 8b37108
@kmoore134 kmoore134 authored
Showing with 6 additions and 16 deletions.
  1. +6 −16 src-sh/pbi-manager10/pbi-manager
View
22 src-sh/pbi-manager10/pbi-manager
@@ -4971,11 +4971,9 @@ start_pbi_prune_ports()
{
if [ "${PBI_PRUNEBUILDPORTS}" = "NO" ] ; then return ; fi
- local iFile="$PORTSDIR/INDEX-$FBSDMAJOR"
-
get_pkgname "${PBI_MAKEPORT}"
echo "${PKGNAME}" > /.keepports
- grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports
+ make -C "${PORTSDIR}/${PBI_MAKEPORT}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports
# Do the same for any OTHERPORTS
for port in ${PBI_MKPORTBEFORE}
@@ -4983,7 +4981,7 @@ start_pbi_prune_ports()
if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi
get_pkgname "${port}"
echo "${PKGNAME}" >> /.keepports
- grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports
+ make -C "${PORTSDIR}/${port}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports
done
for port in ${PBI_MKPORTAFTER}
@@ -4991,7 +4989,7 @@ start_pbi_prune_ports()
if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi
get_pkgname "${port}"
echo "${PKGNAME}" >> /.keepports
- grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports
+ make -C "${PORTSDIR}/${port}" PORTSDIR=${PORTSDIR} package-depends | cut -d: -f1 >> /.keepports
done
# Don't strip out pkgng
@@ -7358,12 +7356,6 @@ do_port_build()
local _lPortRaw="$1"
local _lPort="/usr/ports/$1"
- local iFile="$PORTSDIR/INDEX-$FBSDMAJOR"
- if [ ! -e "$iFile" ] ; then
- echo "Creating $iFile "
- make -C ${PORTSDIR} index
- fi
-
echo "Checking port: $_lPort"
# Make sure this port isn't already loaded
@@ -7397,16 +7389,14 @@ do_port_build()
fi
# Parse the pkg deps
- for cPkg in `grep "^${pkgName}|" $iFile | cut -d '|' -f 8-9 | sed 's/|/ /g'`
+ for _port in `make -C $_lPort PORTSDIR=${PORTSDIR} all-depends-list|sed 's,^${PORTSDIR}/,,g'`
do
- if [ -z "$cPkg" ] ; then continue ; fi
+ if [ -z "${_port}" ] ; then continue ; fi
# is this installed?
- pkg info -e ${cPkg}
+ pkg info -e ${_port}
if [ $? -eq 0 ] ; then continue ; fi
- local _port=`grep "^${cPkg}|" $iFile | cut -d '|' -f 2`
-
# Not installed, do this one now until we drill down to the base
do_port_build "${_port}" >&1 2>&1
done
Please sign in to comment.
Something went wrong with that request. Please try again.