From 7121e12a1ca68b829d3c0d8e577e82085206cacf Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Wed, 27 Nov 2013 12:56:11 -0500 Subject: [PATCH] Fix a bug building PBIs from pkgng, when doing before/after ports, use pkg rquery to see if it exists instead of checking /usr/ports --- src-sh/pbi-manager10/pbi-manager | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src-sh/pbi-manager10/pbi-manager b/src-sh/pbi-manager10/pbi-manager index 073f089c2..00a73d525 100755 --- a/src-sh/pbi-manager10/pbi-manager +++ b/src-sh/pbi-manager10/pbi-manager @@ -5233,6 +5233,15 @@ start_pbi_mkportbefore() for port in ${PBI_MKPORTBEFORE} do + if [ -n "$PBI_PKGNGBUILD" ] ; then + pkg-static rquery '%v' ${port} >/dev/null 2>/dev/null + if [ $? -ne 0 ] ; then + exit_err "No package exists for: ${port}" + fi + do_port_build "${port}" + continue + fi + if [ ! -d "/usr/ports/${port}" ] ; then exit_err "/usr/ports/${port} does not exist!" fi @@ -5248,6 +5257,16 @@ start_pbi_mkportafter() for port in ${PBI_MKPORTAFTER} do + if [ -n "$PBI_PKGNGBUILD" ] ; then + pkg-static rquery '%v' ${port} >/dev/null 2>/dev/null + if [ $? -ne 0 ] ; then + exit_err "No package exists for: ${port}" + fi + do_port_build "${port}" + continue + fi + + # Doing a regular port build if [ ! -d "/usr/ports/${port}" ] ; then exit_err "/usr/ports/${port} does not exist!" fi