diff options
| author | abs <abs@pkgsrc.org> | 2009-02-21 20:50:06 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2009-02-21 20:50:06 +0000 |
| commit | b89024d7cfc2f6bb9c1463f5d432ec54664c4ea3 (patch) | |
| tree | 91dd8214add870c3e1e76d7abcaa01ace79c993e /pkgtools/pkg_chk | |
| parent | 25cb3afbed0b32f5d809859989892772e1ca1589 (diff) | |
| download | pkgsrc-b89024d7cfc2f6bb9c1463f5d432ec54664c4ea3.tar.gz | |
Updated pkgtools/pkg_chk to 1.97
Fix PR 36641 - pkg_chk -g requires pkgsrc source tree, from Aleksey Cheusov.
Diffstat (limited to 'pkgtools/pkg_chk')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 46 |
2 files changed, 25 insertions, 25 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index b45dee46e5b..5bd4250b3e3 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.69 2008/12/20 09:50:59 abs Exp $ +# $NetBSD: Makefile,v 1.70 2009/02/21 20:50:06 abs Exp $ -DISTNAME= pkg_chk-1.96 +DISTNAME= pkg_chk-1.97 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 3928b3978fa..6f79fd0460e 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.61 2008/12/20 09:50:59 abs Exp $ +# $Id: pkg_chk.sh,v 1.62 2009/02/21 20:50:06 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Make -g list user-installed packages first, followed by commented @@ -172,30 +172,30 @@ extract_variables() fi done fi - if [ ! -d "$PKGSRCDIR" -a \( -z "$opt_b" -o -n "$opt_s" \) ] ; then - fatal "Unable to locate PKGSRCDIR (${PKGSRCDIR:-not set})" - fi - - # Now we have PKGSRCDIR, use it to determine PACKAGES, and PKGCHK_CONF - # as well as AWK, GREP, SED, PKGCHK_TAGS and PKGCHK_NOTAGS - # - if [ -n "$opt_g" ]; then - : - elif [ -z "$opt_b" -o -n "$opt_s" -o -d $PKGSRCDIR/pkgtools/pkg_chk ] ; then - cd $PKGSRCDIR/pkgtools/pkg_chk - extract_make_vars Makefile \ - AWK GREP GZIP_CMD ID PACKAGES PKGCHK_CONF PKGCHK_NOTAGS \ - PKGCHK_TAGS PKGCHK_UPDATE_CONF PKG_ADD PKG_DBDIR PKG_DELETE \ - PKG_ADMIN PKG_INFO PKG_SUFX SED SORT SU_CMD TSORT - if [ -z "$PACKAGES" ];then - PACKAGES=$PKGSRCDIR/packages + if [ -z "$opt_g" ]; then + # Now we have PKGSRCDIR, use it to determine PACKAGES, and PKGCHK_CONF + # as well as AWK, GREP, SED, PKGCHK_TAGS and PKGCHK_NOTAGS + # + if [ ! -d "$PKGSRCDIR" -a \( -z "$opt_b" -o -n "$opt_s" \) ] ; then + fatal "Unable to locate PKGSRCDIR (${PKGSRCDIR:-not set})" fi - elif [ $MAKECONF != /dev/null ] ; then - extract_make_vars $MAKECONF PACKAGES PKGCHK_CONF PKGCHK_UPDATE_CONF \ - PKGCHK_TAGS PKGCHK_NOTAGS PKG_SUFX - if [ -z "$PACKAGES" ] ; then - PACKAGES=`pwd` + if [ -z "$opt_b" -o -n "$opt_s" -o -d $PKGSRCDIR/pkgtools/pkg_chk ] ; + then + cd $PKGSRCDIR/pkgtools/pkg_chk + extract_make_vars Makefile \ + AWK GREP GZIP_CMD ID PACKAGES PKGCHK_CONF PKGCHK_NOTAGS \ + PKGCHK_TAGS PKGCHK_UPDATE_CONF PKG_ADD PKG_DBDIR \ + PKG_DELETE PKG_ADMIN PKG_INFO PKG_SUFX SED SORT SU_CMD TSORT + if [ -z "$PACKAGES" ];then + PACKAGES=$PKGSRCDIR/packages + fi + elif [ $MAKECONF != /dev/null ] ; then + extract_make_vars $MAKECONF PACKAGES PKGCHK_CONF \ + PKGCHK_UPDATE_CONF PKGCHK_TAGS PKGCHK_NOTAGS PKG_SUFX + if [ -z "$PACKAGES" ] ; then + PACKAGES=`pwd` + fi fi fi |