Do not check for or include sys/param.h

This resolves issues on platforms which MACHINE & MACHINE_ARCH is explicitly
defined, such as OpenBSD/amd64 & Bitrig/amd64 where we would like to build with
MACHINE_ARCH=x86_64 but can't as a platform check fails when installing
packages after bootstrap
pkg_add: Warning: package `digest-20121220' was built for a platform:
pkg_add: OpenBSD/x86_64 5.8 (pkg) vs. OpenBSD/amd64 5.8 (this host)

Tested on
Mac OS X Tiger/PowerPC
OpenBSD
Bitrig
Solaris 10/SPARC
FreeBSD 10.2-RELEASE & 11-CURRENT
DragonFlyBSD
Debian 8
OmniOS

Reviewed by joerg@

6 files changed, 10 insertions, 24 deletions

diff --git a/pkgtools/pkg_install/files/add/main.c b/pkgtools/pkg_install/files/add/main.c
index de7f2dc5b93..b80ae881fa6 100644
--- a/pkgtools/pkg_install/files/add/main.c
+++ b/pkgtools/pkg_install/files/add/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.30 2015/07/20 13:59:44 khorben Exp $	*/
+/*	$NetBSD: main.c,v 1.31 2015/10/15 13:31:27 sevan Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.30 2015/07/20 13:59:44 khorben Exp $");
+__RCSID("$NetBSD: main.c,v 1.31 2015/10/15 13:31:27 sevan Exp $");
 
 /*
  *
@@ -33,9 +33,6 @@ __RCSID("$NetBSD: main.c,v 1.30 2015/07/20 13:59:44 khorben Exp $");
 #if HAVE_ERR_H
 #include <err.h>
 #endif
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 #include "lib.h"
 #include "add.h"
 
diff --git a/pkgtools/pkg_install/files/configure b/pkgtools/pkg_install/files/configure
index 024230c0a91..9265af2e526 100755
--- a/pkgtools/pkg_install/files/configure
+++ b/pkgtools/pkg_install/files/configure
@@ -4813,9 +4813,8 @@ fi
 
 done
 
-for ac_header in sys/cdefs.h sys/file.h sys/ioctl.h sys/param.h \
-	sys/queue.h sys/stat.h sys/time.h sys/types.h sys/utsname.h \
-	sys/wait.h
+for ac_header in sys/cdefs.h sys/file.h sys/ioctl.h sys/queue.h \
+	sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/pkgtools/pkg_install/files/configure.ac b/pkgtools/pkg_install/files/configure.ac
index 12a4205fc5e..462facee833 100644
--- a/pkgtools/pkg_install/files/configure.ac
+++ b/pkgtools/pkg_install/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.39 2015/01/22 18:15:39 pho Exp $
+dnl $NetBSD: configure.ac,v 1.40 2015/10/15 13:31:27 sevan Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 AC_INIT([pkg_install], [20090911], [joerg@NetBSD.org])
@@ -67,9 +67,8 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([assert.h ctype.h dirent.h err.h errno.h fnctl.h \
 	fnmatch.h glob.h grp.h inttypes.h limits.h pwd.h signal.h \
 	stdarg.h stdio.h stdlib.h string.h time.h unistd.h vis.h])
-AC_CHECK_HEADERS([sys/cdefs.h sys/file.h sys/ioctl.h sys/param.h \
-	sys/queue.h sys/stat.h sys/time.h sys/types.h sys/utsname.h \
-	sys/wait.h])
+AC_CHECK_HEADERS([sys/cdefs.h sys/file.h sys/ioctl.h sys/queue.h \
+	sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h])
 
 # Checks for library functions.
 AC_CHECK_FUNCS([vfork])
diff --git a/pkgtools/pkg_install/files/lib/config.h.in b/pkgtools/pkg_install/files/lib/config.h.in
index 7181b0f20d5..695e2eb150e 100644
--- a/pkgtools/pkg_install/files/lib/config.h.in
+++ b/pkgtools/pkg_install/files/lib/config.h.in
@@ -72,9 +72,6 @@
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
 /* Define to 1 if you have the <sys/queue.h> header file. */
 #undef HAVE_SYS_QUEUE_H
 
diff --git a/pkgtools/pkg_install/files/lib/file.c b/pkgtools/pkg_install/files/lib/file.c
index 82d5f235108..281ef2a0906 100644
--- a/pkgtools/pkg_install/files/lib/file.c
+++ b/pkgtools/pkg_install/files/lib/file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.c,v 1.30 2010/09/15 13:18:02 joerg Exp $	*/
+/*	$NetBSD: file.c,v 1.31 2015/10/15 13:31:27 sevan Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,13 +7,10 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 #if HAVE_SYS_QUEUE_H
 #include <sys/queue.h>
 #endif
-__RCSID("$NetBSD: file.c,v 1.30 2010/09/15 13:18:02 joerg Exp $");
+__RCSID("$NetBSD: file.c,v 1.31 2015/10/15 13:31:27 sevan Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h
index eabeae2f6f1..7032575922f 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.66 2015/09/01 12:14:06 jperkin Exp $ */
+/* $NetBSD: lib.h,v 1.67 2015/10/15 13:31:27 sevan Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -29,9 +29,6 @@
 #include "config.h"
 #endif
 #include <nbcompat.h>
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif