 @@ -1,117 +1,114 @@
-.\" $NetBSD: bpm.1,v 1.6 2009/02/08 23:12:10 wiz Exp $ */
+.\" $NetBSD: bpm.1,v 1.7 2012/02/21 18:32:14 wiz Exp $ */
 .\"
 .\" Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
-.\" Copyright (c) 2003 Alistair G. Crooks.  All rights reserved.
+.\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Alistair Crooks (agc@NetBSD.org)
 .\"
 .\" 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.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\"	This product includes software developed by Alistair G. Crooks.
 .\" 4. The name of the author may not be used to endorse or promote
 .\"    products derived from this software without specific prior written
 .\"    permission.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd August 3, 2007
 .Dt BPM 1
 .Os
 .Sh NAME
 .Nm bpm
 .Nd menu-based binary package manager
 .Sh SYNOPSIS
 .Nm
 .Op Fl hnVv
 .Op Fl b Ar baseURL
 .Op Fl m Ar machine
 .Op Fl r Ar release
 .Op Fl w Ar seconds
 .Sh DESCRIPTION
 The
 .Nm
 command is used to locate and install binary packages from any
 reachable URL.
 .Pp
 The following command-line options are supported:
 .Bl -tag -width indent
 .It Fl b Ar baseURL
 Specify a base URL from which to download binary packages.
 The default URL is
 .Pa ftp://ftp.NetBSD.org/pub/pkgsrc/packages .
 .It Fl h
 Print a help message and then exit.
 .It Fl m Ar machine
 Use
 .Ar machine
 as the machine architecture to be used, instead of that returned by
 .Xr uname 1 .
 .It Fl n
 Don't actually execute the commands to add the package.
 .It Fl r Ar release
 Use
 .Ar release
 as the operating system release to be used, instead of that returned by
 .Xr uname 1 .
 .It Fl V
 Print version number and exit.
 .It Fl v
 Turn on verbose output.
 .It Fl w Ar seconds
 The number of
 .Ar seconds
 to wait after displaying an error message and returning to
 normal menu operations.
 .El
 .Pp
 .Nm
 provides a menu-based binary package manager for
 .Nx .
 .Nm
 first connects to the URL using
 .Xr ftp 1 ,
 and displays a list of categories for which binary packages exist.
 If no categories are displayed, it could
 be that the machine architecture or operating system release string
 have been wrongly interpreted, and that it will be necessary to override
 this values by means of the command line options.
 Within a category, a list of packages will be displayed, and by selecting
 one using the number assigned to it, the package will be downloaded
 automatically, and installed, using the
 .Xr pkg_add 1
 utility.
 It is also possible to change the category currently being examined,
 and to quit from the utility, simply by selecting the appropriate choices
 on the menu.
 .Sh ENVIRONMENT
 The environment variables which govern the behavior of
 .Xr ftp 1
 and
 .Xr pkg_add 1
 are valid for
 .Nm .
 .Sh SEE ALSO
 .Xr ftp 1 ,
 .Xr pkg_add 1 ,
 .Xr uname 1
 .Sh AUTHORS
 The
 .Nm
 utility was written by
 .An Alistair Crooks Aq agc@NetBSD.org .

 @@ -1,222 +1,220 @@
 #! /bin/sh
+#
-# $NetBSD: bpm.sh.in,v 1.4 2007/08/02 23:30:20 wiz Exp $
+# $NetBSD: bpm.sh.in,v 1.5 2012/02/21 18:32:14 wiz Exp $
+#
-# Copyright (c) 2003 Alistair G. Crooks.  All rights reserved.
+# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Alistair Crooks (agc@NetBSD.org)
+#
 # 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.
 # 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-#	This product includes software developed by Alistair G. Crooks.
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# 4. The name of the author may not be used to endorse or promote
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-#    products derived from this software without specific prior written
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-#    permission.
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# POSSIBILITY OF SUCH DAMAGE.
 # 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.
+#
 die()
+{
 	echo >&2 "$@"
 	exit 1
+}
 check_prog()
