Patches added recently for Solaris don't work on Linux, because they

include headers which are unavailable on Linux.  Modify the patches so
that those headers are included only when they are found by configure.

6 files changed, 62 insertions, 27 deletions

diff --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa
index 56f4d35609a..6d7ece7657b 100644
--- a/sysutils/fam/patches/patch-aa
+++ b/sysutils/fam/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-aa,v 1.8 2004/12/09 18:45:32 minskim Exp $
 
---- configure.ac.orig	2003-11-26 20:47:59.000000000 +0100
+--- configure.ac.orig	2003-11-26 13:47:59.000000000 -0600
 +++ configure.ac
 @@ -31,7 +31,7 @@ AC_CHECK_LIB([rpcsvc], [pmap_set])
  # Checks for header files.
  AC_HEADER_STDC
  AC_HEADER_DIRENT
 -AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h])
-+AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h mntent.h sys/mnttab.h sys/sysmacros.h])
++AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpc/rpcent.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/filio.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h mntent.h sys/mnttab.h sys/sysmacros.h])
  
  if test "$have_sys_imon_h"; then
  	MONITOR_FUNCS=IMonIRIX
diff --git a/sysutils/fam/patches/patch-ab b/sysutils/fam/patches/patch-ab
index 6cb88ddcc16..2c455537926 100644
--- a/sysutils/fam/patches/patch-ab
+++ b/sysutils/fam/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.4 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-ab,v 1.5 2004/12/09 18:45:32 minskim Exp $
 
---- config.h.in.orig	2003-01-20 00:40:15.000000000 +0000
-+++ config.h.in	2004-11-08 14:04:04.600109000 +0000
-@@ -52,6 +52,9 @@
+--- config.h.in.orig	2003-01-19 18:40:15.000000000 -0600
++++ config.h.in
+@@ -49,9 +49,15 @@
+ /* Define to 1 if you have the <rpc/rpc.h> header file. */
+ #undef HAVE_RPC_RPC_H
+ 
++/* Define to 1 if you have the <rpc/rpcent.h> header file. */
++#undef HAVE_RPC_RPCENT_H
++
  /* Define to 1 if you have the `select' function. */
  #undef HAVE_SELECT
  
@@ -12,7 +18,7 @@ $NetBSD: patch-ab,v 1.4 2004/11/19 12:35:22 sketch Exp $
  /* Define to 1 if the system has the type `socklen_t'. */
  #undef HAVE_SOCKLEN_T
  
-@@ -76,6 +79,9 @@
+@@ -76,6 +82,9 @@
  /* Define to 1 if `sa_len' is member of `struct sockaddr'. */
  #undef HAVE_STRUCT_SOCKADDR_SA_LEN
  
@@ -22,7 +28,17 @@ $NetBSD: patch-ab,v 1.4 2004/11/19 12:35:22 sketch Exp $
  /* Define to 1 if you have the <syslog.h> header file. */
  #undef HAVE_SYSLOG_H
  
-@@ -120,6 +126,15 @@
+@@ -83,6 +92,9 @@
+    */
+ #undef HAVE_SYS_DIR_H
+ 
++/* Define to 1 if you have the <sys/filio.h> header file. */
++#undef HAVE_SYS_FILIO_H
++
+ /* Define to 1 if you have the <sys/imon.h> header file. */
+ #undef HAVE_SYS_IMON_H
+ 
+@@ -120,6 +132,15 @@
  /* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H
  
@@ -38,7 +54,7 @@ $NetBSD: patch-ab,v 1.4 2004/11/19 12:35:22 sketch Exp $
  /* Define to 1 if the system has the type `_Bool'. */
  #undef HAVE__BOOL
  
-@@ -180,3 +192,9 @@
+@@ -180,3 +201,9 @@
  
  /* Define to `int' if <sys/types.h> doesn't define. */
  #undef uid_t
diff --git a/sysutils/fam/patches/patch-am b/sysutils/fam/patches/patch-am
index 7f6bd60855a..dc43058380e 100644
--- a/sysutils/fam/patches/patch-am
+++ b/sysutils/fam/patches/patch-am
@@ -1,12 +1,17 @@
-$NetBSD: patch-am,v 1.4 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-am,v 1.5 2004/12/09 18:45:32 minskim Exp $
 
