 @@ -1,44 +1,41 @@
-.\" $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

 @@ -1,45 +1,43 @@
 #! /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\"

 @@ -1,23 +1,23 @@
-/*	$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.
 @@ -67,44 +67,44 @@ __RCSID("$NetBSD: show.c,v 1.32 2011/01/
 /* 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);
 @@ -153,59 +153,66 @@ show_index(const char *buf, const char *
 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

 @@ -1,44 +1,42 @@
-/* $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>