+{
 	_var="$1"; _name="$2"
 	eval _tmp=\"\$$_var\"
 	if [ "x$_tmp" != "x" ]; then
 		# Variable is already set (by the user, for example)
 		return 0
 	fi
 	for _d in `echo $PATH | tr ':' ' '`; do
 		if [ -x "$_d/$_name" ]; then
 			# Program found
 			eval $_var=\""$_d/$_name"\"
 			return 1
 		fi
 	done
 	die "$_name not found in path."
+}
 check_prog awkprog awk
 check_prog echoprog echo
 check_prog ftpprog ftp
 check_prog idprog id
 check_prog moreprog more
 check_prog pkg_addprog pkg_add
 check_prog rmprog rm
 check_prog sedprog sed
 check_prog suprog su
 check_prog unameprog uname
 # print version and exit
 version() {
 	$pkg_addprog -V
 	exit 0
+}
 # temporary files
 tmpcategories=/tmp/categories.$$
 tmppackages=/tmp/packages.$$
 # some base parameters
 base=ftp://ftp.NetBSD.org/pub/pkgsrc/packages
 release=`${unameprog} -r | ${sedprog} -e 's/_STABLE//'`
 machine=`${unameprog} -m`
 sleepsecs=1
 doit=""
 while [ $# -gt 0 ]; do
 	case $1 in
 	-V)	version ;;
 	-b)	base=$2; shift ;;
 	-h)	${echoprog} "$0 [-b BaseURL] [-h] [-m machine] [-n] [-r release] [-v] [-w secs]"; exit 0;;
 	-m)	machine=$2; shift ;;
 	-n)	doit=":" ;;
 	-r)	release=$2; shift ;;
 	-v)	set -x ;;
 	-w)	sleepsecs=$2; shift ;;
 	*)	break ;;
 	esac
 	shift
 done
 category=""
 while true; do
 	# if we don't have a packages file, then we need to choose a category
 	case "$category" in
 	"")	# get possible categories
 		if [ ! -f $tmpcategories ]; then
 			${echoprog} "Downloading package categories from ${base}..."
 			${echoprog} "** QUIT" > $tmpcategories
 			${echoprog} ls | ${ftpprog} ${base}/${release}/${machine}/ 2>/dev/null | \
 				${awkprog} 'NF == 9 { if ($9 != "All") print $9 }' >> $tmpcategories
 		fi
 		# check for bad release numbering
 		# - it usually shows with 0 categories being displayed
 		${awkprog} 'END { if (NR == 1) { print "\n\n\n*** No categories found - is the OS release set properly? ***\n\n\n" } }' < $tmpcategories
 		# display possible categories
 		${awkprog} '{ print NR ". " $0 }' < $tmpcategories | ${moreprog}
 		# read a category number from the user
 		${echoprog} -n "Please type the category number: "
 		read choice
 		# validate user's choice
 		case "$choice" in
 |1)		${rmprog} -f $tmpcategories $tmppackages; exit 0 ;;
 		[2-9]|[0-9]*)	category=`${awkprog} 'NR == '$choice' { print }' < $tmpcategories` ;;
 		*)		category="" ;;
 		esac
 		case "$category" in
 		"")	${echoprog} "No such category \"$choice\""
 			sleep $sleepsecs
 			continue
 			;;
 		esac
 		# get possible packages
 		${echoprog} ""
 		${echoprog} "Downloading package names from ${base}/${category}..."
 		${echoprog} "** QUIT" > $tmppackages
 		${echoprog} "** Change category" >> $tmppackages
 		${echoprog} ls | ${ftpprog} ${base}/${release}/${machine}/${category}/ 2>/dev/null \
 			| ${awkprog} 'NF == 11 { print $9 }' >> $tmppackages
 		;;
 	esac
 	# display possible packages
 	${awkprog} '{ print NR ". " $0 }' < $tmppackages | ${moreprog}
 	# read a package number from the user
 	${echoprog} -n "Please type the package number: "
 	read choice
 	# validate user's choice
 	case "$choice" in
 )	${rmprog} -f $tmppackages $tmpcategories; exit 0 ;;
 )	category=""; continue ;; # no package to install - choose new category
 	[3-9]|[0-9]*)	package=`${awkprog} 'NR == '$choice' { print }' < $tmppackages` ;;
 	*)	package="" ;;
 	esac
 	case "$package" in
 	"")	${echoprog} "No such package \"$choice\""
 		sleep $sleepsecs
 		continue
 		;;
 	esac
 	# check it's not already installed
 	pkgbase=`${echoprog} ${package} | ${sedprog} -e 's|-[0-9].*||'`
 	installed=`pkg_info -e $pkgbase`
 	case "$installed" in
 	"")	;;
 	*)	${echoprog} "$package selected, but $installed already installed"
 		sleep $sleepsecs
 		continue
 		;;
 	esac
 	# Tell people what we're doing
 	${echoprog} ""
 	${echoprog} "Adding package ${base}/${release}/${machine}/${category}/${package}"
 	cmd="env PKG_PATH=${base}/${release}/${machine}/All ${pkg_addprog} ${package}"
 	# check if we need to become root for this
 	if [ `${idprog} -u` != 0 ]; then
 		${echoprog} "Becoming root@`/bin/hostname` to add a binary package"
 		${echoprog} -n "`${echoprog} ${suprog} | $awkprog '{ print $1 }'` "
 		$doit ${suprog} root -c "$cmd"
 		success=$?
 	else
 		$doit $cmd
 		success=$?
 	fi
 	# give feedback after adding the package
 	case $success in
 )	${echoprog} "$package successfully installed" ;;
 	*)	${echoprog} "Problems when installing $package - please try again" ;;
 	esac
 	${echoprog} ""
 	${echoprog} -n "[Q]uit, [C]hange category, [I]nstall another package: "
 	read choice
 	case "$choice" in
 	[Qq])	break ;;
 	[Cc])	category="" ;;
 	[Ii])	;;
 	esac
 done
 ${rmprog} -f $tmpcategories $tmppackages
 exit 0

 @@ -1,423 +1,430 @@
