diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-03 15:44:18 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-03 15:44:18 +0000 |
| commit | 73ba3ef5c6dabcf3f27ff45c68dff9dd55297fa5 (patch) | |
| tree | 68489e1c74e2a4f24c02d18c37cd9b49c68d2440 | |
| parent | 46e6de189b7f57bf73f6d77206dad2859e4461d0 (diff) | |
| download | pkgsrc-73ba3ef5c6dabcf3f27ff45c68dff9dd55297fa5.tar.gz | |
Fix bootstrap issues reported by tnn@
| -rw-r--r-- | pkgtools/pkg_install/files/create/build.c | 14 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/create/perform.c | 7 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/create/util.c | 18 |
3 files changed, 26 insertions, 13 deletions
diff --git a/pkgtools/pkg_install/files/create/build.c b/pkgtools/pkg_install/files/create/build.c index 2efd597da04..4bdd7c69196 100644 --- a/pkgtools/pkg_install/files/create/build.c +++ b/pkgtools/pkg_install/files/create/build.c @@ -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 @@ __RCSID("$NetBSD: build.c,v 1.1 2007/08/03 13:15:59 joerg Exp $"); #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 --git a/pkgtools/pkg_install/files/create/perform.c b/pkgtools/pkg_install/files/create/perform.c index 90b1a8e25e2..ad055fa2e62 100644 --- a/pkgtools/pkg_install/files/create/perform.c +++ b/pkgtools/pkg_install/files/create/perform.c @@ -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 @@ __RCSID("$NetBSD: perform.c,v 1.15 2007/08/03 13:15:59 joerg Exp $"); #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 --git a/pkgtools/pkg_install/files/create/util.c b/pkgtools/pkg_install/files/create/util.c index 1588e9be59e..4f6f9e3e2c2 100644 --- a/pkgtools/pkg_install/files/create/util.c +++ b/pkgtools/pkg_install/files/create/util.c @@ -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" |