Update fam to 2.6.9. Changes since 2.6.7:

fam-2.6.9

    added idle_timeout and nfs_polling_interval options to fam.conf.
    [joup@bigfoot.com, wardle@sgi.com] (wardle@sgi.com)

    use daemon() as an alternative to _daemonize() to background the
    fam process if it is available.
    [wardle@sgi.com] (wardle@sgi.com)

    allow for different socket structure on FreeBSD and other small
    changes to assist FreeBSD build.
    [daverufino@btinternet.com, ports@geeksrus.net] (wardle@sgi.com)

fam-2.6.8

    #include some standard header files to help build on FreeBSD.
    (wardle@sgi.com)

    improved group handling from IRIX.
    (wardle@sgi.com)

    untrusted user's GID is set to NOGROUP if getgrmember() gave FAM
    an invalid or inconsistent GID.
    (wardle@sgi.com)

    should now handle strerror returning null.
    (wardle@sgi.com)

    initalize libtool earlier in the configure process to avoid binaries
    being created with a .C extension on some systems.
    [alexl@redhat.com] (wardle@sgi.com)

    added libstdc++ to linker flags to make libfam always build as a
    C++ library.
    (wardle@sgi.com)

    added CLEANFILES make target.
    (wardle@sgi.com)

    /etc/mtab (or equivalent) is now opened read-only.
    (wardle@sgi.com)

Approved by wiz.

14 files changed, 93 insertions, 184 deletions

diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index a63e761ff87..059ecd527e6 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/10/02 22:30:59 dillo Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/17 19:43:39 jmmv Exp $
 #
 
-DISTNAME=		fam-2.6.7
+DISTNAME=		fam-2.6.9
 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,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://oss.sgi.com/projects/fam/
 COMMENT=		File Alteration Monitor
 
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
diff --git a/sysutils/fam/PLIST b/sysutils/fam/PLIST
index bac0efcad7a..f73d3826abd 100644
--- a/sysutils/fam/PLIST
+++ b/sysutils/fam/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:23:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/17 19:43:39 jmmv Exp $
 bin/fam
-etc/fam.conf.sample
 include/fam.h
 lib/fam/editconf.perl
 lib/libfam.a
@@ -10,4 +9,6 @@ lib/libfam.so.0
 lib/libfam.so.0.0
 man/man1/fam.1
 man/man3/fam.3
+share/examples/fam/fam.conf
+@dirrm share/examples/fam
 @dirrm lib/fam
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index b25d7f852d2..c19e9bbc509 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,28 +1,23 @@
-$NetBSD: distinfo,v 1.4 2002/10/02 22:30:59 dillo Exp $
+$NetBSD: distinfo,v 1.5 2002/12/17 19:43:39 jmmv Exp $
 
-SHA1 (fam-2.6.7.tar.gz) = ca03cb4120e3cc7f6bb08c8183b358e240bd5d36
-Size (fam-2.6.7.tar.gz) = 241203 bytes
+SHA1 (fam-2.6.9.tar.gz) = 44fb01afce9bd209a01575ba6a6ecc71af5d9add
+Size (fam-2.6.9.tar.gz) = 282627 bytes
 SHA1 (patch-aa) = 6aa9a0ecda1d51ffa3e4ac2a45c02a9e629bb8bd
 SHA1 (patch-ab) = 60897dc25f7e18f584cba0c6d22538b1d0b11ecf
 SHA1 (patch-ac) = 5e76e34ebb14e9db2c76f5bdcbfd31cb70991d70
-SHA1 (patch-ad) = 5c8434bf36074b8ef6e1d5e022328bbeb6f35511
 SHA1 (patch-ae) = e07e52e8011e2f22e0391d33764a223e6ac769a4
 SHA1 (patch-af) = c982b3e2ada3274881990c5ea183ca692ff543fe
-SHA1 (patch-ag) = b2834bf82652eed34bfd231f9fc6c8cda018f893
-SHA1 (patch-ah) = 264fcf1d3c46c232b1cca81a21b5dd327a87619e
+SHA1 (patch-ag) = 059eb7191fc03765e0840a0faed0b27eb6919b74
+SHA1 (patch-ah) = a31f816d61127636663d16ad8e87169715661e3c
 SHA1 (patch-ai) = 62e013a8559aa5207085d80ed0bb77e005a4788e