-/*	$NetBSD: show.c,v 1.32 2011/01/31 07:22:15 agc Exp $	*/
+/*	$NetBSD: show.c,v 1.33 2012/02/21 18:32:14 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: show.c,v 1.32 2011/01/31 07:22:15 agc Exp $");
+__RCSID("$NetBSD: show.c,v 1.33 2012/02/21 18:32:14 wiz Exp $");
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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.
+ *
  * Jordan K. Hubbard
  * 23 Aug 1993
+ *
  * Various display routines for the info module.
+ *
  */
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hubert Feyrer <hubert@feyrer.de>.
+ *
  * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
  */
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #include "defs.h"
 #include "lib.h"
 #include "info.h"
 /* Structure to define entries for the "show table" */
 typedef struct show_t {
 	pl_ent_t sh_type;	/* type of entry */
 	const char *sh_quiet;	/* message when quiet */
 	const char *sh_verbose;	/* message when verbose */
 }       show_t;
 /*
  * The entries in this table must be ordered the same as
  * pl_ent_t constants
  */
 static const show_t showv[] = {
-	{PLIST_FILE, "%s", "\tFile: %s"},
+	{PLIST_FILE, "", "\tFile: "},
-	{PLIST_CWD, "@cwd %s", "\tCWD to: %s"},
+	{PLIST_CWD, "@cwd ", "\tCWD to: "},
-	{PLIST_CMD, "@exec %s", "\tEXEC '%s'"},
+	{PLIST_CMD, "@exec ", "\tEXEC ''"},
-	{PLIST_CHMOD, "@chmod %s", "\tCHMOD to %s"},
+	{PLIST_CHMOD, "@chmod ", "\tCHMOD to "},
-	{PLIST_CHOWN, "@chown %s", "\tCHOWN to %s"},
+	{PLIST_CHOWN, "@chown ", "\tCHOWN to "},
-	{PLIST_CHGRP, "@chgrp %s", "\tCHGRP to %s"},
+	{PLIST_CHGRP, "@chgrp ", "\tCHGRP to "},
-	{PLIST_COMMENT, "@comment %s", "\tComment: %s"},
+	{PLIST_COMMENT, "@comment ", "\tComment: "},
 	{PLIST_IGNORE, "@ignore", "Ignore next file:"},
-	{PLIST_NAME, "@name %s", "\tPackage name: %s"},
+	{PLIST_NAME, "@name ", "\tPackage name: "},
-	{PLIST_UNEXEC, "@unexec %s", "\tUNEXEC '%s'"},
+	{PLIST_UNEXEC, "@unexec ", "\tUNEXEC ''"},
-	{PLIST_SRC, "@src: %s", "\tSRC to: %s"},
+	{PLIST_SRC, "@src: ", "\tSRC to: "},
-	{PLIST_DISPLAY, "@display %s", "\tInstall message file: %s"},
+	{PLIST_DISPLAY, "@display ", "\tInstall message file: "},
-	{PLIST_PKGDEP, "@pkgdep %s", "\tPackage depends on: %s"},
+	{PLIST_PKGDEP, "@pkgdep ", "\tPackage depends on: "},
-	{PLIST_DIR_RM, "@dirrm %s", "\tObsolete deinstall directory removal hint: %s"},
+	{PLIST_DIR_RM, "@dirrm ", "\tObsolete deinstall directory removal hint: "},
-	{PLIST_OPTION, "@option %s", "\tPackage has option: %s"},
+	{PLIST_OPTION, "@option ", "\tPackage has option: "},
-	{PLIST_PKGCFL, "@pkgcfl %s", "\tPackage conflicts with: %s"},
+	{PLIST_PKGCFL, "@pkgcfl ", "\tPackage conflicts with: "},
-	{PLIST_BLDDEP, "@blddep %s", "\tPackage depends exactly on: %s"},
+	{PLIST_BLDDEP, "@blddep ", "\tPackage depends exactly on: "},
-	{PLIST_PKGDIR, "@pkgdir %s", "\tManaged directory: %s"},
+	{PLIST_PKGDIR, "@pkgdir ", "\tManaged directory: "},
 	{-1, NULL, NULL}
 };
 static int print_string_as_var(const char *, const char *);
 void
 show_file(const char *buf, const char *title, Boolean separator)
