summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2006-02-18 21:34:03 +0000
committerabs <abs@pkgsrc.org>2006-02-18 21:34:03 +0000
commitf49371f511d90a40cb54bd36e53e5c75293a6879 (patch)
tree9727798938a68132e32342c9d993679492b51cdc /pkgtools
parent94cbd3d20ddc09c216e4c0617e51698bcae3850c (diff)
downloadpkgsrc-f49371f511d90a40cb54bd36e53e5c75293a6879.tar.gz
Update pkg_chk to 1.69
- Deprecate -i -and -c (recommend -u -n and -a -n respectively
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_chk/Makefile4
-rw-r--r--pkgtools/pkg_chk/files/pkg_chk.826
-rwxr-xr-xpkgtools/pkg_chk/files/pkg_chk.sh32
3 files changed, 37 insertions, 25 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index f13978b457b..cd5443c2578 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2006/02/18 20:46:42 abs Exp $
+# $NetBSD: Makefile,v 1.28 2006/02/18 21:34:03 abs Exp $
-DISTNAME= pkg_chk-1.68
+DISTNAME= pkg_chk-1.69
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_chk/files/pkg_chk.8 b/pkgtools/pkg_chk/files/pkg_chk.8
index a39fa7e4b35..114dffe9e96 100644
--- a/pkgtools/pkg_chk/files/pkg_chk.8
+++ b/pkgtools/pkg_chk/files/pkg_chk.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_chk.8,v 1.15 2005/12/12 14:03:20 wiz Exp $
+.\" $NetBSD: pkg_chk.8,v 1.16 2006/02/18 21:34:03 abs Exp $
.\"
.\" Copyright (c) 2001 by David Brownlee (abs@NetBSD.org)
.\" Absolutely no warranty.
@@ -57,9 +57,7 @@ Use the
.Pa pkgchk.conf
file
.Sq Ar conf .
-.It Fl c
-Check versions of packages specified in
-.Pa pkgchk.conf .
+
.It Fl D Ar tags
Add the comma separated list of tags to those checked when parsing
.Pa pkgchk.conf .
@@ -82,9 +80,6 @@ Generate an initial
file based upon the packages installed on the host machine.
.It Fl h
Brief help.
-.It Fl i
-Check versions of installed packages, ignoring
-.Pa pkgchk.conf .
.It Fl k
Continue with further packages if errors are encountered.
.It Fl L Ar file
@@ -163,6 +158,23 @@ Verbose - list the tags set when checking
.Pa pkgchk.conf ,
and all packages checked.
.El
+.Ss Deprecated Options
+.Bl -tag -width xxxxxxxx
+.It Fl c
+Check versions of packages specified in
+.Pa pkgchk.conf .
+This is a synomyn for
+.Nm
+.Fl a n ,
+and will be removed in a future version.
+.It Fl i
+Check versions of installed packages, ignoring
+.Pa pkgchk.conf.
+.Nm
+This is a synomyn for
+.Fl u n ,
+and will be removed in a future version.
+.El
.Sh FILE FORMAT
Anything after a
.Sq #
diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index 621483d99b9..37fe0c98d41 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.28 2006/02/18 20:46:42 abs Exp $
+# $Id: pkg_chk.sh,v 1.29 2006/02/18 21:34:03 abs Exp $
#
# TODO: Make -g check dependencies and tsort
# TODO: Variation of -g which only lists top level packages
@@ -589,27 +589,27 @@ fi
set -- $args
while [ $# != 0 ]; do
case "$1" in
- -a ) opt_a=1 ; opt_c=1 ;;
+ -a ) opt_a=1 ;;
-B ) opt_B=1 ;;
-b ) opt_b=1 ;;
- -C ) opt_C="$2" ; shift;;
- -c ) opt_c=1 ;;
- -D ) opt_D="$2" ; shift;;
+ -C ) opt_C="$2" ; shift ;;
+ -c ) opt_a=1 ; opt_n=1 ; echo "-c is deprecated - use -a -n" ;;
+ -D ) opt_D="$2" ; shift ;;
-f ) opt_f=1 ;;
-g ) opt_g=1 ;;
-h ) opt_h=1 ;;
- -i ) opt_i=1 ;;
+ -i ) opt_u=1 ; opt_n=1 ; echo "-i is deprecated - use -u -n" ;;
-k ) opt_k=1 ;;
- -L ) opt_L="$2" ; shift;;
+ -L ) opt_L="$2" ; shift ;;
-l ) opt_l=1 ;;
-N ) opt_N=1 ;;
-n ) opt_n=1 ;;
- -P ) opt_P="$2" ; shift;;
- -r ) opt_r=1 ; opt_i=1 ;;
+ -P ) opt_P="$2" ; shift ;;
+ -r ) opt_r=1 ;;
-S ) opt_S=1 ;;
-s ) opt_s=1 ;;
- -U ) opt_U="$2" ; shift;;
- -u ) opt_u=1 ; opt_i=1 ;;
+ -U ) opt_U="$2" ; shift ;;
+ -u ) opt_u=1 ;;
-v ) opt_v=1 ;;
-- ) shift; break ;;
esac
@@ -620,9 +620,9 @@ if [ -z "$opt_b" -a -z "$opt_s" ];then
opt_b=1; opt_s=1;
fi
-if [ -z "$opt_a" -a -z "$opt_c" -a -z "$opt_g" -a -z "$opt_i" -a -z "$opt_N" -a -z "$opt_l" -a -z "$opt_S" ];
+if [ -z "$opt_a$opt_g$opt_l$opt_r$opt_u$opt_S$opt_N" ];
then
- usage "Must specify at least one of -a, -c, -g, -i, -l, -N, -S, or -u";
+ usage "Must specify at least one of -a, -g, -l, -r, -u -N, or -S";
fi
if [ -n "$opt_h" -o $# != 0 ];then
@@ -725,12 +725,12 @@ if [ -n "$opt_g" ]; then
generate_conf_from_installed $PKGCHK_CONF
fi
-if [ -n "$opt_i" ];then
+if [ -n "$opt_r" -o -n "$opt_u" ];then
verbose "Enumerate PKGDIRLIST from installed packages"
PKGDIRLIST=$(pkgdirs_from_installed)
fi
-if [ -n "$opt_c" -o -n "$opt_l" ];then # Append to PKGDIRLIST based on conf
+if [ -n "$opt_a" -o -n "$opt_l" ];then # Append to PKGDIRLIST based on conf
verbose "Append to PKGDIRLIST based on config $PKGCHK_CONF"
PKGDIRLIST="$(pkgdirs_from_conf $PKGCHK_CONF $PKGDIRLIST)"
fi
@@ -770,7 +770,7 @@ if [ -n "$delete_and_recheck" ]; then
if [ -n "$opt_u" ]; then
PKGDIRLIST="$(pkgdirs_from_conf $PKGCHK_UPDATE_CONF $PKGDIRLIST)"
fi
- if [ -n "$opt_u" -o -n "$opt_a" ]; then
+ if [ -n "$opt_a" -o -n "$opt_u" ]; then
check_packages_installed $PKGDIRLIST # May need to add more
fi
fi