Merge changes from src/external/bsd/pkg_install.

4 files changed, 82 insertions, 82 deletions

diff --git a/pkgtools/pkg_install/files/bpm/bpm.1 b/pkgtools/pkg_install/files/bpm/bpm.1
index 699f27bf01a..8815caee449 100644
--- a/pkgtools/pkg_install/files/bpm/bpm.1
+++ b/pkgtools/pkg_install/files/bpm/bpm.1
@@ -1,7 +1,10 @@
-.\" $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
@@ -11,24 +14,18 @@
 .\" 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
-.\" 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 AUTHOR 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.
+.\" 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.
 .\"
 .Dd August 3, 2007
 .Dt BPM 1
diff --git a/pkgtools/pkg_install/files/bpm/bpm.sh.in b/pkgtools/pkg_install/files/bpm/bpm.sh.in
index ca6f007427d..6e31f111a9e 100644
--- a/pkgtools/pkg_install/files/bpm/bpm.sh.in
+++ b/pkgtools/pkg_install/files/bpm/bpm.sh.in
@@ -1,8 +1,12 @@
 #! /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
@@ -12,24 +16,18 @@
 # 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
-# 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 AUTHOR 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.
+# 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.
 #
 
 die()
diff --git a/pkgtools/pkg_install/files/info/show.c b/pkgtools/pkg_install/files/info/show.c
index eb7b4df6777..daf3bdba6a0 100644
--- a/pkgtools/pkg_install/files/info/show.c
+++ b/pkgtools/pkg_install/files/info/show.c
@@ -1,4 +1,4 @@
-/*	$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"
@@ -7,7 +7,7 @@
 #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
@@ -77,24 +77,24 @@ typedef struct show_t {
  * pl_ent_t constants
  */
 static const show_t showv[] = {
-	{PLIST_FILE, "%s", "\tFile: %s"},
-	{PLIST_CWD, "@cwd %s", "\tCWD to: %s"},
-	{PLIST_CMD, "@exec %s", "\tEXEC '%s'"},
-	{PLIST_CHMOD, "@chmod %s", "\tCHMOD to %s"},
-	{PLIST_CHOWN, "@chown %s", "\tCHOWN to %s"},
-	{PLIST_CHGRP, "@chgrp %s", "\tCHGRP to %s"},
-	{PLIST_COMMENT, "@comment %s", "\tComment: %s"},
+	{PLIST_FILE, "", "\tFile: "},
+	{PLIST_CWD, "@cwd ", "\tCWD to: "},
+	{PLIST_CMD, "@exec ", "\tEXEC ''"},
+	{PLIST_CHMOD, "@chmod ", "\tCHMOD to "},
+	{PLIST_CHOWN, "@chown ", "\tCHOWN to "},
+	{PLIST_CHGRP, "@chgrp ", "\tCHGRP to "},
+	{PLIST_COMMENT, "@comment ", "\tComment: "},
 	{PLIST_IGNORE, "@ignore", "Ignore next file:"},
-	{PLIST_NAME, "@name %s", "\tPackage name: %s"},
-	{PLIST_UNEXEC, "@unexec %s", "\tUNEXEC '%s'"},
-	{PLIST_SRC, "@src: %s", "\tSRC to: %s"},
-	{PLIST_DISPLAY, "@display %s", "\tInstall message file: %s"},
-	{PLIST_PKGDEP, "@pkgdep %s", "\tPackage depends on: %s"},
-	{PLIST_DIR_RM, "@dirrm %s", "\tObsolete deinstall directory removal hint: %s"},
-	{PLIST_OPTION, "@option %s", "\tPackage has option: %s"},
-	{PLIST_PKGCFL, "@pkgcfl %s", "\tPackage conflicts with: %s"},
-	{PLIST_BLDDEP, "@blddep %s", "\tPackage depends exactly on: %s"},
-	{PLIST_PKGDIR, "@pkgdir %s", "\tManaged directory: %s"},
+	{PLIST_NAME, "@name ", "\tPackage name: "},
+	{PLIST_UNEXEC, "@unexec ", "\tUNEXEC ''"},
+	{PLIST_SRC, "@src: ", "\tSRC to: "},
+	{PLIST_DISPLAY, "@display ", "\tInstall message file: "},
+	{PLIST_PKGDEP, "@pkgdep ", "\tPackage depends on: "},
+	{PLIST_DIR_RM, "@dirrm ", "\tObsolete deinstall directory removal hint: "},
+	{PLIST_OPTION, "@option ", "\tPackage has option: "},
+	{PLIST_PKGCFL, "@pkgcfl ", "\tPackage conflicts with: "},
+	{PLIST_BLDDEP, "@blddep ", "\tPackage depends exactly on: "},
+	{PLIST_PKGDIR, "@pkgdir ", "\tManaged directory: "},
 	{-1, NULL, NULL}
 };
 
@@ -163,7 +163,9 @@ show_plist(const char *title, package_t *plist, pl_ent_t type)
 		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)");
@@ -174,11 +176,14 @@ show_plist(const char *title, package_t *plist, pl_ent_t type)
 			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:
@@ -194,8 +199,10 @@ show_plist(const char *title, package_t *plist, pl_ent_t type)
 			case PLIST_PKGCFL:
 			case PLIST_BLDDEP:
 			case PLIST_PKGDIR:
-				printf(Quiet ? showv[p->type].sh_quiet : showv[p->type].sh_verbose,
-					(p->name) ? p->name : "(null)");
+				printf("%s%s",
+				    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);
diff --git a/pkgtools/pkg_install/files/lib/defs.h b/pkgtools/pkg_install/files/lib/defs.h
index 582ae296a36..6916c122ef8 100644
--- a/pkgtools/pkg_install/files/lib/defs.h
+++ b/pkgtools/pkg_install/files/lib/defs.h
@@ -1,7 +1,11 @@
-/* $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
@@ -11,24 +15,18 @@
  * 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
- * 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 AUTHOR 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.
+ * 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.
  */
 #ifndef DEFS_H_
 #define DEFS_H_