-SHA1 (patch-aj) = 432912b52892927b5c23e44a3963b9c460646ae0
-SHA1 (patch-ak) = ca3c9b967d3ca159aab18353bcbb3d813665b5ec
+SHA1 (patch-aj) = c442ff2fd4afc1e011953b421d20f1adc9e92b06
+SHA1 (patch-ak) = dc18202214fc0ce153ecbab2a4f7759e32d9e11f
 SHA1 (patch-al) = dee33dd3c235be568b35a57a34f6ca703bc8f411
-SHA1 (patch-am) = 59cb46a411a50adb9b0f61e48726a43408c1b701
 SHA1 (patch-an) = 8416a0de32fec6cbf615083d44fd0b5add5cd8e3
 SHA1 (patch-ao) = aa9e0cd237460004d4e1f89a3f4bced11ee620b7
 SHA1 (patch-ap) = 75ca4b6a32f1c3ed1a085457b4de9bb228242fad
-SHA1 (patch-aq) = 7bc20e2053a4922e6848c2e7fc35d7327710423a
-SHA1 (patch-ar) = f7f68cb96333d0a5b2b653cd1fa36a73ac7a3a9d
-SHA1 (patch-as) = d589cf64cf0548a5f79a3dfa1bc530823d2d4eb8
 SHA1 (patch-at) = 83f5680d43ad0e06e5eca517cbba2d0866ae42bc
-SHA1 (patch-au) = 10d6ce9a3c37ff986c8ff8b786b33d7714d8f904
+SHA1 (patch-au) = f6ba3953b892f40158e6e4bde5d8b28bf930f241
 SHA1 (patch-av) = 18a90c53d641305ef02f71bf443c84d50a2c3fff
 SHA1 (patch-aw) = a6b75b6c2b85d1b8247cee16fd23fbaffa346c05
-SHA1 (patch-ax) = 197328b2f6444ed052d0ab0ae5d6d5a516fede37
+SHA1 (patch-ax) = 4f18da00e202b397615588480b78e4dc4248cc23
diff --git a/sysutils/fam/patches/patch-ad b/sysutils/fam/patches/patch-ad
deleted file mode 100644
index e2090688034..00000000000
--- a/sysutils/fam/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
---- fam/Client.h.orig	Tue Dec 18 11:03:36 2001
-+++ fam/Client.h
-@@ -23,6 +23,7 @@
- #ifndef Client_included
- #define Client_included
- 
-+#include <sys/types.h>
- #include <netinet/in.h>  // for in_addr
- 
- #include "Activity.h"
diff --git a/sysutils/fam/patches/patch-ag b/sysutils/fam/patches/patch-ag
index 6bacc0e0e8e..12ddec90b46 100644
--- a/sysutils/fam/patches/patch-ag
+++ b/sysutils/fam/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/12/17 19:43:40 jmmv Exp $
 
---- fam/IMon.c++.orig	Tue Dec 18 11:03:37 2001
+--- fam/IMon.c++.orig	Tue Jul 16 08:14:41 2002
 +++ fam/IMon.c++
 @@ -25,6 +25,7 @@
  #include <assert.h>
@@ -10,14 +10,12 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:21 jlam Exp $
  
  #if HAVE_IMON
  #ifdef __sgi
-@@ -34,7 +35,9 @@
+@@ -34,7 +35,7 @@
  #endif
  #endif
  
--#include <sys/sysmacros.h>
-+#if !defined(BSD)
-+#  include <sys/sysmacros.h>
-+#endif
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #  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 4c874090dbe..6dd509643b7 100644
--- a/sysutils/fam/patches/patch-ah
+++ b/sysutils/fam/patches/patch-ah
@@ -1,15 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2002/12/17 19:43:40 jmmv Exp $
 
---- fam/Interest.c++.orig	Thu Dec 20 08:59:20 2001
+--- fam/Interest.c++.orig	Tue Jul 16 08:14:41 2002
 +++ fam/Interest.c++
