 @@ -1,14 +1,14 @@
-/* $NetBSD: info.h,v 1.17 2008/02/02 16:21:45 joerg Exp $ */
+/* $NetBSD: info.h,v 1.18 2009/03/02 17:13:49 joerg Exp $ */
 /* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * 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.
 @@ -60,26 +60,27 @@ struct pkg_meta {
 	char *meta_desc;
 	char *meta_mtree;
 	char *meta_build_version;
 	char *meta_build_info;
 	char *meta_size_pkg;
 	char *meta_size_all;
 	char *meta_required_by;
 	char *meta_display;
 	char *meta_install;
 	char *meta_deinstall;
 	char *meta_preserve;
 	char *meta_views;
 	char *meta_installed_info;
 	int is_installed;
 };
 #ifndef MAXINDEXSIZE
 #define MAXINDEXSIZE 60
 #endif
 #ifndef MAXNAMESIZE
 #define MAXNAMESIZE  20
 #endif
 #define SHOW_COMMENT		0x00001
 #define SHOW_DESC		0x00002
 #define SHOW_PLIST		0x00004
 @@ -89,26 +90,27 @@ struct pkg_meta {
 #define SHOW_INDEX		0x00080
 #define SHOW_FILES		0x00100
 #define SHOW_DISPLAY		0x00200
 #define SHOW_REQBY		0x00400
 #define SHOW_MTREE		0x00800
 #define SHOW_BUILD_VERSION	0x01000
 #define SHOW_BUILD_INFO		0x02000
 #define SHOW_DEPENDS		0x04000
 #define SHOW_PKG_SIZE		0x08000
 #define SHOW_ALL_SIZE		0x10000
 #define SHOW_BLD_DEPENDS	0x20000
 #define SHOW_BI_VAR		0x40000
 #define SHOW_SUMMARY		0x80000
 #define SHOW_FULL_REQBY		0x100000
 enum which {
     WHICH_ALL,
     WHICH_USER,
     WHICH_LIST
 };
 extern int Flags;
 extern enum which Which;
 extern Boolean File2Pkg;
 extern Boolean Quiet;
 extern char *InfoPrefix;
 extern char *BuildInfoVariable;
 @@ -118,17 +120,18 @@ extern size_t termwidth;
 extern lpkg_head_t pkgs;
 int CheckForPkg(const char *);
 int CheckForBestPkg(const char *);
 void	show_file(const char *, const char *, Boolean);
 void	show_var(const char *, const char *);
 void	show_plist(const char *, package_t *, pl_ent_t);
 void	show_files(const char *, package_t *);
 void	show_depends(const char *, package_t *);
 void	show_bld_depends(const char *, package_t *);
 void	show_index(const char *, const char *);
 void	show_summary(struct pkg_meta *, package_t *, const char *);
 void	show_list(lpkg_head_t *, const char *);
 int     pkg_perform(lpkg_head_t *);
 #endif				/* _INST_INFO_H_INCLUDE */

 @@ -1,23 +1,23 @@
