diff options
| author | dillo <dillo> | 2005-11-14 09:42:38 +0000 |
|---|---|---|
| committer | dillo <dillo> | 2005-11-14 09:42:38 +0000 |
| commit | 7c436b9157f8856083f11d1b1670f5301104f6de (patch) | |
| tree | a154538efc7940da1b90985ea3c42a5e39429757 /pkgtools/pkg_install | |
| parent | cea2ecbfb75265e6ff0c04256a08ae4eda9ee89b (diff) | |
| download | pkgsrc-7c436b9157f8856083f11d1b1670f5301104f6de.tar.gz | |
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 (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/info/perform.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c index aebd86a43a4..d159c49d636 100644 --- a/pkgtools/pkg_install/files/info/perform.c +++ b/pkgtools/pkg_install/files/info/perform.c @@ -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 @@ pkg_do(char *pkg) 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 --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 60380470bfe..12da4101c11 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -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_ */ |