pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Sync to latest pkg_install ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b4a96d283243
branches: trunk
changeset: 460642:b4a96d283243
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Sep 02 08:28:22 2003 +0000
description:
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:
pkgtools/pkg_install/files/add/extract.c | 6 +++---
pkgtools/pkg_install/files/add/futil.c | 6 +++---
pkgtools/pkg_install/files/add/main.c | 6 +++---
pkgtools/pkg_install/files/add/perform.c | 6 +++---
pkgtools/pkg_install/files/add/verify.c | 6 +++---
pkgtools/pkg_install/files/admin/main.c | 6 +++---
pkgtools/pkg_install/files/create/main.c | 6 +++---
pkgtools/pkg_install/files/create/perform.c | 6 +++---
pkgtools/pkg_install/files/create/pl.c | 6 +++---
pkgtools/pkg_install/files/delete/main.c | 6 +++---
pkgtools/pkg_install/files/delete/perform.c | 14 +++++++-------
pkgtools/pkg_install/files/info/main.c | 6 +++---
pkgtools/pkg_install/files/info/perform.c | 6 +++---
pkgtools/pkg_install/files/info/show.c | 6 +++---
pkgtools/pkg_install/files/lib/defs.h | 4 ++--
pkgtools/pkg_install/files/lib/exec.c | 6 +++---
pkgtools/pkg_install/files/lib/fexec.c | 4 ++--
pkgtools/pkg_install/files/lib/file.c | 6 +++---
pkgtools/pkg_install/files/lib/ftpio.c | 6 +++---
pkgtools/pkg_install/files/lib/global.c | 6 +++---
pkgtools/pkg_install/files/lib/lib.h | 4 ++--
pkgtools/pkg_install/files/lib/lpkg.c | 4 ++--
pkgtools/pkg_install/files/lib/path.c | 6 +++---
pkgtools/pkg_install/files/lib/pen.c | 6 +++---
pkgtools/pkg_install/files/lib/pkgdb.c | 8 ++++----
pkgtools/pkg_install/files/lib/plist.c | 6 +++---
pkgtools/pkg_install/files/lib/str.c | 6 +++---
pkgtools/pkg_install/files/lib/version.c | 6 +++---
pkgtools/pkg_install/files/view/pkg_view.1 | 4 ++--
pkgtools/pkg_install/files/view/pkg_view.cat1 | 8 ++++----
30 files changed, 91 insertions(+), 91 deletions(-)
diffs (truncated from 743 to 300 lines):
diff -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/add/extract.c
--- a/pkgtools/pkg_install/files/add/extract.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/add/extract.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/add/futil.c
--- a/pkgtools/pkg_install/files/add/futil.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/add/futil.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/add/main.c
--- a/pkgtools/pkg_install/files/add/main.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/add/main.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/add/verify.c
--- a/pkgtools/pkg_install/files/add/verify.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/add/verify.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/admin/main.c
--- a/pkgtools/pkg_install/files/admin/main.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/admin/main.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/create/main.c
--- a/pkgtools/pkg_install/files/create/main.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/create/main.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/create/perform.c
--- a/pkgtools/pkg_install/files/create/perform.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/create/perform.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/create/pl.c
--- a/pkgtools/pkg_install/files/create/pl.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/create/pl.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/delete/main.c
--- a/pkgtools/pkg_install/files/delete/main.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/delete/main.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 -r 00b6d44f0baf -r b4a96d283243 pkgtools/pkg_install/files/delete/perform.c
--- a/pkgtools/pkg_install/files/delete/perform.c Tue Sep 02 08:26:35 2003 +0000
+++ b/pkgtools/pkg_install/files/delete/perform.c Tue Sep 02 08:28:22 2003 +0000
@@ -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 @@
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 @@
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 @@
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 @@
warnx("%s is not empty", LogDir);
return 0;
} else {
- if (vsystem("%s -r %s", REMOVE_CMD, LogDir)) {
+ if (fexec(REMOVE_CMD, "-r", LogDir, NULL)) {
Home |
Main Index |
Thread Index |
Old Index