Update fam to 2.7.0. Fixes the following PR's:

- PR pkg/23017 - PR pkg/23495 - PR pkg/23496 - PR pkg/24578 The patches for 23017 and 24578 were provided by reed@. Although rh@ suspended PR 23017 saying that pkgsrc does not support installation to /usr, this still needs to be fixed because the same problem occurs even when LOCALBASE != /usr. Changes since 2.6.10: Changed NOGROUP usage in src/Cred.c++ to -1 as NOGROUP is not defined in IRIX. (mraymond@sgi.com) removed const modifier from Scheduler.h to fix GCC 3.x build. (wardle@sgi.com) created new GNU autotools files: - test whether we have IMon rather than testing OS. - test whether we have sockaddr length members rather than testing OS. - install daemon in sbin rather than bin. - install manual pages in typical GNU/Linux sections. - rename daemon to famd. - rename fam source directory to src. - rename libfam source directory to lib. - remove editconf and util subdirectory. - remove rpm target and build subdirectory. - remove support target and subdirectory. [wardle@sgi.com] (wardle@sgi.com) fixed warnings about typenames in BTree.h. (wardle@sgi.com)
author: minskim <minskim> 2004-03-28 22:00:04 +0000
committer: minskim <minskim> 2004-03-28 22:00:04 +0000
commit: 329f332c0b3eb5898aa2b478089895fff6fa5bda (patch)
tree: 9006fbb05c524ad6bbbc2525efc44bad72ba3117 /sysutils/fam
parent: 314906216dd1efa0228f8355b4c85032d4f6d0b9 (diff)
download: pkgsrc-329f332c0b3eb5898aa2b478089895fff6fa5bda.tar.gz
19 files changed, 269 insertions, 786 deletions
diff --git a/sysutils/fam/MESSAGE b/sysutils/fam/MESSAGE
index 7fde6859f7a..07d709071cf 100644
--- a/sysutils/fam/MESSAGE
+++ b/sysutils/fam/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/03/22 13:57:01 minskim Exp $
+$NetBSD: MESSAGE,v 1.3 2004/03/28 22:00:04 minskim Exp $
 
 FAM uses RPC and is usually started by the inetd(8) superserver.  You need
 to enable it manually, by issuing the following steps:
@@ -12,6 +12,6 @@ to enable it manually, by issuing the following steps:
 2) Add FAM to the system's superserver by appending the following line to
    the /etc/inetd.conf file:
 
-        sgi_fam/1-2 stream rpc/tcp wait root ${PREFIX}/bin/fam fam
+        sgi_fam/1-2 stream rpc/tcp wait root ${PREFIX}/sbin/famd famd
 
 ===========================================================================
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index f57138c31de..adcc4462ebc 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/28 22:00:05 minskim Exp $
 #
 
-DISTNAME=		fam-2.6.10
+DISTNAME=		fam-2.7.0
 CATEGORIES=		sysutils devel
 MASTER_SITES=		ftp://oss.sgi.com/projects/fam/download/stable/	\
 			ftp://ftp.tuwien.ac.at/opsys/linux/gentoo/distfiles/ \
