summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2008-07-05 22:56:40 +0000
committerabs <abs@pkgsrc.org>2008-07-05 22:56:40 +0000
commit630a4e0ce181e1639e2209339952d909ee8c90a8 (patch)
tree4812b023fc1db9b1826500811a81430b037e391a /pkgtools
parent58608772b6050bf5dff955e754e57bd0a64b8c4c (diff)
downloadpkgsrc-630a4e0ce181e1639e2209339952d909ee8c90a8.tar.gz
Update pkg_chk to 1.95:
- Handle pkgsrc in LOCALBASE - fixes PR pkg/32326
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_chk/Makefile5
-rwxr-xr-xpkgtools/pkg_chk/files/pkg_chk.sh5
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index 619f29addd5..dd19739006b 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2008/06/12 13:38:28 abs Exp $
+# $NetBSD: Makefile,v 1.68 2008/07/05 22:56:40 abs Exp $
-DISTNAME= pkg_chk-1.94
-PKGREVISION= 1
+DISTNAME= pkg_chk-1.95
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index 3334bce8180..f3e33ea77fc 100755
--- a/pkgtools/pkg_chk/files/pkg_chk.sh
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh
@@ -1,6 +1,6 @@
#!@SH@ -e
#
-# $Id: pkg_chk.sh,v 1.59 2008/05/26 09:25:43 tron Exp $
+# $Id: pkg_chk.sh,v 1.60 2008/07/05 22:56:40 abs Exp $
#
# TODO: Make -g check dependencies and tsort
# TODO: Make -g list user-installed packages first, followed by commented
@@ -160,8 +160,9 @@ extract_pkg_vars()
extract_variables()
{
extract_mk_var PKGSRCDIR ''
+ extract_mk_var LOCALBASE ''
if [ -z "$PKGSRCDIR" ] ; then
- for dir in . .. ../.. /usr/pkgsrc ; do
+ for dir in $LOCALBASE/pkgsrc /usr/pkgsrc . .. ../.. ; do
if [ -f "${dir}/mk/bsd.pkg.mk" ]; then
case "${dir}" in
/*) PKGSRCDIR="${dir}" ;;