-/*	$NetBSD: main.c,v 1.24 2009/02/28 16:03:56 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.25 2009/03/02 17:13:49 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.24 2009/02/28 16:03:56 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.25 2009/03/02 17:13:49 joerg 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
 @@ -34,44 +34,44 @@ __RCSID("$NetBSD: main.c,v 1.24 2009/02/
 #include <sys/ioctl.h>
 #endif
 #if HAVE_TERMIOS_H
 #include <termios.h>
 #endif
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #include "lib.h"
 #include "info.h"
-static const char Options[] = ".aBbcDde:E:fFhIiK:kLl:mNnpQ:qRsSuvVX";
+static const char Options[] = ".aBbcDde:E:fFhIiK:kLl:mNnpQ:qrRsSuvVX";
 int     Flags = 0;
 enum which Which = WHICH_LIST;
 Boolean File2Pkg = FALSE;
 Boolean Quiet = FALSE;
 char   *InfoPrefix = "";
 char   *BuildInfoVariable = "";
 char    PlayPen[MaxPathSize];
 size_t  PlayPenSize = sizeof(PlayPen);
 size_t  termwidth = 0;
 lpkg_head_t pkgs;
 static void
 usage(void)
+{
 	fprintf(stderr, "%s\n%s\n%s\n%s\n",
-	    "usage: pkg_info [-BbcDdFfhIikLmNnpqRSsVvX] [-e package] [-E package]",
+	    "usage: pkg_info [-BbcDdFfhIikLmNnpqrRSsVvX] [-e package] [-E package]",
 	    "                [-K pkg_dbdir] [-l prefix] pkg-name ...",
 	    "       pkg_info [-a | -u] [flags]",
 	    "       pkg_info [-Q variable] pkg-name ...");
 	exit(1);
+}
 int
 main(int argc, char **argv)
+{
 	char *CheckPkg = NULL;
 	char *BestCheckPkg = NULL;
 	lpkg_t *lpp;
 	int     ch;
 @@ -162,26 +162,30 @@ main(int argc, char **argv)
 		case 'p':
 			Flags |= SHOW_PREFIX;
 			break;
 		case 'Q':
 			Flags |= SHOW_BI_VAR;
 			BuildInfoVariable = optarg;
 			break;
 		case 'q':
 			Quiet = TRUE;
 			break;
 		case 'r':
 			Flags |= SHOW_FULL_REQBY;
 			break;
 		case 'R':
 			Flags |= SHOW_REQBY;
 			break;
 		case 's':
 			Flags |= SHOW_PKG_SIZE;
 			break;
 		case 'S':
 			Flags |= SHOW_ALL_SIZE;
 			break;
 		case 'u':

 @@ -1,23 +1,23 @@
-/*	$NetBSD: show.c,v 1.24 2009/02/11 23:51:30 joerg Exp $	*/
+/*	$NetBSD: show.c,v 1.25 2009/03/02 17:13:49 joerg 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.24 2009/02/11 23:51:30 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.25 2009/03/02 17:13:49 joerg 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.
 @@ -395,13 +395,31 @@ 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,29 +1,29 @@
-/*	$NetBSD: perform.c,v 1.52 2009/02/25 20:52:10 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.53 2009/03/02 17:13:49 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if HAVE_SYS_QUEUE_H
 #include <sys/queue.h>
 #endif
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.52 2009/02/25 20:52:10 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.53 2009/03/02 17:13:49 joerg Exp $");
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * 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
 @@ -224,26 +224,27 @@ has_entry:
 		(*target)[size] = '\0';
+	}
 	for (descr = pkg_meta_descriptors; descr->entry_filename; ++descr) {
 		if (descr->required_file)
 			--found_required;
+	}
 	if (found_required != 0) {
 		free_pkg_meta(meta);
 		meta = NULL;
+	}
 	archive_read_finish(archive);
 	meta->is_installed = 0;
 	return meta;
+}
 #endif
 static struct pkg_meta *
 read_meta_data_from_pkgdb(const char *pkg)
+{
 	struct pkg_meta *meta;
 	const struct pkg_meta_desc *descr;
 	char **target;
 	char *fname;
 	int fd;
 @@ -269,29 +270,70 @@ read_meta_data_from_pkgdb(const char *pk
 		if (fstat(fd, &st) == -1)
 			err(2, "cannot stat meta data");
 		if ((st.st_mode & S_IFMT) != S_IFREG)
 			errx(1, "meta data is not regular file");
 		if (st.st_size > SSIZE_MAX - 1)
 			err(2, "meta data file too large to process");
 		*target = xmalloc(st.st_size + 1);
 		if (read(fd, *target, st.st_size) != st.st_size)
 			err(2, "cannot read meta data");
 		(*target)[st.st_size] = '\0';
 		close(fd);
+	}
 	meta->is_installed = 1;
 	return meta;
+}
 static void
 build_full_reqby(lpkg_head_t *reqby, struct pkg_meta *meta)
+{
 	char *iter, *eol, *next;
 	lpkg_t *lpp;
 	struct pkg_meta *meta_dep;
 	if (meta->is_installed == 0 || meta->meta_required_by == NULL)
 		return;
 	for (iter = meta->meta_required_by; *iter != '\0'; iter = next) {
 		eol = iter + strcspn(iter, "\n");
 		if (*eol == '\n')
 			next = eol + 1;
 		else
 			next = eol;
 		if (iter == eol)
 			continue;
 		TAILQ_FOREACH(lpp, reqby, lp_link) {
 			if (strlen(lpp->lp_name) != eol - iter)
 				continue;
 			if (memcmp(lpp->lp_name, iter, eol - iter) == 0)
 				break;
+		}
 		if (lpp != NULL)
 			continue;
 		*eol = '\0';
 		lpp = alloc_lpkg(iter);
 		if (next != eol)
 			*eol = '\n';
 		TAILQ_INSERT_TAIL(reqby, lpp, lp_link);
 		meta_dep = read_meta_data_from_pkgdb(lpp->lp_name);
 		if (meta_dep == NULL)
 			continue;
 		build_full_reqby(reqby, meta_dep);
 		free_pkg_meta(meta_dep);
+	}
+}
 static lfile_head_t files;
 static int
 pkg_do(const char *pkg)
+{
 	struct pkg_meta *meta;
 	char    log_dir[MaxPathSize];
 	int     code = 0;
 	const char   *binpkgfile = NULL;
 	if (IS_URL(pkg) || (fexists(pkg) && isfile(pkg))) {
 #ifdef BOOTSTRAP
 		errx(2, "Binary packages not supported during bootstrap");
 @@ -386,26 +428,32 @@ pkg_do(const char *pkg)
+		}
 		if (Flags & SHOW_COMMENT) {
 			show_file(meta->meta_comment, "Comment:\n", TRUE);
+		}
 		if (Flags & SHOW_DEPENDS) {
 			show_depends("Requires:\n", &plist);
+		}
 		if (Flags & SHOW_BLD_DEPENDS) {
 			show_bld_depends("Built using:\n", &plist);
+		}
 		if ((Flags & SHOW_REQBY) && meta->meta_required_by) {
 			show_file(meta->meta_required_by, "Required by:\n", TRUE);
+		}
 		if ((Flags & SHOW_FULL_REQBY) && meta->is_installed) {
 			lpkg_head_t reqby;
 			TAILQ_INIT(&reqby);
 			build_full_reqby(&reqby, meta);
 			show_list(&reqby, "Full required by list:\n");
+		}
 		if (Flags & SHOW_DESC) {
 			show_file(meta->meta_desc, "Description:\n", TRUE);
+		}
 		if ((Flags & SHOW_DISPLAY) && meta->meta_display) {
 			show_file(meta->meta_display, "Install notice:\n",
 				  TRUE);
+		}
 		if (Flags & SHOW_PLIST) {
 			show_plist("Packing list:\n", &plist, PLIST_SHOW_ALL);
+		}
 		if ((Flags & SHOW_INSTALL) && meta->meta_install) {
 			show_file(meta->meta_install, "Install script:\n",
 				  TRUE);
 @@ -577,27 +625,27 @@ pkg_perform(lpkg_head_t *pkghead)
 		desired_meta_data |= LOAD_PRESERVE;
 	if ((Flags & (SHOW_INDEX | SHOW_BI_VAR)) == 0)
 		desired_meta_data |= LOAD_CONTENTS;
 	if (Flags & (SHOW_COMMENT | SHOW_INDEX | SHOW_SUMMARY))
 		desired_meta_data |= LOAD_COMMENT;
 	if (Flags & (SHOW_BI_VAR | SHOW_BUILD_INFO | SHOW_SUMMARY))
 		desired_meta_data |= LOAD_BUILD_INFO | LOAD_INSTALLED_INFO;
 	if (Flags & (SHOW_SUMMARY | SHOW_PKG_SIZE))
 		desired_meta_data |= LOAD_SIZE_PKG;
 	if (Flags & SHOW_ALL_SIZE)
 		desired_meta_data |= LOAD_SIZE_ALL;
 	if (Flags & (SHOW_SUMMARY | SHOW_DESC))
 		desired_meta_data |= LOAD_DESC;
-	if (Flags & SHOW_REQBY)
+	if (Flags & (SHOW_REQBY | SHOW_FULL_REQBY))
 		desired_meta_data |= LOAD_REQUIRED_BY;
 	if (Flags & SHOW_DISPLAY)
 		desired_meta_data |= LOAD_DISPLAY;
 	if (Flags & SHOW_INSTALL)
 		desired_meta_data |= LOAD_INSTALL;
 	if (Flags & SHOW_DEINSTALL)
 		desired_meta_data |= LOAD_DEINSTALL;
 	if (Flags & SHOW_MTREE)
 		desired_meta_data |= LOAD_MTREE;
 	if (Flags & SHOW_BUILD_VERSION)
 		desired_meta_data |= LOAD_BUILD_VERSION;

 @@ -1,41 +1,41 @@
-.\" $NetBSD: pkg_info.1,v 1.23 2009/02/28 16:03:56 joerg Exp $
+.\" $NetBSD: pkg_info.1,v 1.24 2009/03/02 17:13:49 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" 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
 .\"
 .\"
 .\"     @(#)pkg_info.1
 .\"
-.Dd February 27, 2009
+.Dd March 2, 2009
 .Dt PKG_INFO 1
 .Os
 .Sh NAME
 .Nm pkg_info
 .Nd a utility for displaying information on software packages
 .Sh SYNOPSIS
 .Nm
-.Op Fl BbcDdFfhIikLmNnpqRSsVvX
+.Op Fl BbcDdFfhIikLmNnpqrRSsVvX
 .Op Fl e Ar package
 .Op Fl E Ar package
 .Op Fl K Ar pkg_dbdir
 .Op Fl l Ar prefix
 .Ar pkg-name ...
 .Nm
 .Op Fl a | Fl u
 .Op flags
 .Nm
 .Op Fl Q Ar variable
 .Ar pkg-name ...
 .Sh DESCRIPTION
 The
 @@ -166,26 +166,29 @@ Show the installation prefix for each pa
 .It Fl Q
 Show the definition of
 .Ar variable
 from the build information for each package.
 An empty string is returned if no such variable definition is found for
 the package(s).
 .It Fl q
 Be
 .Dq quiet
 in emitting report headers and such, just dump the
 raw info (basically, assume a non-human reading).
 .It Fl R
 For each package, show the packages that require it.
 .It Fl r
 For each package, show the packages that require it.
 Continue recursively to show all dependents.
 .It Fl S
 Show the size of this package and all the packages it requires,
 in bytes.
 .It Fl s
 Show the size of this package in bytes.
 The size is calculated by adding up the size of each file of the package.
 .It Fl u
 Show information for all user-installed packages.
 Automatically installed packages (as dependencies
 of other packages) are not displayed.
 See also
 .Fl a .
 .It Fl V

 @@ -1,20 +1,20 @@
 PKG_INFO(1)             NetBSD General Commands Manual             PKG_INFO(1)
 NNAAMMEE
      ppkkgg__iinnffoo -- a utility for displaying information on software packages
 SSYYNNOOPPSSIISS
-     ppkkgg__iinnffoo [--BBbbccDDddFFffhhIIiikkLLmmNNnnppqqRRSSssVVvvXX] [--ee _p_a_c_k_a_g_e] [--EE _p_a_c_k_a_g_e]
+     ppkkgg__iinnffoo [--BBbbccDDddFFffhhIIiikkLLmmNNnnppqqrrRRSSssVVvvXX] [--ee _p_a_c_k_a_g_e] [--EE _p_a_c_k_a_g_e]
               [--KK _p_k_g___d_b_d_i_r] [--ll _p_r_e_f_i_x] _p_k_g_-_n_a_m_e _._._.
      ppkkgg__iinnffoo [--aa | --uu] [flags]
      ppkkgg__iinnffoo [--QQ _v_a_r_i_a_b_l_e] _p_k_g_-_n_a_m_e _._._.
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__iinnffoo command is used to dump out information for packages, which
      may be either packed up in files or already installed on the system with
      the pkg_create(1) command.
      The _p_k_g_-_n_a_m_e may be the name of an installed package (with our without
      version), a pattern matching several installed packages (see the _P_A_C_K_A_G_E
      _W_I_L_D_C_A_R_D_S section for a description of possible patterns), the pathname
      to a binary package, a filename belonging to an installed package (if --FF
 @@ -97,26 +97,28 @@ DDEESSCCRRIIPPTTIIOONN
      --nn      Show which packages each package needs (depends upon), if any.
      --pp      Show the installation prefix for each package.
      --QQ      Show the definition of _v_a_r_i_a_b_l_e from the build information for
              each package.  An empty string is returned if no such variable
              definition is found for the package(s).
      --qq      Be ``quiet'' in emitting report headers and such, just dump the
              raw info (basically, assume a non-human reading).
      --RR      For each package, show the packages that require it.
      --rr      For each package, recursively show the packages that require it.
      --SS      Show the size of this package and all the packages it requires,
              in bytes.
      --ss      Show the size of this package in bytes.  The size is calculated
              by adding up the size of each file of the package.
      --uu      Show information for all user-installed packages.  Automatically
              installed packages (as dependencies of other packages) are not
              displayed.  See also --aa.
      --VV      Print version number and exit.
      --vv      Turn on verbose output.
 @@ -174,14 +176,14 @@ EENNVVIIRROONNMMEENNTT
 SSEEEE AALLSSOO
      pkg_add(1), pkg_admin(1), pkg_create(1), pkg_delete(1), mktemp(3),
      pkgsrc(7), mtree(8)
 AAUUTTHHOORRSS
      Jordan Hubbard
              most of the work
      John Kohl
              refined it for NetBSD
      Hubert Feyrer
              NetBSD wildcard dependency processing, pkgdb, depends displaying,
              pkg size display etc.
-NetBSD 5.0                     February 27, 2009                    NetBSD 5.0
+NetBSD 5.0                       March 2, 2009                      NetBSD 5.0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.116 2009/03/02 14:59:14 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.117 2009/03/02 17:13:49 joerg Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  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.
+ *
 @@ -17,16 +17,16 @@
  * 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.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20090301"
+#define PKGTOOLS_VERSION "20090302"
 #endif /* _INST_LIB_VERSION_H_ */