+{
 	size_t len;
 	if (!Quiet)
 		printf("%s%s", InfoPrefix, title);
 	len = strlen(buf);
 	if (len == 0 || buf[len - 1] != '\n')
 		puts(buf);
 	else
 		fputs(buf, stdout);
 	if (!Quiet || separator)
 		printf("\n");
+}
 void
 show_var(const char *buf, const char *variable)
+{
 	char   *value;
 	if (buf == NULL)
 		return;
 	if ((value = var_get_memory(buf, variable)) != NULL) {
 		(void) printf("%s\n", value);
 		free(value);
+	}
+}
 void
 show_index(const char *buf, const char *title)
+{
 	size_t len;
 	if (!Quiet)
 		printf("%s%s", InfoPrefix, title);
 	len = strlen(buf);
 	if (len == 0 || buf[len - 1] != '\n')
 		puts(buf);
 	else
 		fputs(buf, stdout);
+}
 /*
  * Show a packing list item type.  If type is PLIST_SHOW_ALL, show all
  */
 void
 show_plist(const char *title, package_t *plist, pl_ent_t type)
+{
 	plist_t *p;
 	Boolean ign;
 	if (!Quiet) {
 		printf("%s%s", InfoPrefix, title);
+	}
 	for (ign = FALSE, p = plist->head; p; p = p->next) {
 		if (p->type == type || type == PLIST_SHOW_ALL) {
 			switch (p->type) {
 			case PLIST_FILE:
-				printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose, p->name);
+				printf("%s%s",
 				    Quiet ? showv[p->type].sh_quiet :
 				    showv[p->type].sh_verbose, p->name);
 				if (ign) {
 					if (!Quiet) {
 						printf(" (ignored)");
+					}
 					ign = FALSE;
+				}
 				break;
 			case PLIST_CHMOD:
 			case PLIST_CHOWN:
 			case PLIST_CHGRP:
-				printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose,
+				printf("%s%s",
 				    Quiet ?  showv[p->type].sh_quiet :
 				    showv[p->type].sh_verbose,
 				    p->name ? p->name : "(clear default)");
 				break;
 			case PLIST_IGNORE:
-				printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose);
+				printf("%s", Quiet ? showv[p->type].sh_quiet :
 				    showv[p->type].sh_verbose);
 				ign = TRUE;
 				break;
 			case PLIST_CWD:
 			case PLIST_CMD:
 			case PLIST_SRC:
 			case PLIST_UNEXEC:
 			case PLIST_COMMENT:
 			case PLIST_NAME:
 			case PLIST_DISPLAY:
 			case PLIST_PKGDEP:
 			case PLIST_DIR_RM:
 			case PLIST_OPTION:
 			case PLIST_PKGCFL:
 			case PLIST_BLDDEP:
 			case PLIST_PKGDIR:
-				printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose,
+				printf("%s%s",
-					(p->name) ? p->name : "(null)");
+				    Quiet ? showv[p->type].sh_quiet :
 				    showv[p->type].sh_verbose,
 				    p->name ? p->name : "(null)");
 				break;
 			default:
 				warnx("unknown command type %d (%s)", p->type, p->name);
+			}
 			(void) fputc('\n', stdout);