---- lib/fam.c++.orig	2003-01-18 14:18:12.000000000 +0000
-+++ lib/fam.c++	2004-11-08 13:45:48.827971000 +0000
-@@ -22,6 +22,7 @@
+--- lib/fam.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ lib/fam.c++
+@@ -20,8 +20,12 @@
+ //  with this program; if not, write the Free Software Foundation, Inc., 59
+ //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
  
++#include "config.h"
  #include <sys/types.h>
  #include <rpc/rpc.h>
++#ifdef HAVE_RPC_RCPENT_H
 +#include <rpc/rpcent.h>
++#endif
  #include <sys/time.h>
  #include <unistd.h>
  #include <stdlib.h>
diff --git a/sysutils/fam/patches/patch-ar b/sysutils/fam/patches/patch-ar
index 503c1a6e7ae..42b17dea3ed 100644
--- a/sysutils/fam/patches/patch-ar
+++ b/sysutils/fam/patches/patch-ar
@@ -1,12 +1,22 @@
-$NetBSD: patch-ar,v 1.4 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-ar,v 1.5 2004/12/09 18:45:32 minskim Exp $
 
---- src/NetConnection.c++.orig	2003-01-18 14:18:12.000000000 +0000
-+++ src/NetConnection.c++	2004-11-08 13:45:49.439816000 +0000
-@@ -29,6 +29,7 @@
+--- src/NetConnection.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/NetConnection.c++
+@@ -21,6 +21,7 @@
+ //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ 
+ #include "NetConnection.h"
++#include "config.h"
+ 
+ #include <assert.h>
+ #include <errno.h>
+@@ -29,6 +30,9 @@
  #include <stdio.h>
  #include <string.h>
  #include <sys/ioctl.h>
++#ifdef HAVE_SYS_FILIO_H
 +#include <sys/filio.h>
++#endif
  #include <sys/socket.h>
  #include <unistd.h>
  #include <netinet/in.h>
diff --git a/sysutils/fam/patches/patch-as b/sysutils/fam/patches/patch-as
index 9bf314217a3..806b7c94147 100644
--- a/sysutils/fam/patches/patch-as
+++ b/sysutils/fam/patches/patch-as
@@ -1,13 +1,15 @@
-$NetBSD: patch-as,v 1.4 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-as,v 1.5 2004/12/09 18:45:32 minskim Exp $
 
---- src/RPC_TCP_Connector.c++.orig	2003-01-18 14:18:12.000000000 +0000
-+++ src/RPC_TCP_Connector.c++	2004-11-09 09:44:26.581058000 +0000
-@@ -22,10 +22,19 @@
+--- src/RPC_TCP_Connector.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/RPC_TCP_Connector.c++
+@@ -21,11 +21,23 @@
+ //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
  
  #include "RPC_TCP_Connector.h"
- 
-+#define PORTMAP
++#include "config.h"
 +
++#define PORTMAP
+ 
  #include <errno.h>
 +#ifdef __SUNPRO_CC
 +extern "C" {
@@ -18,7 +20,9 @@ $NetBSD: patch-as,v 1.4 2004/11/19 12:35:22 sketch Exp $
 +}
 +#endif
  #include <sys/ioctl.h>
++#ifdef HAVE_SYS_FILIO_H
 +#include <sys/filio.h>
++#endif
  #include <sys/socket.h>
  #include <unistd.h>
  #include <string.h>
diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax
index 4b9cccf3458..7b032993970 100644
--- a/sysutils/fam/patches/patch-ax
+++ b/sysutils/fam/patches/patch-ax
@@ -1,6 +1,6 @@
-$NetBSD: patch-ax,v 1.9 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-ax,v 1.10 2004/12/09 18:45:32 minskim Exp $
 
---- configure.orig	2003-11-26 20:47:26.000000000 +0100
+--- configure.orig	2003-11-26 13:47:26.000000000 -0600
 +++ configure
 @@ -1,6 +1,6 @@
  #! /bin/sh
@@ -26,7 +26,7 @@ $NetBSD: patch-ax,v 1.9 2004/11/19 12:35:22 sketch Exp $
 -for ac_header in fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h
 +
 +
-+for ac_header in fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h mntent.h sys/mnttab.h sys/sysmacros.h
++for ac_header in fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpc/rcpent.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/filio.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h mntent.h sys/mnttab.h sys/sysmacros.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then