[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/create Fix bootstrap issues...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5125a3632dbe
branches:  trunk
changeset: 531638:5125a3632dbe
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Aug 03 15:44:18 2007 +0000

description:
Fix bootstrap issues reported by tnn@

diffstat:

 pkgtools/pkg_install/files/create/build.c   |  14 +++++++-------
 pkgtools/pkg_install/files/create/perform.c |   7 ++-----
 pkgtools/pkg_install/files/create/util.c    |  18 +++++++++++++++++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diffs (103 lines):

diff -r b8fc570ddb30 -r 5125a3632dbe pkgtools/pkg_install/files/create/build.c
--- a/pkgtools/pkg_install/files/create/build.c Fri Aug 03 15:12:43 2007 +0000
+++ b/pkgtools/pkg_install/files/create/build.c Fri Aug 03 15:44:18 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: build.c,v 1.1 2007/08/03 13:15:59 joerg Exp $  */
+/*     $NetBSD: build.c,v 1.2 2007/08/03 15:44:18 joerg 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.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: build.c,v 1.1 2007/08/03 13:15:59 joerg Exp $");
+__RCSID("$NetBSD: build.c,v 1.2 2007/08/03 15:44:18 joerg Exp $");
 #endif
 #endif
 
@@ -41,16 +41,16 @@
 #if HAVE_ERR_H
 #include <err.h>
 #endif
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+#if HAVE_GRP_H
+#include <grp.h>
+#endif
+#if HAVE_PWD_H
+#include <pwd.h>
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include <pwd.h>
-#include <grp.h>
-
 #include <archive.h>
 #include <archive_entry.h>
 
diff -r b8fc570ddb30 -r 5125a3632dbe pkgtools/pkg_install/files/create/perform.c
--- a/pkgtools/pkg_install/files/create/perform.c       Fri Aug 03 15:12:43 2007 +0000
+++ b/pkgtools/pkg_install/files/create/perform.c       Fri Aug 03 15:44:18 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.15 2007/08/03 13:15:59 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.16 2007/08/03 15:44:18 joerg 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.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.15 2007/08/03 13:15:59 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.16 2007/08/03 15:44:18 joerg Exp $");
 #endif
 #endif
 
@@ -41,9 +41,6 @@
 #if HAVE_ERR_H
 #include <err.h>
 #endif
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff -r b8fc570ddb30 -r 5125a3632dbe pkgtools/pkg_install/files/create/util.c
--- a/pkgtools/pkg_install/files/create/util.c  Fri Aug 03 15:12:43 2007 +0000
+++ b/pkgtools/pkg_install/files/create/util.c  Fri Aug 03 15:44:18 2007 +0000
@@ -33,14 +33,30 @@
 
 #include <nbcompat.h>
 
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#if HAVE_ERR_H
 #include <err.h>
-#include <pwd.h>
+#endif
+#if HAVE_PWD_H
 #include <grp.h>
+#endif
+#if HAVE_PWD_H
+#include <pwd.h>
+#endif
+#if HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+#if HAVE_TIME_H
 #include <time.h>
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "lib.h"
 #include "create.h"