diff options
| author | jlam <jlam> | 2003-09-02 08:28:22 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-09-02 08:28:22 +0000 |
| commit | 94304d7f3c8d8b4f4e198c2437341d70109fc7b9 (patch) | |
| tree | 7198a3cb156bd83aa89f657e03f0b19123a6cda0 /pkgtools/pkg_install | |
| parent | c844289120b9cf23564f6e1df68899ef1a2b9817 (diff) | |
| download | pkgsrc-94304d7f3c8d8b4f4e198c2437341d70109fc7b9.tar.gz | |
Sync to latest pkg_install sources from the HEAD for pkg_delete
optimizations and man page fixes. Also use recent src2nbcompat to reverse
the order that "config.h" and <nbcompat.h> are included in *.[ch] files.
Diffstat (limited to 'pkgtools/pkg_install')
30 files changed, 91 insertions, 91 deletions
diff --git a/pkgtools/pkg_install/files/add/extract.c b/pkgtools/pkg_install/files/add/extract.c index f8f4a7a8efe..3ae10c6fa17 100644 --- a/pkgtools/pkg_install/files/add/extract.c +++ b/pkgtools/pkg_install/files/add/extract.c @@ -1,9 +1,9 @@ -/* $NetBSD: extract.c,v 1.5 2003/09/02 01:37:04 jlam Exp $ */ +/* $NetBSD: extract.c,v 1.6 2003/09/02 08:28:22 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp"; #else -__RCSID("$NetBSD: extract.c,v 1.5 2003/09/02 01:37:04 jlam Exp $"); +__RCSID("$NetBSD: extract.c,v 1.6 2003/09/02 08:28:22 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/add/futil.c b/pkgtools/pkg_install/files/add/futil.c index 9e15585bca3..a69bf6760a3 100644 --- a/pkgtools/pkg_install/files/add/futil.c +++ b/pkgtools/pkg_install/files/add/futil.c @@ -1,9 +1,9 @@ -/* $NetBSD: futil.c,v 1.2 2003/09/01 16:27:11 jlam Exp $ */ +/* $NetBSD: futil.c,v 1.3 2003/09/02 08:28:23 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: futil.c,v 1.7 1997/10/08 07:45:39 charnier Exp"; #else -__RCSID("$NetBSD: futil.c,v 1.2 2003/09/01 16:27:11 jlam Exp $"); +__RCSID("$NetBSD: futil.c,v 1.3 2003/09/02 08:28:23 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/add/main.c b/pkgtools/pkg_install/files/add/main.c index ffcb3306713..e6a19c06717 100644 --- a/pkgtools/pkg_install/files/add/main.c +++ b/pkgtools/pkg_install/files/add/main.c @@ -1,9 +1,9 @@ -/* $NetBSD: main.c,v 1.3 2003/09/01 16:27:11 jlam Exp $ */ +/* $NetBSD: main.c,v 1.4 2003/09/02 08:28:23 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static char *rcsid = "from FreeBSD Id: main.c,v 1.16 1997/10/08 07:45:43 charnier Exp"; #else -__RCSID("$NetBSD: main.c,v 1.3 2003/09/01 16:27:11 jlam Exp $"); +__RCSID("$NetBSD: main.c,v 1.4 2003/09/02 08:28:23 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 79288ce4515..50d213123d5 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,9 +1,9 @@ -/* $NetBSD: perform.c,v 1.8 2003/09/01 16:27:11 jlam Exp $ */ +/* $NetBSD: perform.c,v 1.9 2003/09/02 08:28:23 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.8 2003/09/01 16:27:11 jlam Exp $"); +__RCSID("$NetBSD: perform.c,v 1.9 2003/09/02 08:28:23 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/add/verify.c b/pkgtools/pkg_install/files/add/verify.c index e179b3a94d6..174ee6fde0d 100644 --- a/pkgtools/pkg_install/files/add/verify.c +++ b/pkgtools/pkg_install/files/add/verify.c @@ -1,4 +1,4 @@ -/* $NetBSD: verify.c,v 1.2 2003/09/01 16:27:11 jlam Exp $ */ +/* $NetBSD: verify.c,v 1.3 2003/09/02 08:28:24 jlam Exp $ */ /* * Copyright (c) 2001 Alistair G. Crooks. All rights reserved. @@ -30,10 +30,10 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -41,7 +41,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1999 \ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: verify.c,v 1.2 2003/09/01 16:27:11 jlam Exp $"); +__RCSID("$NetBSD: verify.c,v 1.3 2003/09/02 08:28:24 jlam Exp $"); #endif #if HAVE_SYS_TYPES_H diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c index b1adcb42f31..c446c907294 100644 --- a/pkgtools/pkg_install/files/admin/main.c +++ b/pkgtools/pkg_install/files/admin/main.c @@ -1,14 +1,14 @@ -/* $NetBSD: main.c,v 1.9 2003/09/01 16:27:11 jlam Exp $ */ +/* $NetBSD: main.c,v 1.10 2003/09/02 08:28:25 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: main.c,v 1.9 2003/09/01 16:27:11 jlam Exp $"); +__RCSID("$NetBSD: main.c,v 1.10 2003/09/02 08:28:25 jlam Exp $"); #endif /* diff --git a/pkgtools/pkg_install/files/create/main.c b/pkgtools/pkg_install/files/create/main.c index ca9537f6b79..a8dcd47b7b2 100644 --- a/pkgtools/pkg_install/files/create/main.c +++ b/pkgtools/pkg_install/files/create/main.c @@ -1,9 +1,9 @@ -/* $NetBSD: main.c,v 1.3 2003/09/01 16:27:12 jlam Exp $ */ +/* $NetBSD: main.c,v 1.4 2003/09/02 08:28:26 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: main.c,v 1.17 1997/10/08 07:46:23 charnier Exp"; #else -__RCSID("$NetBSD: main.c,v 1.3 2003/09/01 16:27:12 jlam Exp $"); +__RCSID("$NetBSD: main.c,v 1.4 2003/09/02 08:28:26 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/create/perform.c b/pkgtools/pkg_install/files/create/perform.c index 2792027ed29..d83b6fe0935 100644 --- a/pkgtools/pkg_install/files/create/perform.c +++ b/pkgtools/pkg_install/files/create/perform.c @@ -1,9 +1,9 @@ -/* $NetBSD: perform.c,v 1.4 2003/09/01 16:27:12 jlam Exp $ */ +/* $NetBSD: perform.c,v 1.5 2003/09/02 08:28:26 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.4 2003/09/01 16:27:12 jlam Exp $"); +__RCSID("$NetBSD: perform.c,v 1.5 2003/09/02 08:28:26 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/create/pl.c b/pkgtools/pkg_install/files/create/pl.c index 8322d05717b..9db350e0407 100644 --- a/pkgtools/pkg_install/files/create/pl.c +++ b/pkgtools/pkg_install/files/create/pl.c @@ -1,9 +1,9 @@ -/* $NetBSD: pl.c,v 1.3 2003/09/01 16:27:12 jlam Exp $ */ +/* $NetBSD: pl.c,v 1.4 2003/09/02 08:28:26 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: pl.c,v 1.11 1997/10/08 07:46:35 charnier Exp"; #else -__RCSID("$NetBSD: pl.c,v 1.3 2003/09/01 16:27:12 jlam Exp $"); +__RCSID("$NetBSD: pl.c,v 1.4 2003/09/02 08:28:26 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c index 80cdc172b92..fd1005a63b6 100644 --- a/pkgtools/pkg_install/files/delete/main.c +++ b/pkgtools/pkg_install/files/delete/main.c @@ -1,9 +1,9 @@ -/* $NetBSD: main.c,v 1.7 2003/09/01 16:27:13 jlam Exp $ */ +/* $NetBSD: main.c,v 1.8 2003/09/02 08:28:27 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp"; #else -__RCSID("$NetBSD: main.c,v 1.7 2003/09/01 16:27:13 jlam Exp $"); +__RCSID("$NetBSD: main.c,v 1.8 2003/09/02 08:28:27 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/delete/perform.c b/pkgtools/pkg_install/files/delete/perform.c index ca871f88e25..d5197fe1c63 100644 --- a/pkgtools/pkg_install/files/delete/perform.c +++ b/pkgtools/pkg_install/files/delete/perform.c @@ -1,9 +1,9 @@ -/* $NetBSD: perform.c,v 1.4 2003/09/01 16:27:13 jlam Exp $ */ +/* $NetBSD: perform.c,v 1.5 2003/09/02 08:28:27 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.4 2003/09/01 16:27:13 jlam Exp $"); +__RCSID("$NetBSD: perform.c,v 1.5 2003/09/02 08:28:27 jlam Exp $"); #endif #endif @@ -715,7 +715,7 @@ pkg_do(char *pkg) if (fexists(REQUIRE_FNAME)) { if (Verbose) printf("Executing 'require' script.\n"); - vsystem("%s +x %s", CHMOD_CMD, REQUIRE_FNAME); /* be sure */ + (void) fexec(CHMOD_CMD, "+x", REQUIRE_FNAME, NULL); /* be sure */ if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) { warnx("package %s fails requirements %s", pkg, Force ? "" : "- not deleted"); @@ -744,7 +744,7 @@ pkg_do(char *pkg) if (Fake) printf("Would execute de-install script at this point (arg: DEINSTALL).\n"); else { - vsystem("%s +x %s", CHMOD_CMD, DEINSTALL_FNAME); /* make sure */ + (void ) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL); /* make sure */ if (vsystem("./%s %s DEINSTALL", DEINSTALL_FNAME, pkg)) { warnx("deinstall script returned error status"); if (!Force) @@ -794,7 +794,7 @@ pkg_do(char *pkg) if (Fake) printf("Would execute post-de-install script at this point (arg: POST-DEINSTALL).\n"); else { - vsystem("%s +x %s", CHMOD_CMD, DEINSTALL_FNAME); /* make sure */ + (void ) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL); /* make sure */ if (vsystem("./%s %s POST-DEINSTALL", DEINSTALL_FNAME, pkg)) { warnx("post-deinstall script returned error status"); if (!Force) @@ -819,7 +819,7 @@ pkg_do(char *pkg) warnx("%s is not empty", LogDir); return 0; } else { - if (vsystem("%s -r %s", REMOVE_CMD, LogDir)) { + if (fexec(REMOVE_CMD, "-r", LogDir, NULL)) { warnx("couldn't remove log entry in %s, deinstall failed", LogDir); if (!Force) return 1; diff --git a/pkgtools/pkg_install/files/info/main.c b/pkgtools/pkg_install/files/info/main.c index c1677f5f3a5..168a7d93520 100644 --- a/pkgtools/pkg_install/files/info/main.c +++ b/pkgtools/pkg_install/files/info/main.c @@ -1,9 +1,9 @@ -/* $NetBSD: main.c,v 1.4 2003/09/01 16:27:13 jlam Exp $ */ +/* $NetBSD: main.c,v 1.5 2003/09/02 08:28:28 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -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.4 2003/09/01 16:27:13 jlam Exp $"); +__RCSID("$NetBSD: main.c,v 1.5 2003/09/02 08:28:28 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c index a2b439ec28e..cdd04593f85 100644 --- a/pkgtools/pkg_install/files/info/perform.c +++ b/pkgtools/pkg_install/files/info/perform.c @@ -1,9 +1,9 @@ -/* $NetBSD: perform.c,v 1.8 2003/09/01 16:27:13 jlam Exp $ */ +/* $NetBSD: perform.c,v 1.9 2003/09/02 08:28:28 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -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.8 2003/09/01 16:27:13 jlam Exp $"); +__RCSID("$NetBSD: perform.c,v 1.9 2003/09/02 08:28:28 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/info/show.c b/pkgtools/pkg_install/files/info/show.c index 98e188dd44e..8469b920a99 100644 --- a/pkgtools/pkg_install/files/info/show.c +++ b/pkgtools/pkg_install/files/info/show.c @@ -1,9 +1,9 @@ -/* $NetBSD: show.c,v 1.2 2003/09/01 16:27:13 jlam Exp $ */ +/* $NetBSD: show.c,v 1.3 2003/09/02 08:28:28 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: show.c,v 1.11 1997/10/08 07:47:38 charnier Exp"; #else -__RCSID("$NetBSD: show.c,v 1.2 2003/09/01 16:27:13 jlam Exp $"); +__RCSID("$NetBSD: show.c,v 1.3 2003/09/02 08:28:28 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/defs.h b/pkgtools/pkg_install/files/lib/defs.h index b9740ccaa28..d2a5228d121 100644 --- a/pkgtools/pkg_install/files/lib/defs.h +++ b/pkgtools/pkg_install/files/lib/defs.h @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.2 2003/09/01 16:27:14 jlam Exp $ */ +/* $NetBSD: defs.h,v 1.3 2003/09/02 08:28:31 jlam Exp $ */ /* * Copyright (c) 1999-2000 Alistair G. Crooks. All rights reserved. @@ -33,10 +33,10 @@ #ifndef DEFS_H_ #define DEFS_H_ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_ERR_H #include <err.h> #endif diff --git a/pkgtools/pkg_install/files/lib/exec.c b/pkgtools/pkg_install/files/lib/exec.c index 6268e238896..b3ed644d170 100644 --- a/pkgtools/pkg_install/files/lib/exec.c +++ b/pkgtools/pkg_install/files/lib/exec.c @@ -1,9 +1,9 @@ -/* $NetBSD: exec.c,v 1.2 2003/09/01 16:27:14 jlam Exp $ */ +/* $NetBSD: exec.c,v 1.3 2003/09/02 08:28:32 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: exec.c,v 1.6 1997/10/08 07:47:50 charnier Exp"; #else -__RCSID("$NetBSD: exec.c,v 1.2 2003/09/01 16:27:14 jlam Exp $"); +__RCSID("$NetBSD: exec.c,v 1.3 2003/09/02 08:28:32 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/fexec.c b/pkgtools/pkg_install/files/lib/fexec.c index 9d1ab6f9e00..34d601791c0 100644 --- a/pkgtools/pkg_install/files/lib/fexec.c +++ b/pkgtools/pkg_install/files/lib/fexec.c @@ -35,10 +35,10 @@ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -65,7 +65,7 @@ #include "lib.h" #ifndef lint -__RCSID("$NetBSD: fexec.c,v 1.1 2003/09/01 16:27:14 jlam Exp $"); +__RCSID("$NetBSD: fexec.c,v 1.2 2003/09/02 08:28:32 jlam Exp $"); #endif static int vfcexec(const char *, const char *, va_list); diff --git a/pkgtools/pkg_install/files/lib/file.c b/pkgtools/pkg_install/files/lib/file.c index 64d4ef1a3e3..cbe57827b43 100644 --- a/pkgtools/pkg_install/files/lib/file.c +++ b/pkgtools/pkg_install/files/lib/file.c @@ -1,9 +1,9 @@ -/* $NetBSD: file.c,v 1.5 2003/09/01 16:27:14 jlam Exp $ */ +/* $NetBSD: file.c,v 1.6 2003/09/02 08:28:32 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp"; #else -__RCSID("$NetBSD: file.c,v 1.5 2003/09/01 16:27:14 jlam Exp $"); +__RCSID("$NetBSD: file.c,v 1.6 2003/09/02 08:28:32 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c index 7f7f742faf7..e7189179589 100644 --- a/pkgtools/pkg_install/files/lib/ftpio.c +++ b/pkgtools/pkg_install/files/lib/ftpio.c @@ -1,14 +1,14 @@ -/* $NetBSD: ftpio.c,v 1.3 2003/09/01 16:27:14 jlam Exp $ */ +/* $NetBSD: ftpio.c,v 1.4 2003/09/02 08:28:33 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: ftpio.c,v 1.3 2003/09/01 16:27:14 jlam Exp $"); +__RCSID("$NetBSD: ftpio.c,v 1.4 2003/09/02 08:28:33 jlam Exp $"); #endif /* diff --git a/pkgtools/pkg_install/files/lib/global.c b/pkgtools/pkg_install/files/lib/global.c index 794d493b938..85480caebff 100644 --- a/pkgtools/pkg_install/files/lib/global.c +++ b/pkgtools/pkg_install/files/lib/global.c @@ -1,9 +1,9 @@ -/* $NetBSD: global.c,v 1.2 2003/09/01 16:27:14 jlam Exp $ */ +/* $NetBSD: global.c,v 1.3 2003/09/02 08:28:33 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: global.c,v 1.6 1997/10/08 07:47:58 charnier Exp"; #else -__RCSID("$NetBSD: global.c,v 1.2 2003/09/01 16:27:14 jlam Exp $"); +__RCSID("$NetBSD: global.c,v 1.3 2003/09/02 08:28:33 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h index 16d0173066f..cc40a739dfb 100644 --- a/pkgtools/pkg_install/files/lib/lib.h +++ b/pkgtools/pkg_install/files/lib/lib.h @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.1 2003/09/01 16:27:15 jlam Exp $ */ +/* $NetBSD: lib.h,v 1.2 2003/09/02 08:28:33 jlam Exp $ */ /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */ @@ -25,10 +25,10 @@ #ifndef _INST_LIB_LIB_H_ #define _INST_LIB_LIB_H_ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_PARAM_H #include <sys/param.h> #endif diff --git a/pkgtools/pkg_install/files/lib/lpkg.c b/pkgtools/pkg_install/files/lib/lpkg.c index 7901269acb5..24a86267b03 100644 --- a/pkgtools/pkg_install/files/lib/lpkg.c +++ b/pkgtools/pkg_install/files/lib/lpkg.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpkg.c,v 1.3 2003/09/01 16:27:15 jlam Exp $ */ +/* $NetBSD: lpkg.c,v 1.4 2003/09/02 08:28:34 jlam Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps @@ -29,10 +29,10 @@ * Package-list auxiliary functions */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_ERR_H #include <err.h> #endif diff --git a/pkgtools/pkg_install/files/lib/path.c b/pkgtools/pkg_install/files/lib/path.c index 143a2df93b5..f4b22929a09 100644 --- a/pkgtools/pkg_install/files/lib/path.c +++ b/pkgtools/pkg_install/files/lib/path.c @@ -1,4 +1,4 @@ -/* $NetBSD: path.c,v 1.3 2003/09/01 16:27:15 jlam Exp $ */ +/* $NetBSD: path.c,v 1.4 2003/09/02 08:28:34 jlam Exp $ */ /*- * Copyright (c)2002 YAMAMOTO Takashi, @@ -26,15 +26,15 @@ * SUCH DAMAGE. */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: path.c,v 1.3 2003/09/01 16:27:15 jlam Exp $"); +__RCSID("$NetBSD: path.c,v 1.4 2003/09/02 08:28:34 jlam Exp $"); #endif #if HAVE_ERR_H diff --git a/pkgtools/pkg_install/files/lib/pen.c b/pkgtools/pkg_install/files/lib/pen.c index 64377e716ba..b98afd6d0b0 100644 --- a/pkgtools/pkg_install/files/lib/pen.c +++ b/pkgtools/pkg_install/files/lib/pen.c @@ -1,9 +1,9 @@ -/* $NetBSD: pen.c,v 1.7 2003/09/01 16:27:15 jlam Exp $ */ +/* $NetBSD: pen.c,v 1.8 2003/09/02 08:28:34 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp"; #else -__RCSID("$NetBSD: pen.c,v 1.7 2003/09/01 16:27:15 jlam Exp $"); +__RCSID("$NetBSD: pen.c,v 1.8 2003/09/02 08:28:34 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c index 07658a4b85b..41f0a44a0ff 100644 --- a/pkgtools/pkg_install/files/lib/pkgdb.c +++ b/pkgtools/pkg_install/files/lib/pkgdb.c @@ -1,14 +1,14 @@ -/* $NetBSD: pkgdb.c,v 1.12 2003/09/02 01:37:05 jlam Exp $ */ +/* $NetBSD: pkgdb.c,v 1.13 2003/09/02 08:28:35 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: pkgdb.c,v 1.12 2003/09/02 01:37:05 jlam Exp $"); +__RCSID("$NetBSD: pkgdb.c,v 1.13 2003/09/02 08:28:35 jlam Exp $"); #endif /* @@ -253,7 +253,7 @@ pkgdb_remove_pkg(const char *pkg) return ret; } -#else /* if !HAVE_DBOPEN */ +#else /* !HAVE_DBOPEN */ int pkgdb_open(int mode) { return -1; } void pkgdb_close(void) {} diff --git a/pkgtools/pkg_install/files/lib/plist.c b/pkgtools/pkg_install/files/lib/plist.c index 6c71b187f9a..80ca9594632 100644 --- a/pkgtools/pkg_install/files/lib/plist.c +++ b/pkgtools/pkg_install/files/lib/plist.c @@ -1,9 +1,9 @@ -/* $NetBSD: plist.c,v 1.4 2003/09/01 16:27:15 jlam Exp $ */ +/* $NetBSD: plist.c,v 1.5 2003/09/02 08:28:35 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp"; #else -__RCSID("$NetBSD: plist.c,v 1.4 2003/09/01 16:27:15 jlam Exp $"); +__RCSID("$NetBSD: plist.c,v 1.5 2003/09/02 08:28:35 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/str.c b/pkgtools/pkg_install/files/lib/str.c index a9cf0c19867..53a2ede3f94 100644 --- a/pkgtools/pkg_install/files/lib/str.c +++ b/pkgtools/pkg_install/files/lib/str.c @@ -1,9 +1,9 @@ -/* $NetBSD: str.c,v 1.3 2003/09/01 16:27:15 jlam Exp $ */ +/* $NetBSD: str.c,v 1.4 2003/09/02 08:28:36 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp"; #else -__RCSID("$NetBSD: str.c,v 1.3 2003/09/01 16:27:15 jlam Exp $"); +__RCSID("$NetBSD: str.c,v 1.4 2003/09/02 08:28:36 jlam Exp $"); #endif #endif diff --git a/pkgtools/pkg_install/files/lib/version.c b/pkgtools/pkg_install/files/lib/version.c index 821102f1a34..69ffd031245 100644 --- a/pkgtools/pkg_install/files/lib/version.c +++ b/pkgtools/pkg_install/files/lib/version.c @@ -1,14 +1,14 @@ -/* $NetBSD: version.c,v 1.2 2003/09/01 16:27:16 jlam Exp $ */ +/* $NetBSD: version.c,v 1.3 2003/09/02 08:28:36 jlam Exp $ */ -#include <nbcompat.h> #if HAVE_CONFIG_H #include "config.h" #endif +#include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: version.c,v 1.2 2003/09/01 16:27:16 jlam Exp $"); +__RCSID("$NetBSD: version.c,v 1.3 2003/09/02 08:28:36 jlam Exp $"); #endif /* diff --git a/pkgtools/pkg_install/files/view/pkg_view.1 b/pkgtools/pkg_install/files/view/pkg_view.1 index e2cbd6c587d..5fbfe0a944d 100644 --- a/pkgtools/pkg_install/files/view/pkg_view.1 +++ b/pkgtools/pkg_install/files/view/pkg_view.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_view.1,v 1.2 2003/09/01 16:51:45 wiz Exp $ +.\" $NetBSD: pkg_view.1,v 1.3 2003/09/02 08:28:36 jlam Exp $ .\" .\" Copyright (c) 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -184,7 +184,7 @@ If the flag isn't given, then the value of the environment variable .Ev PKG_DBDIR is the package database directory for the default view, -otherwise it defaults to +otherwise it defaults to .Pa /var/db/pkg . .It Ev PLIST_IGNORE_FILES This can be used to specify files in diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1 index ebd75fbe4c4..0644266c16f 100644 --- a/pkgtools/pkg_install/files/view/pkg_view.cat1 +++ b/pkgtools/pkg_install/files/view/pkg_view.cat1 @@ -133,12 +133,12 @@ FFIILLEESS able PKG_PREFIX set to the path to the _v_i_e_w directory. SSEEEE AALLSSOO - pkg_delete(1), linkfarm(1) - -BBUUGGSS - Only the empty view is supported. + linkfarm(1), pkg_delete(1) AAUUTTHHOORRSS The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@netbsd.org>. +BBUUGGSS + Only the empty view is supported. + NetBSD 1.6.1_STABLE July 13, 2003 3 |