Modify the show-depends-pkgpaths implementation so that we don't assume

package directories specified in DEPENDS lines begin with "../..".  The
new standalone script pkgsrc/mk/scripts/pkg_path will canonicalize them
into package paths relative to ${PKGSRCDIR}.

2 files changed, 98 insertions, 8 deletions

diff --git a/mk/bsd.utils.mk b/mk/bsd.utils.mk
index de843e3d326..45430b9a2b5 100644
--- a/mk/bsd.utils.mk
+++ b/mk/bsd.utils.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.utils.mk,v 1.2 2006/01/18 03:58:19 jlam Exp $
+# $NetBSD: bsd.utils.mk,v 1.3 2006/01/18 18:03:08 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines utility
 # and otherwise miscellaneous variables and targets.
@@ -10,20 +10,24 @@
 #
 DEPENDS_TYPE?=  all
 .if !empty(DEPENDS_TYPE:Mbuild) || !empty(DEPENDS_TYPE:Mall)
-_ALL_DEPENDS_PKGPATHS+=	\
-	${BUILD_DEPENDS:C/^[^:]*://:S/^..\/..\///:S/${PKGSRCDIR}\///}
+_ALL_DEPENDS_PKGSRCDIRS+=	${BUILD_DEPENDS:C/^[^:]*://}
 .endif
 .if !empty(DEPENDS_TYPE:Minstall) || !empty(DEPENDS_TYPE:Mpackage) || \
     !empty(DEPENDS_TYPE:Mall)
-_ALL_DEPENDS_PKGPATHS+=	\
-	${DEPENDS:C/^[^:]*://:S/^..\/..\///:S/${PKGSRCDIR}\///}
+_ALL_DEPENDS_PKGSRCDIRS+=	${DEPENDS:C/^[^:]*://}
 .endif
 
+# _PKG_PATHS_CMD canonicalizes package paths so that they're relative to
+# ${PKGSRCDIR} and also verifies that they exist within pkgsrc.
+#
+_PKG_PATHS_CMD=								\
+	${SETENV} ECHO=${TOOLS_ECHO:Q} PKGSRCDIR=${PKGSRCDIR:Q}		\
+		PWD_CMD=${TOOLS_PWD_CMD:Q} TEST=${TOOLS_TEST:Q}		\
+	${SH} ${.CURDIR}/../../mk/scripts/pkg_path
+
 .PHONY: show-depends-pkgpaths
 show-depends-pkgpaths:
-.for _deppath_ in ${_ALL_DEPENDS_PKGPATHS:O:u}
-	@${ECHO} ${_deppath_}
-.endfor
+	@${_PKG_PATHS_CMD} ${_ALL_DEPENDS_PKGSRCDIRS:O:u}
 
 # _DEPENDS_WALK_CMD holds the command (sans arguments) to walk the
 # dependency graph for a package.
diff --git a/mk/scripts/pkg_path b/mk/scripts/pkg_path
new file mode 100755
index 00000000000..efe7d7475da
--- /dev/null
+++ b/mk/scripts/pkg_path
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# $NetBSD: pkg_path,v 1.1 2006/01/18 18:03:08 jlam Exp $
+#
+# Copyright (c) 2006 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+######################################################################
+#
+# NAME
+#	pkg_path -- canonicalize directories into "package paths"
+#
+# SYNOPSIS
+#	pkg_path dir ...
+#
+# DESCRIPTION
+#	pkg_path canonicalizes the specified directories into package
+#	paths are are relative to the pkgsrc directory tree, and prints
+#	each of them to standard output on a new line.  Directories
+#	that are not valid package directories or are not found are
+#	skipped during processing.
+#
+# ENVIRONMENT
+#	PKGSRCDIR	This is the location of the pkgsrc directory tree,
+#			which defaults to "/usr/pkgsrc".
+#
+######################################################################
+
+: ${ECHO=echo}
+: ${PKGSRCDIR="/usr/pkgsrc"}
+: ${PWD_CMD="pwd -P"}
+: ${TEST=test}
+
+self="${0##*/}"
+
+startdir=`${PWD_CMD}`
+while ${TEST} $# -gt 0; do
+	dir="$1"; shift
+	case $dir in
+	${PKGSRCDIR}/*)	;;
+	/*)	 ${ECHO} 1>&2 "$self: \`\`$dir'' not a valid package directory"
+		continue
+		;;
+	esac
+	if ${TEST} ! -d "$startdir/$dir"; then
+		${ECHO} 1>&2 "$self: \`\`$dir'' not found"
+		continue
+	fi
+	pkgpath=`cd $startdir/$dir && ${PWD_CMD}`
+	pkgpath="${pkgpath#${PKGSRCDIR}/}"
+	${ECHO} "$pkgpath"
+done
+
+exit 0