From b10b0e580d262e351c16a057b098994f151b609a Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Mon, 24 Dec 2001 14:15:56 +0000
Subject: Updated pkgchk to 1.21     Implement '-C conf' for specifying
 alternate config file

---
 pkgtools/pkgchk/Makefile        | 4 ++--
 pkgtools/pkgchk/files/pkgchk.8  | 5 ++++-
 pkgtools/pkgchk/files/pkgchk.sh | 9 +++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile
index 9f141f56066..cd261fe4e79 100644
--- a/pkgtools/pkgchk/Makefile
+++ b/pkgtools/pkgchk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2001/11/28 11:39:44 abs Exp $
+# $NetBSD: Makefile,v 1.22 2001/12/24 14:15:56 abs Exp $
 
-DISTNAME=	pkgchk-1.20
+DISTNAME=	pkgchk-1.21
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkgchk/files/pkgchk.8 b/pkgtools/pkgchk/files/pkgchk.8
index 2ce1c2311ac..9905fd52712 100644
--- a/pkgtools/pkgchk/files/pkgchk.8
+++ b/pkgtools/pkgchk/files/pkgchk.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkgchk.8,v 1.9 2001/12/03 19:03:22 wiz Exp $
+.\"	$NetBSD: pkgchk.8,v 1.10 2001/12/24 14:15:56 abs Exp $
 .\"
 .\" Copyright (c) 2001 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -11,6 +11,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl abchiknrsuvB
+.Op Fl C Ar conf
 .Op Fl D Ar tags
 .Op Fl U Ar tags
 .Sh DESCRIPTION
@@ -29,6 +30,8 @@ will skip dependent packages to reduce unnecessary rebuilding.
 .Bl -tag -width xxxxxxxx
 .It Fl B
 Check the "Build version" (see option -b of pkg_info(1)) of packages.
+.It Fl C Ar conf
+USe the pkgchk.conf file 'conf'.
 .It Fl D Ar tags
 Add the comma separated list of tags to those checked when parsing
 pkgchk.conf. Also includes
diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh
index c8b0af58f7c..f70ffa71564 100755
--- a/pkgtools/pkgchk/files/pkgchk.sh
+++ b/pkgtools/pkgchk/files/pkgchk.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# $Id: pkgchk.sh,v 1.23 2001/11/28 11:39:44 abs Exp $
+# $Id: pkgchk.sh,v 1.24 2001/12/24 14:15:56 abs Exp $
 #
 # TODO: Handle updates with dependencies via binary packages
 
@@ -197,7 +197,7 @@ run_cmd()
     fi
     }
 
-args=`getopt BD:U:abchiknrsuv $*`
+args=`getopt BC:D:U:abchiknrsuv $*`
 if [ $? != 0 ]; then
     opt_h=1
 fi
@@ -205,6 +205,7 @@ set -- $args
 while [ $# != 0 ]; do
     case "$1" in
 	-B )    opt_B=1 ; opt_i=1 ;;
+	-C )	opt_C="$2" ; shift;;
 	-D )	opt_D="$2" ; shift;;
 	-U )	opt_U="$2" ; shift;;
 	-a )	opt_a=1 ; opt_c=1 ;;
@@ -236,6 +237,7 @@ fi
 if [ -n "$opt_h" -o $# != 1 ];then
     echo 'Usage: pkg_chk [opts]
 	-B      Check the "Build version" of packages (implies -i)
+	-C conf Use pkgchk.conf file 'conf'
 	-D tags Comma separated list of additional pkgchk.conf tags to set
 	-U tags Comma separated list of pkgchk.conf tags to unset
 	-a      Add all missing packages (implies -c)
@@ -274,6 +276,9 @@ else
 fi
 
 extract_variables
+if [ -n "$opt_C" ] ; then
+    PKGCHK_CONF=$opt_C
+fi
 
 cd $PKGSRCDIR
 real_pkgsrcdir=`pwd`
-- 
cgit v1.2.3