Updated pkgtools/pkg_chk to 2.0.1

ensure OS and arch tags are set in the binary package case as well as source
set x11 for R7 as ell as R6

1 files changed, 15 insertions, 9 deletions

diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh
index b02deed1c78..6774761e357 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.65 2009/07/22 21:56:13 sketch Exp $
+# $Id: pkg_chk.sh,v 1.66 2012/05/13 13:43:59 abs Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Make -g list user-installed packages first, followed by commented
@@ -369,14 +369,8 @@ pkgdir2pkgname()
     done
     }
 
-pkgdirs_from_conf()
+determine_tags()
     {
-    CONF=$1; shift
-    LIST="$*"
-    if [ ! -r $CONF ];then
-	fatal "Unable to read PKGCHK_CONF '$CONF'"
-    fi
-
     # Determine list of tags
     #
     if [ "$PKGSRCDIR" = NONE ]; then
@@ -388,7 +382,7 @@ pkgdirs_from_conf()
     fi
 
     TAGS="$(hostname | ${SED} -e 's,\..*,,'),$(hostname),$OPSYS-$OS_VERSION-$MACHINE_ARCH,$OPSYS-$OS_VERSION,$OPSYS-$MACHINE_ARCH,$OPSYS,$OS_VERSION,$MACHINE_ARCH"
-    if [ -f /usr/X11R6/lib/libX11.so -o -f /usr/X11R6/lib/libX11.a ];then
+    if [ -f /usr/X11R7/lib/libX11.a -o -f /usr/X11R6/lib/libX11.a ];then
 	TAGS="$TAGS,x11"
     fi
     if [ -n "$PKGCHK_TAGS" ];then
@@ -418,6 +412,16 @@ pkgdirs_from_conf()
 	fi
     fi
     verbose "set   TAGS=$opt_D"
+    }
+
+pkgdirs_from_conf()
+    {
+    CONF=$1; shift
+    LIST="$*"
+    if [ ! -r $CONF ];then
+	fatal "Unable to read PKGCHK_CONF '$CONF'"
+    fi
+
 
     # Extract list of valid pkgdirs (skip any 'alreadyset' in $LIST)
     #
@@ -848,6 +852,8 @@ if [ -n "$opt_b" -a -z "$opt_s" ] ; then
     esac
 fi
 
+determine_tags
+
 if [ -n "$opt_g" ]; then
     verbose "Write $PKGCHK_CONF based on installed packages"
     generate_conf_from_installed $PKGCHK_CONF