@@ -11,6 +11,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://oss.sgi.com/projects/fam/
 COMMENT=		File Alteration Monitor
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
@@ -22,4 +24,10 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 EGDIR=			${PREFIX}/share/examples/fam
 CONF_FILES=		${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf
 
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	man/famd.conf.5 man/famd.8
+SUBST_SED.paths=	-e 's,/usr/local/etc/,${PKG_SYSCONFDIR}/,g'
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/PLIST b/sysutils/fam/PLIST
index f73d3826abd..9e18cfb9e25 100644
--- a/sysutils/fam/PLIST
+++ b/sysutils/fam/PLIST
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/17 19:43:39 jmmv Exp $
-bin/fam
+@comment $NetBSD: PLIST,v 1.4 2004/03/28 22:00:05 minskim Exp $
 include/fam.h
-lib/fam/editconf.perl
 lib/libfam.a
 lib/libfam.la
 lib/libfam.so
 lib/libfam.so.0
 lib/libfam.so.0.0
-man/man1/fam.1
 man/man3/fam.3
+man/man5/famd.conf.5
+man/man8/famd.8
+sbin/famd
 share/examples/fam/fam.conf
 @dirrm share/examples/fam
-@dirrm lib/fam
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index e12693b966c..89cb940f80d 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.7 2004/03/21 07:35:17 minskim Exp $
+$NetBSD: distinfo,v 1.8 2004/03/28 22:00:05 minskim Exp $
 
-SHA1 (fam-2.6.10.tar.gz) = 24899a1afe6a520c6980f1c41d5657db01d11692
-Size (fam-2.6.10.tar.gz) = 321189 bytes
-SHA1 (patch-ab) = 60897dc25f7e18f584cba0c6d22538b1d0b11ecf
-SHA1 (patch-ae) = e07e52e8011e2f22e0391d33764a223e6ac769a4
-SHA1 (patch-af) = c982b3e2ada3274881990c5ea183ca692ff543fe
-SHA1 (patch-ag) = 059eb7191fc03765e0840a0faed0b27eb6919b74
-SHA1 (patch-ah) = a31f816d61127636663d16ad8e87169715661e3c
-SHA1 (patch-ai) = 62e013a8559aa5207085d80ed0bb77e005a4788e
-SHA1 (patch-aj) = fef780df2fd6241144ba7e6da71ac66c61468ed0
-SHA1 (patch-ak) = dc18202214fc0ce153ecbab2a4f7759e32d9e11f
-SHA1 (patch-an) = 8416a0de32fec6cbf615083d44fd0b5add5cd8e3
-SHA1 (patch-ao) = aa9e0cd237460004d4e1f89a3f4bced11ee620b7
-SHA1 (patch-ap) = 75ca4b6a32f1c3ed1a085457b4de9bb228242fad
-SHA1 (patch-au) = 5e87df2bb202b6a45f588474a4df1e7ecc575288
-SHA1 (patch-av) = 8da3b718921df0f4a1e9a8924c6914d1bdc03bab
-SHA1 (patch-aw) = e94071bbefa01c54232915a0fbe211984e59943b
-SHA1 (patch-ax) = 40890a24d0c767324b1432fb0a0585f3084e6d17
+SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
+Size (fam-2.7.0.tar.gz) = 301974 bytes
+SHA1 (patch-aa) = 22f1abd11e8367e0c1d0c146e4d8c14dc249a189
+SHA1 (patch-ab) = a486fd2b7330a0942717fd2aebb0fbdeb3c87dc7
+SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863
+SHA1 (patch-ad) = b8e621acd36811a76a84af82e6f2b5962973e344
+SHA1 (patch-ae) = 225a0bd5195be3d3d75edf021b27bed19d84dc15
+SHA1 (patch-af) = 57946b3837479b641bb002620ae41008f49af995
+SHA1 (patch-ag) = fa5889ad6d93af72d7efe83784caf61b2ac39d6a
+SHA1 (patch-ah) = d7763198df76d1f0783342a8961b59879e8e1241
+SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5
+SHA1 (patch-aj) = 7aa752e629ad32925ec58cbe1532e8c9bd454a24
+SHA1 (patch-ao) = 64827309bf91a2018629e28fef20109dde3fbf01
+SHA1 (patch-ap) = b8084876217ca0b8510175ca753a6bbe9378438e
+SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b
+SHA1 (patch-ax) = 3f341c6e63ca0014d28675dda174f63647e988f7
diff --git a/sysutils/fam/patches/patch-ab b/sysutils/fam/patches/patch-ab
index 8c3c15b6137..4eec6e8cf34 100644
--- a/sysutils/fam/patches/patch-ab
+++ b/sysutils/fam/patches/patch-ab
@@ -1,13 +1,37 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:20 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2004/03/28 22:00:05 minskim Exp $
 
---- config.h.in.orig	Fri Dec 21 10:00:06 2001
+--- config.h.in.orig	2003-01-19 18:40:15.000000000 -0600
 +++ config.h.in
-@@ -12,6 +12,8 @@
- /*  Define if the system has imon and IMONIOC_ ioctl flags.  */
- #undef HAVE_IMON
+@@ -52,6 +52,9 @@
+ /* Define to 1 if you have the `select' function. */
+ #undef HAVE_SELECT
  
++/* Define to 1 if you have the `unsetenv' function. */
++#undef HAVE_UNSETENV
++
+ /* Define to 1 if the system has the type `socklen_t'. */
+ #undef HAVE_SOCKLEN_T
+ 
+@@ -76,6 +79,9 @@
+ /* Define to 1 if `sa_len' is member of `struct sockaddr'. */
+ #undef HAVE_STRUCT_SOCKADDR_SA_LEN
+ 
++/* Define to 1 if `sun_len' is member of `struct sockaddr_un'. */
++#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
++
+ /* Define to 1 if you have the <syslog.h> header file. */
+ #undef HAVE_SYSLOG_H
+ 
+@@ -120,6 +126,12 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
++/* Define to 1 if you have the <mntent.h> header file. */
 +#undef HAVE_MNTENT_H
 +
- /*  Define if the system has the struct revokdi and the IMONIOC_REVOKDI
- **  ioctl flag.  (IRIX 5.3 doesn't.)
- */
++/* Define to 1 if you have the <sys/sysmacros.h> header file. */
++#undef HAVE_SYS_SYSMACROS_H
++
+ /* Define to 1 if the system has the type `_Bool'. */
+ #undef HAVE__BOOL
+ 
diff --git a/sysutils/fam/patches/patch-ae b/sysutils/fam/patches/patch-ae
index 7114ccbb021..3b0d1892498 100644
--- a/sysutils/fam/patches/patch-ae
+++ b/sysutils/fam/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2004/03/28 22:00:05 minskim Exp $
 
---- fam/FileSystem.c++.orig	Tue Dec 18 11:03:37 2001
-+++ fam/FileSystem.c++
+--- src/FileSystem.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/FileSystem.c++
 @@ -22,7 +22,7 @@
  
  #include "FileSystem.h"
  
 -#include <mntent.h>
-+#include "mntent.h"
++#include "fam-mntent.h"
  #include <string.h>
  
  #include "Event.h"
diff --git a/sysutils/fam/patches/patch-af b/sysutils/fam/patches/patch-af
index 31f15d1fd40..c83fb561f82 100644
--- a/sysutils/fam/patches/patch-af
+++ b/sysutils/fam/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-af,v 1.3 2004/03/28 22:00:05 minskim Exp $
 
---- fam/FileSystemTable.c++.orig	Tue Dec 18 11:03:37 2001
-+++ fam/FileSystemTable.c++
+--- src/FileSystemTable.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/FileSystemTable.c++
 @@ -21,11 +21,13 @@
  //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
  
@@ -10,19 +10,19 @@ $NetBSD: patch-af,v 1.2 2002/08/25 19:23:21 jlam Exp $
  #include "FileSystemTable.h"
  
 -#include <mntent.h>
-+#include "mntent.h"
++#include "fam-mntent.h"
  #include <stdlib.h>
  #include <string.h>
 +#include <sys/param.h>
  
  #if HAVE_STATVFS
  #include <sys/statvfs.h>
-@@ -255,7 +257,10 @@
+@@ -255,7 +257,10 @@ FileSystemTable::find(const char *path, 
      //  create_fs_by_name initializes our "root" member variable.
      if (!fs_by_name)
      {   create_fs_by_name();
 +#if !defined(BSD)
-+	/* there is no mtab "file" in BSD */
++        /* there is no mtab "file" in BSD */
  	mtab_watcher = new InternalClient(mtab_name, mtab_event_handler, NULL);
 +#endif
      }
diff --git a/sysutils/fam/patches/patch-ag b/sysutils/fam/patches/patch-ag
index 12ddec90b46..3d8fce2cc61 100644
--- a/sysutils/fam/patches/patch-ag
+++ b/sysutils/fam/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2002/12/17 19:43:40 jmmv Exp $
+$NetBSD: patch-ag,v 1.4 2004/03/28 22:00:05 minskim Exp $
 
---- fam/IMon.c++.orig	Tue Jul 16 08:14:41 2002
-+++ fam/IMon.c++
+--- src/IMon.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/IMon.c++
 @@ -25,6 +25,7 @@
  #include <assert.h>
  #include <errno.h>
@@ -10,12 +10,13 @@ $NetBSD: patch-ag,v 1.3 2002/12/17 19:43:40 jmmv Exp $
  
  #if HAVE_IMON
  #ifdef __sgi
-@@ -34,7 +35,7 @@
+@@ -34,7 +35,9 @@
  #endif
  #endif
  
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #  include <sys/sysmacros.h>
- #endif
++#if HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
++#endif
  #include <unistd.h>
+ 
+ #include "Interest.h"
diff --git a/sysutils/fam/patches/patch-ah b/sysutils/fam/patches/patch-ah
index 6dd509643b7..f41859744b7 100644
--- a/sysutils/fam/patches/patch-ah
+++ b/sysutils/fam/patches/patch-ah
@@ -1,13 +1,14 @@
-$NetBSD: patch-ah,v 1.3 2002/12/17 19:43:40 jmmv Exp $
+$NetBSD: patch-ah,v 1.4 2004/03/28 22:00:05 minskim Exp $
 
---- fam/Interest.c++.orig	Tue Jul 16 08:14:41 2002
-+++ fam/Interest.c++
-@@ -25,7 +25,7 @@
- #include <string.h>
- #include <errno.h>
+--- src/Interest.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/Interest.c++
+@@ -23,7 +23,9 @@
+ #include "Interest.h"
+ 
  #include <sys/param.h>
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #  include <sys/sysmacros.h>
- #endif
++#if HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
++#endif
  
+ #include <errno.h>
+ #include <string.h>
diff --git a/sysutils/fam/patches/patch-ai b/sysutils/fam/patches/patch-ai
index 17c73de7666..cd2d44ae73a 100644
--- a/sysutils/fam/patches/patch-ai
+++ b/sysutils/fam/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-ai,v 1.3 2004/03/28 22:00:05 minskim Exp $
 
---- fam/InternalClient.c++.orig	Tue Dec 18 11:03:37 2001
-+++ fam/InternalClient.c++
-@@ -35,8 +35,8 @@
+--- src/InternalClient.c++.orig	2003-01-18 08:18:12.000000000 -0600
++++ src/InternalClient.c++
+@@ -35,8 +35,8 @@ InternalClient::InternalClient(const cha
  {
      assert(filename);
      assert(h);
diff --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj
index cf94acea5e4..b85187f830f 100644
--- a/sysutils/fam/patches/patch-aj
+++ b/sysutils/fam/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.4 2004/02/09 18:14:45 jmmv Exp $
+$NetBSD: patch-aj,v 1.5 2004/03/28 22:00:05 minskim Exp $
 
---- fam/Listener.c++.orig	2003-04-15 06:52:40.000000000 +0200
-+++ fam/Listener.c++
+--- src/Listener.c++.orig	2003-01-19 18:37:29.000000000 -0600
++++ src/Listener.c++
 @@ -22,6 +22,8 @@
  
  #include "Listener.h"
@@ -10,8 +10,8 @@ $NetBSD: patch-aj,v 1.4 2004/02/09 18:14:45 jmmv Exp $
 +#include <stdlib.h>
  #include <assert.h>
  #include <fcntl.h>
- #include <stdlib.h>
-@@ -33,6 +35,7 @@
+ #include <sys/types.h>
+@@ -32,6 +34,7 @@
  #include <rpc/clnt.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
@@ -19,30 +19,30 @@ $NetBSD: patch-aj,v 1.4 2004/02/09 18:14:45 jmmv Exp $
  #include <sys/stat.h>
  #include <sys/un.h>
  #include <unistd.h>
-@@ -206,7 +209,7 @@ Listener::create_local_client(TCP_Client
-     putenv("TMPDIR=");
+@@ -209,7 +212,7 @@ Listener::create_local_client(TCP_Client
+ #endif
  
      char *tmpfile = tempnam("/tmp", ".fam");
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#ifdef HAVE_SOCKADDR_SUN_LEN
++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
      sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
  #else
      sockaddr_un sun = { AF_UNIX, "" };
-@@ -280,7 +283,7 @@ Listener::accept_localclient(int ofd, vo
+@@ -283,7 +286,7 @@ Listener::accept_localclient(int ofd, vo
  
      // Get the new socket.
  
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#ifdef HAVE_SOCKADDR_SUN_LEN
++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
      struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
  #else
      struct sockaddr_un sun = { AF_UNIX, "" };
-@@ -346,7 +349,7 @@ Listener::accept_localclient(int ofd, vo
+@@ -349,7 +352,7 @@ Listener::accept_localclient(int ofd, vo
  void
  Listener::dirty_ugly_hack()
  {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#ifdef HAVE_SOCKADDR_SUN_LEN
++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
      static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, "/tmp/.fam_socket" };
  #else
      static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };
diff --git a/sysutils/fam/patches/patch-ak b/sysutils/fam/patches/patch-ak
deleted file mode 100644
index bd8591edf69..00000000000
--- a/sysutils/fam/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/12/17 19:43:41 jmmv Exp $
-
---- fam/Log.c++.orig	Tue Jul 16 08:16:14 2002
-+++ fam/Log.c++
-@@ -28,6 +28,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/sysutils/fam/patches/patch-an b/sysutils/fam/patches/patch-an
deleted file mode 100644
index 3333283de63..00000000000
--- a/sysutils/fam/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/StringTable.h.orig	Tue Dec 18 11:03:37 2001
-+++ fam/StringTable.h
-@@ -25,6 +25,7 @@
- 
- #include <assert.h>
- #include <string.h>
-+#include "mntent.h"
- 
- //  A StringTable maps C strings onto values.  It is a cheap O(n)
- //  implementation, suitable only for small tables that are
diff --git a/sysutils/fam/patches/patch-ao b/sysutils/fam/patches/patch-ao
index 57b32eed875..949feadc71e 100644
--- a/sysutils/fam/patches/patch-ao
+++ b/sysutils/fam/patches/patch-ao
@@ -1,11 +1,11 @@
-$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:22 jlam Exp $
+$NetBSD: patch-ao,v 1.3 2004/03/28 22:00:05 minskim Exp $
 
---- fam/mntent.h.orig	Sun May 12 19:15:01 2002
-+++ fam/mntent.h
+--- src/fam-mntent.h.orig	Sun May 12 19:15:01 2002
++++ src/fam-mntent.h
 @@ -0,0 +1,56 @@
 +/*
 + *  mntent
-+ *  mntent.h - compatability header for BSD
++ *  fam-mntent.h - compatability header for BSD
 + *
 + *  Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
 + *  All rights reserved.
diff --git a/sysutils/fam/patches/patch-ap b/sysutils/fam/patches/patch-ap
index f38ba19a80f..cae3260914e 100644
--- a/sysutils/fam/patches/patch-ap
+++ b/sysutils/fam/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:22 jlam Exp $
+$NetBSD: patch-ap,v 1.3 2004/03/28 22:00:05 minskim Exp $
 
---- fam/mntent_compat.c++.orig	Sun May 12 19:37:49 2002
-+++ fam/mntent_compat.c++
+--- src/mntent_compat.c++.orig	Sun May 12 19:37:49 2002
++++ src/mntent_compat.c++
 @@ -0,0 +1,174 @@
 +/*
 + * Copyright (c) 1980, 1989, 1993, 1994
@@ -41,7 +41,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:22 jlam Exp $
 +/* most of this was ripped from the mount(3) source */
 +
 +#include "config.h"
-+#include "mntent.h"
++#include "fam-mntent.h"
 +#if !defined(HAVE_MNTENT_H)
 +#include <stdlib.h>
 +#include <string.h>
diff --git a/sysutils/fam/patches/patch-au b/sysutils/fam/patches/patch-au
index d5e28dc5b08..55ca66edf25 100644
--- a/sysutils/fam/patches/patch-au
+++ b/sysutils/fam/patches/patch-au
@@ -1,29 +1,20 @@
-$NetBSD: patch-au,v 1.4 2004/02/09 18:14:45 jmmv Exp $
+$NetBSD: patch-au,v 1.5 2004/03/28 22:00:05 minskim Exp $
 
---- fam/Makefile.in.orig	2003-04-15 08:18:34.000000000 +0200
-+++ fam/Makefile.in
-@@ -25,7 +25,7 @@ bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -181,6 +181,7 @@ fam_SOURCES = \
+--- src/Makefile.in.orig	2003-01-19 18:38:44.000000000 -0600
++++ src/Makefile.in
+@@ -161,6 +161,7 @@ famd_SOURCES = \
    main.c++ \
    timeval.c++ \
    timeval.h \
 +  mntent_compat.c++ \
-   @IMON_FUNCS@.c++
+   @MONITOR_FUNCS@.c++
  
  
-@@ -207,6 +208,7 @@ am_fam_OBJECTS = Activity.$(OBJEXT) Clie
+@@ -185,6 +186,7 @@ am_famd_OBJECTS = Activity.$(OBJEXT) Cli
  	Scheduler.$(OBJEXT) ServerConnection.$(OBJEXT) \
  	ServerHost.$(OBJEXT) ServerHostRef.$(OBJEXT) \
  	TCP_Client.$(OBJEXT) main.$(OBJEXT) timeval.$(OBJEXT) \
-+        mntent_compat.$(OBJEXT) \
- 	@IMON_FUNCS@.$(OBJEXT)
- fam_OBJECTS = $(am_fam_OBJECTS)
- fam_DEPENDENCIES = $(top_srcdir)/support/libsupport.a
++	mntent_compat.$(OBJEXT) \
+ 	@MONITOR_FUNCS@.$(OBJEXT)
+ famd_OBJECTS = $(am_famd_OBJECTS)
+ famd_LDADD = $(LDADD)
diff --git a/sysutils/fam/patches/patch-av b/sysutils/fam/patches/patch-av
deleted file mode 100644
index ed67873ce7c..00000000000
--- a/sysutils/fam/patches/patch-av
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-av,v 1.3 2004/02/09 18:14:45 jmmv Exp $
-
---- Makefile.in.orig	2003-04-15 08:17:10.000000000 +0200
-+++ Makefile.in
-@@ -427,7 +427,6 @@ install-data-am:
- 
- install-exec-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
- install-info: install-info-recursive
- 
diff --git a/sysutils/fam/patches/patch-aw b/sysutils/fam/patches/patch-aw
deleted file mode 100644
index 4c9f7955194..00000000000
--- a/sysutils/fam/patches/patch-aw
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aw,v 1.3 2004/02/09 18:14:45 jmmv Exp $
-
---- man/Makefile.in.orig	2003-04-15 08:19:24.000000000 +0200
-+++ man/Makefile.in
-@@ -143,7 +143,7 @@ install-man1: $(man1_MANS) $(man_MANS)
- 	for i in $$list; do \
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=1; \
- 	  case "$$ext" in \
- 	    1*) ;; \
- 	    *) ext='1' ;; \
-@@ -186,7 +186,7 @@ install-man3: $(man3_MANS) $(man_MANS)
- 	for i in $$list; do \
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=3; \
- 	  case "$$ext" in \
- 	    3*) ;; \
- 	    *) ext='3' ;; \
diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax
index 73bae41bc09..a14e7a7b3b8 100644
--- a/sysutils/fam/patches/patch-ax
+++ b/sysutils/fam/patches/patch-ax
@@ -1,645 +1,164 @@
-$NetBSD: patch-ax,v 1.4 2004/03/21 07:35:17 minskim Exp $
+$NetBSD: patch-ax,v 1.5 2004/03/28 22:00:05 minskim Exp $
 
---- configure.orig	2003-04-15 01:17:16.000000000 -0500
+--- configure.orig	2003-11-26 13:47:26.000000000 -0600
 +++ configure
-@@ -8899,18 +8899,18 @@ fi
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.57 for fam 2.7.0-pre1.
++# Generated by GNU Autoconf 2.57 for fam 2.7.0.
+ #
+ # Report bugs to <fam@oss.sgi.com>.
+ #
+@@ -1128,7 +1128,7 @@ cat >&5 <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
  
- echo "Using imon support module $IMON_FUNCS"
+-It was created by fam $as_me 2.7.0-pre1, which was
++It was created by fam $as_me 2.7.0, which was
+ generated by GNU Autoconf 2.57.  Invocation command line was
  
--if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
--echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
--if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-+if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
-+echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/statvfs.h usability" >&5
--echo $ECHO_N "checking sys/statvfs.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking sys/syssgi.h usability" >&5
-+echo $ECHO_N "checking sys/syssgi.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -8919,7 +8919,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <sys/statvfs.h>
-+#include <sys/syssgi.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -8945,8 +8945,8 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
+   $ $0 $@
+@@ -9053,7 +9053,9 @@ fi
  
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/statvfs.h presence" >&5
--echo $ECHO_N "checking sys/statvfs.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking sys/syssgi.h presence" >&5
-+echo $ECHO_N "checking sys/syssgi.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -8954,7 +8954,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <sys/statvfs.h>
-+#include <sys/syssgi.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -8987,10 +8987,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc in
-   yes:no )
--    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9001,12 +9001,12 @@ _ASBOX
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
-   no:yes )
--    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: sys/statvfs.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/syssgi.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9017,42 +9017,42 @@ _ASBOX
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
--echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
--if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-+echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
-+echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_header_sys_statvfs_h=$ac_header_preproc
-+  ac_cv_header_sys_syssgi_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
  
- fi
--if test $ac_cv_header_sys_statvfs_h = yes; then
-+if test $ac_cv_header_sys_syssgi_h = yes; then
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_STATVFS 1
-+#define HAVE_SYSSGI 1
- _ACEOF
-- have_statvfs="yes"
+ 
+-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
 +
- else
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_STATVFS 0
-+#define HAVE_SYSSGI 0
- _ACEOF
-- have_statvfs="no"
 +
- fi
- 
- 
--if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
--echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
--if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
-+if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
-+echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/syssgi.h usability" >&5
--echo $ECHO_N "checking sys/syssgi.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking sys/fs/nfs_clnt.h usability" >&5
-+echo $ECHO_N "checking sys/fs/nfs_clnt.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -9061,7 +9061,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <sys/syssgi.h>
-+#include <sys/fs/nfs_clnt.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -9087,8 +9087,8 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/syssgi.h presence" >&5
--echo $ECHO_N "checking sys/syssgi.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking sys/fs/nfs_clnt.h presence" >&5
-+echo $ECHO_N "checking sys/fs/nfs_clnt.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -9096,7 +9096,7 @@ _ACEOF
++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/sysmacros.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -9833,7 +9835,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
--#include <sys/syssgi.h>
-+#include <sys/fs/nfs_clnt.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -9129,10 +9129,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc in
-   yes:no )
--    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/fs/nfs_clnt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9143,12 +9143,12 @@ _ASBOX
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
-   no:yes )
--    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: sys/syssgi.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/fs/nfs_clnt.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/fs/nfs_clnt.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9159,42 +9159,50 @@ _ASBOX
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
--echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
--if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
-+echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
-+echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_header_sys_syssgi_h=$ac_header_preproc
-+  ac_cv_header_sys_fs_nfs_clnt_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
- 
- fi
--if test $ac_cv_header_sys_syssgi_h = yes; then
-+if test $ac_cv_header_sys_fs_nfs_clnt_h = yes; then
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYSSGI 1
-+#define HAVE_SYS_FS_NFS_CLNT_H 1
- _ACEOF
- 
- else
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYSSGI 0
-+#define HAVE_SYS_FS_NFS_CLNT_H 0
- _ACEOF
- 
- fi
- 
- 
--if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
--echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
--if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
-+
-+if test `uname` != 'IRIX' && test `uname` != 'IRIX64'; then
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STATVFS 0
-+_ACEOF
+-$ac_includes_default
++#include <sys/socket.h>
 +
-+    have_statvfs="no"
-+else
-+    if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
-+echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/fs/nfs_clnt.h usability" >&5
--echo $ECHO_N "checking sys/fs/nfs_clnt.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking sys/statvfs.h usability" >&5
-+echo $ECHO_N "checking sys/statvfs.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -9203,7 +9211,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <sys/fs/nfs_clnt.h>
-+#include <sys/statvfs.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -9229,8 +9237,8 @@ echo "$as_me:$LINENO: result: $ac_header
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/fs/nfs_clnt.h presence" >&5
--echo $ECHO_N "checking sys/fs/nfs_clnt.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking sys/statvfs.h presence" >&5
-+echo $ECHO_N "checking sys/statvfs.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -9238,7 +9246,7 @@ _ACEOF
+ int
+ main ()
+ {
+@@ -9868,7 +9871,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
--#include <sys/fs/nfs_clnt.h>
-+#include <sys/statvfs.h>
+-$ac_includes_default
++#include <sys/socket.h>
++
+ int
+ main ()
+ {
+@@ -9910,7 +9914,101 @@ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
  _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -9271,10 +9279,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc in
-   yes:no )
--    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: sys/fs/nfs_clnt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9285,12 +9293,12 @@ _ASBOX
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
-   no:yes )
--    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: sys/fs/nfs_clnt.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: sys/fs/nfs_clnt.h: check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9301,37 +9309,29 @@ _ASBOX
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
--echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
--if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
-+echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
-+echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_header_sys_fs_nfs_clnt_h=$ac_header_preproc
-+  ac_cv_header_sys_statvfs_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
  
- fi
--if test $ac_cv_header_sys_fs_nfs_clnt_h = yes; then
-+if test $ac_cv_header_sys_statvfs_h = yes; then
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYS_FS_NFS_CLNT_H 1
-+#define HAVE_STATVFS 1
- _ACEOF
--
-+ have_statvfs="yes"
- else
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYS_FS_NFS_CLNT_H 0
--_ACEOF
--
--fi
--
--
--
--if test `uname` != 'IRIX' && test `uname` != 'IRIX64'; then
--    cat >>confdefs.h <<\_ACEOF
- #define HAVE_STATVFS 0
- _ACEOF
-+ have_statvfs="no"
+-struct sockaddr_un.sun_len
++
 +fi
- 
--    have_statvfs="no"
- fi
- 
- echo "$as_me:$LINENO: checking SGI_NOHANG" >&5
-@@ -9670,6 +9670,41 @@ _ACEOF
- fi
- 
- 
-+ac_safe=`echo "mntent.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for mntent.h""... $ac_c" 1>&6
-+echo "configure:5516: checking for mntent.h" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
++
++echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5
++echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6
++if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5521 "configure"
-+#include "confdefs.h"
-+#include <mntent.h>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
++  cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/un.h>
++
++int
++main ()
++{
++static struct sockaddr_un ac_aggr;
++if (ac_aggr.sun_len)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_sockaddr_un_sun_len=yes
 +else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_MNTENT_H 1
-+EOF
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/un.h>
++
++int
++main ()
++{
++static struct sockaddr_un ac_aggr;
++if (sizeof ac_aggr.sun_len)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_sockaddr_un_sun_len=yes
 +else
-+  echo "$ac_t""no" 1>&6
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_member_struct_sockaddr_un_sun_len=no
 +fi
- echo "$as_me:$LINENO: checking for mountlist struct" >&5
- echo $ECHO_N "checking for mountlist struct... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9791,203 +9826,6 @@ fi
- 
++rm -f conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6
++if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
++_ACEOF
++
++
+ fi
  
  
--    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_NFS" >&5
--echo $ECHO_N "checking mntent.h for MNTTYPE_NFS... $ECHO_C" >&6
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <mntent.h>
--int
--main ()
--{
--const char *foo = MNTTYPE_NFS;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  fam_have_decl_in_mntent=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fam_have_decl_in_mntent=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
--echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
--    if test "$fam_have_decl_in_mntent" = "yes"; then
--	:
--    else
--	{ { echo "$as_me:$LINENO: error: Didn't find MNTTYPE_NFS in mntent.h" >&5
--echo "$as_me: error: Didn't find MNTTYPE_NFS in mntent.h" >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--
--
--    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_NFS2" >&5
--echo $ECHO_N "checking mntent.h for MNTTYPE_NFS2... $ECHO_C" >&6
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <mntent.h>
--int
--main ()
--{
--const char *foo = MNTTYPE_NFS2;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  fam_have_decl_in_mntent=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fam_have_decl_in_mntent=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
--echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
--    if test "$fam_have_decl_in_mntent" = "yes"; then
--	cat >>confdefs.h <<\_ACEOF
--#define HAVE_MNTTYPE_NFS2 1
--_ACEOF
--
--    else
--	:
--    fi
--
--
--    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_NFS3" >&5
--echo $ECHO_N "checking mntent.h for MNTTYPE_NFS3... $ECHO_C" >&6
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <mntent.h>
--int
--main ()
--{
--const char *foo = MNTTYPE_NFS3;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  fam_have_decl_in_mntent=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fam_have_decl_in_mntent=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
--echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
--    if test "$fam_have_decl_in_mntent" = "yes"; then
--	cat >>confdefs.h <<\_ACEOF
--#define HAVE_MNTTYPE_NFS3 1
--_ACEOF
--
--    else
--	:
--    fi
--
--
--    echo "$as_me:$LINENO: checking mntent.h for MNTTYPE_CACHEFS" >&5
--echo $ECHO_N "checking mntent.h for MNTTYPE_CACHEFS... $ECHO_C" >&6
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <mntent.h>
--int
--main ()
--{
--const char *foo = MNTTYPE_CACHEFS;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  fam_have_decl_in_mntent=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fam_have_decl_in_mntent=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    echo "$as_me:$LINENO: result: $fam_have_decl_in_mntent" >&5
--echo "${ECHO_T}$fam_have_decl_in_mntent" >&6
--    if test "$fam_have_decl_in_mntent" = "yes"; then
--	cat >>confdefs.h <<\_ACEOF
--#define HAVE_MNTTYPE_CACHEFS 1
--_ACEOF
--
--    else
--	:
--    fi
+@@ -10646,7 +10744,7 @@ _ASBOX
+ } >&5
+ cat >&5 <<_CSEOF
  
+-This file was extended by fam $as_me 2.7.0-pre1, which was
++This file was extended by fam $as_me 2.7.0, which was
+ generated by GNU Autoconf 2.57.  Invocation command line was
  
- echo "$as_me:$LINENO: checking netinet/in.h for bindresvport()" >&5
+   CONFIG_FILES    = $CONFIG_FILES
author	minskim <minskim>	2004-03-28 22:00:04 +0000
committer	minskim <minskim>	2004-03-28 22:00:04 +0000
commit	329f332c0b3eb5898aa2b478089895fff6fa5bda (patch)
tree	9006fbb05c524ad6bbbc2525efc44bad72ba3117 /sysutils/fam
parent	314906216dd1efa0228f8355b4c85032d4f6d0b9 (diff)
download	pkgsrc-329f332c0b3eb5898aa2b478089895fff6fa5bda.tar.gz