diff options
| author | abs <abs@pkgsrc.org> | 2005-09-11 10:39:03 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2005-09-11 10:39:03 +0000 |
| commit | d5e2f7e7ed14bc6a3181d63cce2e399e16628575 (patch) | |
| tree | cb2b2d6281e80b3536792b4110f6176c4d1b256c | |
| parent | 2bdffdfb495774fc7fbc256e8c390d8ea03d3bce (diff) | |
| download | pkgsrc-d5e2f7e7ed14bc6a3181d63cce2e399e16628575.tar.gz | |
update pkgtools/pkg_chk to 1.61.
Accept relative paths for -C and -P - fixes PR/31277 from Tero Kivinen
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 18 |
3 files changed, 18 insertions, 7 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 35df804de0e..ed312282bc8 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.11094 2005/09/10 15:56:33 bouyer Exp $ +$NetBSD: CHANGES,v 1.11095 2005/09/11 10:40:25 abs Exp $ Changes to the packages collection and infrastructure in 2005: @@ -3997,3 +3997,4 @@ Changes to the packages collection and infrastructure in 2005: Updated net/ntp4 to 4.2.0nb7 [adrianp 2005-09-10] Updated textproc/docbook-xsl to 1.69.1nb1 [jmmv 2005-09-10] Updated sysutils/xentools20 to 2.0.7nb2 [bouyer 2005-09-10] + Updated pkgtools/pkg_chk to 1.61 [abs 2005-09-10] diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 60890e64cb6..1a9a9f013c4 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2005/08/04 17:55:51 abs Exp $ +# $NetBSD: Makefile,v 1.19 2005/09/11 10:39:03 abs Exp $ -DISTNAME= pkg_chk-1.60 +DISTNAME= pkg_chk-1.61 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 df90de8e84c..1533376e6e7 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.18 2005/08/04 18:01:37 abs Exp $ +# $Id: pkg_chk.sh,v 1.19 2005/09/11 10:39:03 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -459,7 +459,7 @@ run_cmd() else FAILOK=$opt_k fi - msg $1 + msg $(date +%R) $1 if [ -z "$opt_n" ];then if [ -n "$opt_L" ] ; then sh -c "$1" >> "$opt_L" 2>&1 || FAIL=1 @@ -479,6 +479,15 @@ run_cmd() fi } +set_path() + { + arg=$1 + case $arg in + /*) echo $arg ;; + *) echo $basedir/$arg ;; + esac + } + usage() { if [ -n "$1" ] ; then @@ -612,12 +621,13 @@ if [ -n "$opt_L" ] ; then rm -f $opt_L fi +basedir=$(pwd) extract_variables if [ -n "$opt_C" ] ; then - PKGCHK_CONF="$opt_C" + PKGCHK_CONF="$(set_path $opt_C)" fi if [ -n "$opt_P" ] ; then - PACKAGES="$opt_P" + PACKAGES="$(set_path $opt_P)" fi if [ -d $PACKAGES/All ] ; then PACKAGES="$PACKAGES/All" |