+		}
+	}
+}
 /*
  * Show all files in the packing list (except ignored ones)
  */
 void
 show_files(const char *title, package_t *plist)
+{
 	plist_t *p;
 	Boolean ign;
 	const char *dir = ".";
 	if (!Quiet) {
 		printf("%s%s", InfoPrefix, title);
+	}
 	for (ign = FALSE, p = plist->head; p; p = p->next) {
 		switch (p->type) {
 		case PLIST_FILE:
 			if (!ign) {
 				printf("%s%s%s\n", dir,
 					(strcmp(dir, "/") == 0) ? "" : "/", p->name);
+			}
 			ign = FALSE;
 			break;
 		case PLIST_CWD:
 			dir = p->name;
 			break;
 		case PLIST_IGNORE:
 			ign = TRUE;
 			break;
 		default:
 			break;
+		}
+	}
+}
 /*
  * Show dependencies (packages this pkg requires)
  */
 void
 show_depends(const char *title, package_t *plist)
+{
 	plist_t *p;
 	int     nodepends;
 	nodepends = 1;
 	for (p = plist->head; p && nodepends; p = p->next) {
 		switch (p->type) {
 		case PLIST_PKGDEP:
 			nodepends = 0;
 			break;
 		default:
 			break;
+		}
+	}
 	if (nodepends)
 		return;
 	if (!Quiet) {
 		printf("%s%s", InfoPrefix, title);
+	}
 	for (p = plist->head; p; p = p->next) {
 		switch (p->type) {
 		case PLIST_PKGDEP:
 			printf("%s\n", p->name);
 			break;
 		default:
 			break;
+		}
+	}
 	printf("\n");
+}
 /*
  * Show exact dependencies (packages this pkg was built with)
  */
 void
 show_bld_depends(const char *title, package_t *plist)
+{
 	plist_t *p;
 	int     nodepends;
 	nodepends = 1;
 	for (p = plist->head; p && nodepends; p = p->next) {
 		switch (p->type) {
 		case PLIST_BLDDEP:
 			nodepends = 0;
 			break;
 		default:
 			break;
+		}
+	}
 	if (nodepends)
 		return;
 	if (!Quiet) {
 		printf("%s%s", InfoPrefix, title);
+	}
 	for (p = plist->head; p; p = p->next) {
 		switch (p->type) {
 		case PLIST_BLDDEP:
 			printf("%s\n", p->name);
 			break;
 		default:
 			break;
+		}
+	}
 	printf("\n");
+}
 /*
  * Show entry for pkg_summary.txt file.
  */
 void
 show_summary(struct pkg_meta *meta, package_t *plist, const char *binpkgfile)
