>Number:         25494
>Category:       bin
>Synopsis:       [PATCH] pkg_install 20040507 is broken
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri May 07 19:54:01 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 2.0E
>Organization:
	FUKAUMI Naoki
>Environment:
System: NetBSD ea65.naobsd.org 2.0E NetBSD 2.0E (EA65-MP) #0: Thu May 6 02:18:41 JST 2004 root@ea65.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/EA65-MP i386
Architecture: i386
Machine: i386
>Description:
	pkg_install 20040507 couldn't compile because of many errors.
	(hi jlam!)
>How-To-Repeat:
	update source & try to compile src/usr.sbin/pkg_install
>Fix:
Index: usr.sbin/pkg_install/info/info.h
===================================================================
RCS file: /cvsroot/src/usr.sbin/pkg_install/info/info.h,v
retrieving revision 1.15
diff -u -r1.15 info.h
--- usr.sbin/pkg_install/info/info.h	7 May 2004 16:40:30 -0000	1.15
+++ usr.sbin/pkg_install/info/info.h	7 May 2004 19:47:28 -0000
@@ -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_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 *);
Index: usr.sbin/pkg_install/info/main.c
===================================================================
RCS file: /cvsroot/src/usr.sbin/pkg_install/info/main.c,v
retrieving revision 1.40
diff -u -r1.40 main.c
--- usr.sbin/pkg_install/info/main.c	7 May 2004 16:40:30 -0000	1.40
+++ usr.sbin/pkg_install/info/main.c	7 May 2004 19:47:28 -0000
@@ -55,7 +55,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]",
@@ -150,7 +150,7 @@
 			break;
 
 		case 'Q':
-			Flags |= SHOW_BI_VAR;
+			Flags |= SHOW_VAR;
 			BuildInfoVariable = optarg;
 			break;
 
Index: usr.sbin/pkg_install/info/perform.c
===================================================================
RCS file: /cvsroot/src/usr.sbin/pkg_install/info/perform.c,v
retrieving revision 1.52
diff -u -r1.52 perform.c
--- usr.sbin/pkg_install/info/perform.c	7 May 2004 16:40:30 -0000	1.52
+++ usr.sbin/pkg_install/info/perform.c	7 May 2004 19:47:28 -0000
@@ -153,7 +153,7 @@
 
 		(void) snprintf(tmp, sizeof(tmp), "%-19s ", pkg);
 		show_index(tmp, COMMENT_FNAME);
-	} else if (Flags & SHOW_BI_VAR) {
+	} else if (Flags & SHOW_VAR) {
 		show_var(BUILD_INFO_FNAME, BuildInfoVariable);
 	} else {
 		FILE   *fp;
Index: usr.sbin/pkg_install/lib/version.h
===================================================================
RCS file: /cvsroot/src/usr.sbin/pkg_install/lib/version.h,v
retrieving revision 1.51
diff -u -r1.51 version.h
--- usr.sbin/pkg_install/lib/version.h	7 May 2004 16:40:31 -0000	1.51
+++ usr.sbin/pkg_install/lib/version.h	7 May 2004 19:47:28 -0000
@@ -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_ */
>Release-Note:
>Audit-Trail:
>Unformatted: