diff options
| author | jlam <jlam@pkgsrc.org> | 2004-05-08 14:51:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-05-08 14:51:23 +0000 |
| commit | fe56564bbd759d3b88ca37f299094f8809b8debc (patch) | |
| tree | b0e0db05f0919b66cd354a8b52abe6a664a6fec7 /pkgtools | |
| parent | 97dbaacc1213c2c163015348a56c243ffcc2056f (diff) | |
| download | pkgsrc-fe56564bbd759d3b88ca37f299094f8809b8debc.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/info/info.h | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/info/main.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgtools/pkg_install/files/info/info.h b/pkgtools/pkg_install/files/info/info.h index 5c62757f5b9..a3e3d101196 100644 --- a/pkgtools/pkg_install/files/info/info.h +++ b/pkgtools/pkg_install/files/info/info.h @@ -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 size_t termwidth; 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 --git a/pkgtools/pkg_install/files/info/main.c b/pkgtools/pkg_install/files/info/main.c index ef617388a25..512e75a680c 100644 --- a/pkgtools/pkg_install/files/info/main.c +++ b/pkgtools/pkg_install/files/info/main.c @@ -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 @@ lpkg_head_t pkgs; 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 --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index f851dc330fb..e3f4d0d847a 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.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_ */ |