diff options
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_chk/PLIST | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 33 |
3 files changed, 35 insertions, 8 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 6d1b6c09010..42883301fc0 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.78 2012/08/02 09:39:49 abs Exp $ +# $NetBSD: Makefile,v 1.79 2012/08/03 10:35:31 abs Exp $ -DISTNAME= pkg_chk-2.0.3 +DISTNAME= pkg_chk-2.0.4 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -8,6 +8,7 @@ DISTFILES= # empty OWNER= abs@NetBSD.org HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html COMMENT= Check installed package versions against pkgsrc +LICENSE= 2-clause-bsd PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir @@ -19,6 +20,7 @@ USE_TOOLS+= gzcat:run USE_TOOLS+= gzip:run NO_BUILD= yes + CONFLICTS= pkgchk-[0-9]* INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 diff --git a/pkgtools/pkg_chk/PLIST b/pkgtools/pkg_chk/PLIST index 63217bab0b7..e6bb1b99730 100644 --- a/pkgtools/pkg_chk/PLIST +++ b/pkgtools/pkg_chk/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/27 00:02:34 wiz Exp $ -sbin/pkg_chk +@comment $NetBSD: PLIST,v 1.2 2012/08/03 10:35:31 abs Exp $ man/man8/pkg_chk.8 +sbin/pkg_chk diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 77c956a425c..4d2e76e5436 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,12 +1,37 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.68 2012/08/02 09:39:49 abs Exp $ +# $Id: pkg_chk.sh,v 1.69 2012/08/03 10:35:31 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Make -g list user-installed packages first, followed by commented # out automatically installed packages # TODO: List user-installed packages that are not in config +# Copyright (c) 2012 David Brownlee (Standard 2 clause BSD licence) +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + PATH=${PATH}:/usr/sbin:/usr/bin SUMMARY_FILE=pkg_summary.gz @@ -82,9 +107,9 @@ check_packages_installed() msg_n "$pkginstalled > $PKGNAME - ignoring" fi fi - if is_binary_available $PKGNAME ;then - msg_n " (has binary package)" - fi + fi + if is_binary_available $PKGNAME ;then + msg_n " (has binary package)" fi msg else |