-@@ -25,7 +25,9 @@
+@@ -25,7 +25,7 @@
  #include <string.h>
  #include <errno.h>
  #include <sys/param.h>
--#include <sys/sysmacros.h>
-+#if !defined(BSD)
-+#  include <sys/sysmacros.h>
-+#endif
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #  include <sys/sysmacros.h>
+ #endif
  
- #ifdef HAVE_IRIX_XTAB_VERIFICATION
- #include <stdio.h>
diff --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj
index 9f925926436..466ad57bc67 100644
--- a/sysutils/fam/patches/patch-aj
+++ b/sysutils/fam/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-aj,v 1.3 2002/12/17 19:43:41 jmmv Exp $
 
---- fam/Listener.c++.orig	Tue Dec 18 11:03:37 2001
+--- fam/Listener.c++.orig	Tue Jul 16 08:14:41 2002
 +++ fam/Listener.c++
 @@ -22,6 +22,8 @@
  
@@ -19,48 +19,30 @@ $NetBSD: patch-aj,v 1.2 2002/08/25 19:23:21 jlam Exp $
  #include <sys/stat.h>
  #include <sys/un.h>
  #include <unistd.h>
-@@ -205,7 +208,11 @@
+@@ -205,7 +208,7 @@ Listener::create_local_client(TCP_Client
      unsetenv("TMPDIR");
  
      char *tmpfile = tempnam("/tmp", ".fam");
-+#if (defined(BSD) && BSD >= 199306)
-+    sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
-+#else
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+     sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
+ #else
      sockaddr_un sun = { AF_UNIX, "" };
-+#endif
-     if(strlen(tmpfile) >= (sizeof(sun.sun_path) - 1))
-     {
-         Log::error("tmpnam() too long for sun_path (%d >= %d)!",
-@@ -239,7 +246,7 @@
-         return;
-     }
- 
--    if (chown(sun.sun_path, uid, -1) != 0)
-+    if (chown(sun.sun_path, uid, (gid_t)-1) != 0)
-     {   Log::perror("localclient chown");
- 	close(client_sock);
-         return;
-@@ -275,7 +282,11 @@
+@@ -279,7 +282,7 @@ Listener::accept_localclient(int ofd, vo
  
      // Get the new socket.
  
-+#if (defined(BSD) && BSD >= 199306)
-+    struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
-+#else
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+     struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
+ #else
      struct sockaddr_un sun = { AF_UNIX, "" };
-+#endif
-     CONFIG_SOCKLEN_T sunlen = sizeof(sun);
-     int client_fd = accept(ofd, (struct sockaddr *) &sun, &sunlen);
-     if (client_fd < 0)
-@@ -337,7 +348,11 @@
+@@ -345,7 +348,7 @@ Listener::accept_localclient(int ofd, vo
  void
  Listener::dirty_ugly_hack()
  {
-+#if (defined(BSD) && BSD >= 199306)
-+    static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, "/tmp/.fam_socket" };
-+#else
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+     static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, "/tmp/.fam_socket" };
+ #else
      static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };
-+#endif
- 
-     int sock = socket(PF_UNIX, SOCK_STREAM, 0);
-     if (sock < 0)
diff --git a/sysutils/fam/patches/patch-ak b/sysutils/fam/patches/patch-ak
index dd778965f01..bd8591edf69 100644
--- a/sysutils/fam/patches/patch-ak
+++ b/sysutils/fam/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:21 jlam Exp $
+$NetBSD: patch-ak,v 1.3 2002/12/17 19:43:41 jmmv Exp $
 
---- fam/Log.c++.orig	Tue Dec 18 11:03:37 2001
+--- fam/Log.c++.orig	Tue Jul 16 08:16:14 2002
 +++ fam/Log.c++
 @@ -28,6 +28,8 @@
  #include <stdlib.h>
@@ -10,4 +10,4 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:21 jlam Exp $
 +#include <sys/types.h>
  #include <sys/resource.h>
  #include <sys/stat.h>
- #include <unistd.h>
+ #include <sys/time.h>
diff --git a/sysutils/fam/patches/patch-am b/sysutils/fam/patches/patch-am
deleted file mode 100644
index 154c9d2e315..00000000000
--- a/sysutils/fam/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/Scheduler.h.orig	Tue Dec 18 11:03:37 2001
-+++ fam/Scheduler.h
-@@ -24,6 +24,7 @@
- #define Scheduler_included
- 
- #include <sys/time.h>
-+#include <string.h>
- 
- #include "Boolean.h"
- 
diff --git a/sysutils/fam/patches/patch-aq b/sysutils/fam/patches/patch-aq
deleted file mode 100644
index 6a828ecd474..00000000000
--- a/sysutils/fam/patches/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- libfam/Client.c++.orig	Tue Dec 18 11:03:38 2001
-+++ libfam/Client.c++
-@@ -20,6 +20,7 @@
- //  with this program; if not, write the Free Software Foundation, Inc., 59
- //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
- 
-+#include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <netinet/in.h>
diff --git a/sysutils/fam/patches/patch-ar b/sysutils/fam/patches/patch-ar
deleted file mode 100644
index e0131471cc3..00000000000
--- a/sysutils/fam/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- libfam/fam.c++.orig	Tue Dec 18 11:03:38 2001
-+++ libfam/fam.c++
-@@ -21,6 +21,7 @@
- //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
- 
- #include <sys/types.h>
-+#include <rpc/rpc.h>
- #include <sys/time.h>
- #include <unistd.h>
- #include <stdlib.h>
diff --git a/sysutils/fam/patches/patch-as b/sysutils/fam/patches/patch-as
deleted file mode 100644
index 9fdb7904894..00000000000
--- a/sysutils/fam/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- test/test.c++.orig	Wed Dec 19 19:08:48 2001
-+++ test/test.c++
-@@ -1,6 +1,7 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <stdio.h>
-+#include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <signal.h>
diff --git a/sysutils/fam/patches/patch-au b/sysutils/fam/patches/patch-au
index 3233423fe3d..fefc088e4f8 100644
--- a/sysutils/fam/patches/patch-au
+++ b/sysutils/fam/patches/patch-au
@@ -1,35 +1,29 @@
-$NetBSD: patch-au,v 1.2 2002/08/25 19:23:23 jlam Exp $
+$NetBSD: patch-au,v 1.3 2002/12/17 19:43:43 jmmv Exp $
 
---- fam/Makefile.in.orig	Fri Dec 21 10:00:16 2001
+--- fam/Makefile.in.orig	Tue Jul 16 08:56:45 2002
 +++ fam/Makefile.in
-@@ -99,7 +99,7 @@
- bin_PROGRAMS = fam
- sysconf_DATA = fam.conf
+@@ -28,7 +28,7 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/@PACKAGE@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -173,6 +173,7 @@ fam_SOURCES = \
+   main.c++ \
+   timeval.c++ \
+   timeval.h \
++  mntent_compat.c++ \
+   @IMON_FUNCS@.c++
  
--fam_SOURCES =    Activity.c++   Activity.h   Client.c++   Client.h   ClientConnection.c++   ClientConnection.h   ClientInterest.c++   ClientInterest.h   Cred.c++   Cred.h   DirEntry.c++   DirEntry.h   Directory.c++   Directory.h   DirectoryScanner.c++   DirectoryScanner.h   Event.c++   Event.h   File.c++   File.h   FileSystem.c++   FileSystem.h   FileSystemTable.c++   FileSystemTable.h   IMon.c++   IMon.h   Interest.c++   Interest.h   InternalClient.c++   InternalClient.h   Listener.c++   Listener.h   LocalClient.c++   LocalClient.h   LocalFileSystem.c++   LocalFileSystem.h   Log.c++   Log.h   MxClient.c++   MxClient.h   NFSFileSystem.c++   NFSFileSystem.h   NetConnection.c++   NetConnection.h   Pollster.c++   Pollster.h   Request.h   RequestMap.h   RPC_TCP_Connector.c++   RPC_TCP_Connector.h   Scanner.c++   Scanner.h   Scheduler.c++   Scheduler.h   ServerConnection.c++   ServerConnection.h   ServerHost.c++   ServerHost.h   ServerHostRef.c++   ServerHostRef.h   Set.h   SmallTable.h   StringTable.h   TCP_Client.c++   TCP_Client.h   main.c++   timeval.c++   timeval.h   @IMON_FUNCS@.c++
-+fam_SOURCES =    Activity.c++   Activity.h   Client.c++   Client.h   ClientConnection.c++   ClientConnection.h   ClientInterest.c++   ClientInterest.h   Cred.c++   Cred.h   DirEntry.c++   DirEntry.h   Directory.c++   Directory.h   DirectoryScanner.c++   DirectoryScanner.h   Event.c++   Event.h   File.c++   File.h   FileSystem.c++   FileSystem.h   FileSystemTable.c++   FileSystemTable.h   IMon.c++   IMon.h   Interest.c++   Interest.h   InternalClient.c++   InternalClient.h   Listener.c++   Listener.h   LocalClient.c++   LocalClient.h   LocalFileSystem.c++   LocalFileSystem.h   Log.c++   Log.h   MxClient.c++   MxClient.h   NFSFileSystem.c++   NFSFileSystem.h   NetConnection.c++   NetConnection.h   Pollster.c++   Pollster.h   Request.h   RequestMap.h   RPC_TCP_Connector.c++   RPC_TCP_Connector.h   Scanner.c++   Scanner.h   Scheduler.c++   Scheduler.h   ServerConnection.c++   ServerConnection.h   ServerHost.c++   ServerHost.h   ServerHostRef.c++   ServerHostRef.h   Set.h   SmallTable.h   StringTable.h   TCP_Client.c++   TCP_Client.h   main.c++   timeval.c++   timeval.h   mntent_compat.c++ @IMON_FUNCS@.c++
  
- 
- EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
-@@ -123,7 +123,7 @@
- Listener.o LocalClient.o LocalFileSystem.o Log.o MxClient.o \
- NFSFileSystem.o NetConnection.o Pollster.o RPC_TCP_Connector.o \
- Scanner.o Scheduler.o ServerConnection.o ServerHost.o ServerHostRef.o \
--TCP_Client.o main.o timeval.o @IMON_FUNCS@.o
-+TCP_Client.o main.o timeval.o mntent_compat.o @IMON_FUNCS@.o
+@@ -201,6 +202,7 @@ NFSFileSystem.$(OBJEXT) NetConnection.$(
+ RPC_TCP_Connector.$(OBJEXT) Scanner.$(OBJEXT) Scheduler.$(OBJEXT) \
+ ServerConnection.$(OBJEXT) ServerHost.$(OBJEXT) ServerHostRef.$(OBJEXT) \
+ TCP_Client.$(OBJEXT) main.$(OBJEXT) timeval.$(OBJEXT) \
++mntent_compat.$(OBJEXT) \
+ @IMON_FUNCS@.$(OBJEXT)
  fam_DEPENDENCIES =  $(top_srcdir)/support/libsupport.a
  fam_LDFLAGS = 
- CXXFLAGS = @CXXFLAGS@
-@@ -237,10 +237,10 @@
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p.sample; \
- 	  else if test -f $$p; then \
- 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p.sample; \
- 	  fi; fi; \
- 	done
- 
diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax
index b84cea14ba7..78a54f1794c 100644
--- a/sysutils/fam/patches/patch-ax
+++ b/sysutils/fam/patches/patch-ax
@@ -1,24 +1,24 @@
-$NetBSD: patch-ax,v 1.1 2002/10/02 22:31:00 dillo Exp $
+$NetBSD: patch-ax,v 1.2 2002/12/17 19:43:43 jmmv Exp $
 
---- configure.orig	Thu Oct  3 00:27:08 2002
+--- configure.orig	Tue Dec 17 00:22:04 2002
 +++ configure
-@@ -1881,6 +1881,43 @@ fi
+@@ -5561,6 +5510,43 @@ fi
  
  
  
 +ac_safe=`echo "mntent.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for mntent.h""... $ac_c" 1>&6
-+echo "configure:1887: checking for mntent.h" >&5
++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
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 1892 "configure"
++#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:1897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (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*
@@ -46,21 +46,21 @@ $NetBSD: patch-ax,v 1.1 2002/10/02 22:31:00 dillo Exp $
  if test `uname` = 'IRIX' || test `uname` = 'IRIX64'; then
      have_imon=yes
      cat >> confdefs.h <<\EOF
-@@ -2382,129 +2419,8 @@ fi
+@@ -6117,129 +6106,8 @@ fi
  
  
  
 -    echo $ac_n "checking mntent.h for MNTTYPE_NFS""... $ac_c" 1>&6
--echo "configure:2387: checking mntent.h for MNTTYPE_NFS" >&5
+-echo "configure:6122: checking mntent.h for MNTTYPE_NFS" >&5
 -    cat > conftest.$ac_ext <<EOF
--#line 2389 "configure"
+-#line 6124 "configure"
 -#include "confdefs.h"
 -#include <mntent.h>
 -int main() {
 -const char *foo = MNTTYPE_NFS;
 -; return 0; }
 -EOF
--if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:6131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -  rm -rf conftest*
 -  fam_have_decl_in_mntent=yes
 -else
@@ -79,16 +79,16 @@ $NetBSD: patch-ax,v 1.1 2002/10/02 22:31:00 dillo Exp $
 -
 -
 -    echo $ac_n "checking mntent.h for MNTTYPE_NFS2""... $ac_c" 1>&6
--echo "configure:2415: checking mntent.h for MNTTYPE_NFS2" >&5
+-echo "configure:6150: checking mntent.h for MNTTYPE_NFS2" >&5
 -    cat > conftest.$ac_ext <<EOF
--#line 2417 "configure"
+-#line 6152 "configure"
 -#include "confdefs.h"
 -#include <mntent.h>
 -int main() {
 -const char *foo = MNTTYPE_NFS2;
 -; return 0; }
 -EOF
--if { (eval echo configure:2424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:6159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -  rm -rf conftest*
 -  fam_have_decl_in_mntent=yes
 -else
@@ -110,16 +110,16 @@ $NetBSD: patch-ax,v 1.1 2002/10/02 22:31:00 dillo Exp $
 -
 -
 -    echo $ac_n "checking mntent.h for MNTTYPE_NFS3""... $ac_c" 1>&6
--echo "configure:2446: checking mntent.h for MNTTYPE_NFS3" >&5
+-echo "configure:6181: checking mntent.h for MNTTYPE_NFS3" >&5
 -    cat > conftest.$ac_ext <<EOF
--#line 2448 "configure"
+-#line 6183 "configure"
 -#include "confdefs.h"
 -#include <mntent.h>
 -int main() {
 -const char *foo = MNTTYPE_NFS3;
 -; return 0; }
 -EOF
--if { (eval echo configure:2455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:6190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -  rm -rf conftest*
 -  fam_have_decl_in_mntent=yes
 -else
@@ -141,16 +141,16 @@ $NetBSD: patch-ax,v 1.1 2002/10/02 22:31:00 dillo Exp $
 -
 -
 -    echo $ac_n "checking mntent.h for MNTTYPE_CACHEFS""... $ac_c" 1>&6
--echo "configure:2477: checking mntent.h for MNTTYPE_CACHEFS" >&5
+-echo "configure:6212: checking mntent.h for MNTTYPE_CACHEFS" >&5
 -    cat > conftest.$ac_ext <<EOF
--#line 2479 "configure"
+-#line 6214 "configure"
 -#include "confdefs.h"
 -#include <mntent.h>
 -int main() {
 -const char *foo = MNTTYPE_CACHEFS;
 -; return 0; }
 -EOF
--if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:6221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -  rm -rf conftest*
 -  fam_have_decl_in_mntent=yes
 -else
@@ -172,8 +172,8 @@ $NetBSD: patch-ax,v 1.1 2002/10/02 22:31:00 dillo Exp $
 -
 -
  echo $ac_n "checking netinet/in.h for bindresvport()""... $ac_c" 1>&6
--echo "configure:2508: checking netinet/in.h for bindresvport()" >&5
-+echo "configure:2424: checking netinet/in.h for bindresvport()" >&5
+-echo "configure:6243: checking netinet/in.h for bindresvport()" >&5
++echo "configure:6111: checking netinet/in.h for bindresvport()" >&5
  if eval "test \"`echo '$''{'fam_cv_bindresvport_in_in_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else