+{
 	static const char *bi_vars[] = {
 		"PKGPATH",
 		"CATEGORIES",
 		"PROVIDES",
 		"REQUIRES",
 		"PKG_OPTIONS",
 		"OPSYS",
 		"OS_VERSION",
 		"MACHINE_ARCH",
 		"LICENSE",
 		"HOMEPAGE",
 		"PKGTOOLS_VERSION",
 		"BUILD_DATE",
 		"PREV_PKGPATH",
 		"SUPERSEDES",
 		NULL
 	};
 	plist_t *p;
 	struct stat st;
 	for (p = plist->head; p; p = p->next) {
 		switch (p->type) {
 		case PLIST_NAME:
 			printf("PKGNAME=%s\n", p->name);
 			break;
 		case PLIST_PKGDEP:
 			printf("DEPENDS=%s\n", p->name);
 			break;
 		case PLIST_PKGCFL:
 			printf("CONFLICTS=%s\n", p->name);
 			break;
 		default:
 			break;
+		}
+	}
 	print_string_as_var("COMMENT", meta->meta_comment);
 	if (meta->meta_size_pkg)
 		print_string_as_var("SIZE_PKG", meta->meta_size_pkg);
 	if (meta->meta_build_info)
 		var_copy_list(meta->meta_build_info, bi_vars);
 	else
 		warnx("Build information missing");
 	if (binpkgfile != NULL && stat(binpkgfile, &st) == 0) {
 	    const char *base;
 	    base = strrchr(binpkgfile, '/');
 	    if (base == NULL)
 		base = binpkgfile;
 	    else
 		base++;
 	    printf("FILE_NAME=%s\n", base);
 	    printf("FILE_SIZE=%" MY_PRIu64 "\n", (uint64_t)st.st_size);
 	    /* XXX: DIGETS */
+	}
 	print_string_as_var("DESCRIPTION", meta->meta_desc);
 	putc('\n', stdout);
+}
 /*
  * Print the contents of file fname as value of variable var to stdout.
  */
 static int
 print_string_as_var(const char *var, const char *str)
+{
 	const char *eol;
 	while ((eol = strchr(str, '\n')) != NULL) {
 		printf("%s=%.*s\n", var, (int)(eol - str), str);
 		str = eol + 1;
+	}
 	if (*str)
 		printf("%s=%s\n", var, str);
 	return 0;
+}
 void
 show_list(lpkg_head_t *pkghead, const char *title)
+{
 	lpkg_t *lpp;
 	if (!Quiet)
 		printf("%s%s", InfoPrefix, title);
 	while ((lpp = TAILQ_FIRST(pkghead)) != NULL) {
 		TAILQ_REMOVE(pkghead, lpp, lp_link);
 		puts(lpp->lp_name);
 		free_lpkg(lpp);
+	}
 	if (!Quiet)
 		printf("\n");
+}

 @@ -1,77 +1,75 @@
-/* $NetBSD: defs.h,v 1.9 2008/04/18 12:01:46 joerg Exp $ */
+/* $NetBSD: defs.h,v 1.10 2012/02/21 18:32:14 wiz Exp $ */
-/*
+/*-
- * Copyright (c) 1999-2000 Alistair G. Crooks.  All rights reserved.
+ * Copyright (c) 1999,2000,2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Alistair Crooks (agc@NetBSD.org)
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Alistair G. Crooks.
  * 4. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
+ *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef DEFS_H_
 #define DEFS_H_
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #if HAVE_STRING_H
 #include <string.h>
 #endif
 #ifndef MIN
 #define MIN(a,b)	(((a) < (b)) ? (a) : (b))
 #endif
 #ifndef MAX
 #define MAX(a,b)	(((a) > (b)) ? (a) : (b))
 #endif
 /*
  * Some systems such as OpenBSD-3.6 do not provide PRIu64.
  * Others such as AIX-4.3.2 have a broken PRIu64 which includes
  * a leading "%".
  */
 #ifdef NEED_PRI_MACRO
 #  if SIZEOF_INT == 8
 #    define MY_PRIu64 "u"
 #  elif SIZEOF_LONG == 8
 #    define MY_PRIu64 "lu"
 #  elif SIZEOF_LONG_LONG == 8
 #    define MY_PRIu64 "llu"
 #  else
 #    error "unable to find a suitable PRIu64"
 #  endif
 #else
 #  define MY_PRIu64 PRIu64
 #endif
 #endif /* !DEFS_H_ */