[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Sync with src/usr.sbin/pkg_...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e4fe6873834
branches:  trunk
changeset: 503113:5e4fe6873834
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Mon Nov 14 09:42:38 2005 +0000

description:
Sync with src/usr.sbin/pkg_install:

Fix first part of PR 32068: pkg_info -Q broken for local binary packages
        Add BUILD_INFO_FNAME to the files to extract for SHOW_BI_VAR.
Bump version.

diffstat:

 pkgtools/pkg_install/files/info/perform.c |  6 +++---
 pkgtools/pkg_install/files/lib/version.h  |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 7d3b4358738a -r 5e4fe6873834 pkgtools/pkg_install/files/info/perform.c
--- a/pkgtools/pkg_install/files/info/perform.c Mon Nov 14 09:17:40 2005 +0000
+++ b/pkgtools/pkg_install/files/info/perform.c Mon Nov 14 09:42:38 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.24 2005/11/07 23:51:14 dillo Exp $       */
+/*     $NetBSD: perform.c,v 1.25 2005/11/14 09:42:38 dillo Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.24 2005/11/07 23:51:14 dillo Exp $");
+__RCSID("$NetBSD: perform.c,v 1.25 2005/11/14 09:42:38 dillo Exp $");
 #endif
 #endif
 
@@ -122,7 +122,7 @@
                                strcat(flist, DESC_FNAME); strcat(flist, " ");
                                if (Flags & SHOW_MTREE)         { strcat(flist, MTREE_FNAME);           strcat(flist, " "); }
                                if (Flags & SHOW_BUILD_VERSION) { strcat(flist, BUILD_VERSION_FNAME);   strcat(flist, " "); }
-                               if (Flags & SHOW_BUILD_INFO)    {
+                               if (Flags & (SHOW_BUILD_INFO|SHOW_BI_VAR)) {
                                        strcat(flist, BUILD_INFO_FNAME);
                                        strcat(flist, " ");
                                }
diff -r 7d3b4358738a -r 5e4fe6873834 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Mon Nov 14 09:17:40 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Mon Nov 14 09:42:38 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.50 2005/11/07 23:51:14 dillo Exp $       */
+/*     $NetBSD: version.h,v 1.51 2005/11/14 09:42:39 dillo 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 "20051107"
+#define PKGTOOLS_VERSION "20051114"
 
 #endif /* _INST_LIB_VERSION_H_ */