diff options
| author | abs <abs@pkgsrc.org> | 2012-05-13 13:43:59 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2012-05-13 13:43:59 +0000 |
| commit | aa751e4474a5661c69d0497d956cd25d2d693b2c (patch) | |
| tree | 865050330be083961da433aaa5f6c4bdb6a1a1ac /pkgtools | |
| parent | 1fb6466ec486d967188891d0794d3d95737de013 (diff) | |
| download | pkgsrc-aa751e4474a5661c69d0497d956cd25d2d693b2c.tar.gz | |
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
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 9 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 24 |
2 files changed, 19 insertions, 14 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index a6b01d569c3..563251f5212 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.75 2011/01/13 17:07:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.76 2012/05/13 13:43:59 abs Exp $ -DISTNAME= pkg_chk-2.0 -PKGREVISION= 1 +DISTNAME= pkg_chk-2.0.1 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -16,8 +15,8 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} USE_LANGUAGES= # empty USE_TOOLS+= mktemp:run -USE_TOOLS+= gzcat:run -USE_TOOLS+= gzip:run +USE_TOOLS+= gzcat:run +USE_TOOLS+= gzip:run NO_BUILD= yes CONFLICTS= pkgchk-[0-9]* 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 |