[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Import pkg_install-20040508...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bebb67f5f216
branches:  trunk
changeset: 474982:bebb67f5f216
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat May 08 14:51:23 2004 +0000

description:
Import pkg_install-20040508.  Fixes the -N flag to not cause the -Q
codepath to be executed by correcting the SHOW_* macro definitions.  Also
fix up some function prototypes so this builds with -Wall.  Fixes from
pkg/25494.

diffstat:

 pkgtools/pkg_install/files/info/info.h   |  6 +++---
 pkgtools/pkg_install/files/info/main.c   |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (71 lines):

diff -r 95b1c6bcf81c -r bebb67f5f216 pkgtools/pkg_install/files/info/info.h
--- a/pkgtools/pkg_install/files/info/info.h    Sat May 08 13:35:20 2004 +0000
+++ b/pkgtools/pkg_install/files/info/info.h    Sat May 08 14:51:23 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: info.h,v 1.4 2004/05/07 16:40:41 jlam Exp $ */
+/* $NetBSD: info.h,v 1.5 2004/05/08 14:51:23 jlam Exp $ */
 
 /* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
 
@@ -51,7 +51,7 @@
 #define SHOW_PKG_SIZE          0x08000
 #define SHOW_ALL_SIZE          0x10000
 #define SHOW_BLD_DEPENDS       0x20000
-#define SHOW_BI_VAR            0x20000
+#define SHOW_BI_VAR            0x40000
 
 extern int Flags;
 extern Boolean AllInstalled;
@@ -66,7 +66,7 @@
 extern lpkg_head_t pkgs;
 
 extern void show_file(char *, char *);
-extern void show_build_info_var(const char *);
+extern void show_var(const char *, const char *);
 extern void show_plist(char *, package_t *, pl_ent_t);
 extern void show_files(char *, package_t *);
 extern void show_depends(char *, package_t *);
diff -r 95b1c6bcf81c -r bebb67f5f216 pkgtools/pkg_install/files/info/main.c
--- a/pkgtools/pkg_install/files/info/main.c    Sat May 08 13:35:20 2004 +0000
+++ b/pkgtools/pkg_install/files/info/main.c    Sat May 08 14:51:23 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.9 2004/05/07 16:40:41 jlam Exp $    */
+/*     $NetBSD: main.c,v 1.10 2004/05/08 14:51:23 jlam Exp $   */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.14 1997/10/08 07:47:26 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.9 2004/05/07 16:40:41 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 2004/05/08 14:51:23 jlam Exp $");
 #endif
 #endif
 
@@ -67,7 +67,7 @@
 static void
 usage(void)
 {
-       fprintf(stderr, "%s\n%s\n%s\n",
+       fprintf(stderr, "%s\n%s\n%s\n%s\n",
            "usage: pkg_info [-BbcDdFfIikLmNnpqRrSsVvh] [-e package] [-l prefix]",
            "                pkg-name [pkg-name ...]",
            "       pkg_info -a [flags]",
diff -r 95b1c6bcf81c -r bebb67f5f216 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sat May 08 13:35:20 2004 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sat May 08 14:51:23 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.29 2004/05/07 16:40:41 jlam Exp $        */
+/*     $NetBSD: version.h,v 1.30 2004/05/08 14:51:23 jlam Exp $        */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20040507"
+#define PKGTOOLS_VERSION "20040508"
 
 #endif /* _INST_LIB_VERSION_H_ */