diff options
| -rw-r--r-- | sysutils/fam/distinfo | 14 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-aa | 6 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-ab | 30 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-am | 13 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-ar | 18 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-as | 16 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-ax | 6 |
7 files changed, 69 insertions, 34 deletions
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo index fa37af2fd0d..eb9f17aa785 100644 --- a/sysutils/fam/distinfo +++ b/sysutils/fam/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2004/11/19 12:35:22 sketch Exp $ +$NetBSD: distinfo,v 1.17 2004/12/09 18:45:32 minskim Exp $ SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 Size (fam-2.7.0.tar.gz) = 301974 bytes -SHA1 (patch-aa) = 97f73077cf7845cc0ac13247b0d2ee92a1d722d6 -SHA1 (patch-ab) = 0ca86059b8e4f9ba59537c6525acf35784e35743 +SHA1 (patch-aa) = 9e777dc42b92081b8ca8670277c561f0b6e28d9f +SHA1 (patch-ab) = faac6d48f2c807d5a854a17e4ea43ef94315299a SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863 SHA1 (patch-ad) = 19364c8dd3f887a59f41556206c8c2d179577932 SHA1 (patch-ae) = aa8fed958555d6870367fd202a6117ddcb5a1da9 @@ -14,17 +14,17 @@ SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5 SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1 SHA1 (patch-al) = e0b4c3ca447f42573def07e8b47209ec6e6ad016 -SHA1 (patch-am) = 12e4d17ded9ca12df9788d34c0f3e3d1ba301e9a +SHA1 (patch-am) = b06dc11c5bf2671cc07bf326bd8f2689a7275450 SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81 SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62 SHA1 (patch-ap) = bbb31577e0cc9ffb8ccbce75082ccddd917d7cea SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28 -SHA1 (patch-ar) = dd88a28f4951ff110949d0d79dc6aee18fc9e065 -SHA1 (patch-as) = 52c3788e2d08b8fccbef3f57fa888b0c2ea52daf +SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a +SHA1 (patch-as) = ff23d2425587e08cac1344884d3557c7761adcef SHA1 (patch-at) = 209f89cefac326e6c1b99bec4622ba0d6eabe1e4 SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b SHA1 (patch-av) = e79813d88ec48a886688539da34150c5bd229a0a SHA1 (patch-aw) = 9e5de9617e6cd59644294695d0ea79427b521ba0 -SHA1 (patch-ax) = 59d31ea4735ed964ac508874c422fe5bfc8efd5e +SHA1 (patch-ax) = b93f160e8b0e4fb6e1c8c30823443136fcb55204 SHA1 (patch-ay) = 081b4bc7cf25a8e30b3680b6df7599570ea0db86 SHA1 (patch-az) = 13901fdef8c13318d585e36820c5e0aa4c28f889 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 |