[pkgsrc/trunk]: pkgsrc/sysutils/fam Update to 2.6.10:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/fam Update to 2.6.10:
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:30:22 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7c98c17d1ad
branches:  trunk
changeset: 468022:f7c98c17d1ad
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Feb 09 18:14:45 2004 +0000

description:
Update to 2.6.10:
- removed const from Scheduler.h to fix GCC 3 build.
- use GID_NOBODY if NOGROUP is undefined to build on SysV-like operating
  systems including IRIX.

Changes in the package:
- Install configuration file in place.
- Tell the user how to setup and enable FAM.

diffstat:

 sysutils/fam/MESSAGE          |   17 ++
 sysutils/fam/Makefile         |   11 +-
 sysutils/fam/buildlink2.mk    |    5 +-
 sysutils/fam/distinfo         |   20 +-
 sysutils/fam/patches/patch-aa |   13 --
 sysutils/fam/patches/patch-ac |   28 ----
 sysutils/fam/patches/patch-aj |   22 +-
 sysutils/fam/patches/patch-al |   12 -
 sysutils/fam/patches/patch-at |   35 -----
 sysutils/fam/patches/patch-au |   24 +-
 sysutils/fam/patches/patch-av |   34 +----
 sysutils/fam/patches/patch-aw |   24 +-
 sysutils/fam/patches/patch-ax |  257 ++++++++++++++++++++++++++---------------
 13 files changed, 242 insertions(+), 260 deletions(-)

diffs (truncated from 713 to 300 lines):

diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/fam/MESSAGE      Mon Feb 09 18:14:45 2004 +0000
@@ -0,0 +1,17 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/02/09 18:14:45 jmmv Exp $
+
+FAM uses RPC and is usually started by the inetd(8) superserver.  You need
+to enable it manually, by issuing the following steps:
+
+1) Add FAM to the system's portmapper by appending the following line to
+   the /etc/rpc file:
+
+        sgi_fam    391002    fam    # File Alternation Monitor
+
+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
+
+===========================================================================
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/Makefile
--- a/sysutils/fam/Makefile     Mon Feb 09 17:36:37 2004 +0000
+++ b/sysutils/fam/Makefile     Mon Feb 09 18:14:45 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/09 18:14:45 jmmv Exp $
 #
 
-DISTNAME=              fam-2.6.9
-PKGREVISION=           1
+DISTNAME=              fam-2.6.10
 CATEGORIES=            sysutils devel
 MASTER_SITES=          ftp://oss.sgi.com/projects/fam/download/stable/ \
                        ftp://ftp.tuwien.ac.at/opsys/linux/gentoo/distfiles/ \
@@ -15,8 +14,14 @@
 USE_BUILDLINK2=                YES
 USE_GNU_TOOLS+=                make
 USE_LIBTOOL=           YES
+USE_PKGINSTALL=                YES
 GNU_CONFIGURE=         YES
+
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+EGDIR=                 ${PREFIX}/share/examples/fam
+CONF_FILES=            ${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf
+
 .include "../../mk/bsd.pkg.mk"
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/buildlink2.mk
--- a/sysutils/fam/buildlink2.mk        Mon Feb 09 17:36:37 2004 +0000
+++ b/sysutils/fam/buildlink2.mk        Mon Feb 09 18:14:45 2004 +0000
@@ -1,16 +1,15 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:20 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/09 18:14:45 jmmv Exp $
 
 .if !defined(FAM_BUILDLINK2_MK)
 FAM_BUILDLINK2_MK=     # defined
 
 BUILDLINK_PACKAGES+=           fam
-BUILDLINK_DEPENDS.fam?=                fam>=2.6.7
+BUILDLINK_DEPENDS.fam?=                fam>=2.6.10
 BUILDLINK_PKGSRCDIR.fam?=      ../../sysutils/fam
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.fam=fam
 BUILDLINK_PREFIX.fam_DEFAULT=  ${LOCALBASE}
 BUILDLINK_FILES.fam+=  include/fam.h
-BUILDLINK_FILES.fam+=  lib/fam/editconf.perl
 BUILDLINK_FILES.fam+=  lib/libfam.*
 
 BUILDLINK_TARGETS+=    fam-buildlink
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/distinfo
--- a/sysutils/fam/distinfo     Mon Feb 09 17:36:37 2004 +0000
+++ b/sysutils/fam/distinfo     Mon Feb 09 18:14:45 2004 +0000
@@ -1,23 +1,19 @@
-$NetBSD: distinfo,v 1.5 2002/12/17 19:43:39 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/02/09 18:14:45 jmmv Exp $
 
-SHA1 (fam-2.6.9.tar.gz) = 44fb01afce9bd209a01575ba6a6ecc71af5d9add
-Size (fam-2.6.9.tar.gz) = 282627 bytes
-SHA1 (patch-aa) = 6aa9a0ecda1d51ffa3e4ac2a45c02a9e629bb8bd
+SHA1 (fam-2.6.10.tar.gz) = 24899a1afe6a520c6980f1c41d5657db01d11692
+Size (fam-2.6.10.tar.gz) = 321189 bytes
 SHA1 (patch-ab) = 60897dc25f7e18f584cba0c6d22538b1d0b11ecf
-SHA1 (patch-ac) = 5e76e34ebb14e9db2c76f5bdcbfd31cb70991d70
 SHA1 (patch-ae) = e07e52e8011e2f22e0391d33764a223e6ac769a4
 SHA1 (patch-af) = c982b3e2ada3274881990c5ea183ca692ff543fe
 SHA1 (patch-ag) = 059eb7191fc03765e0840a0faed0b27eb6919b74
 SHA1 (patch-ah) = a31f816d61127636663d16ad8e87169715661e3c
 SHA1 (patch-ai) = 62e013a8559aa5207085d80ed0bb77e005a4788e
-SHA1 (patch-aj) = c442ff2fd4afc1e011953b421d20f1adc9e92b06
+SHA1 (patch-aj) = fef780df2fd6241144ba7e6da71ac66c61468ed0
 SHA1 (patch-ak) = dc18202214fc0ce153ecbab2a4f7759e32d9e11f
-SHA1 (patch-al) = dee33dd3c235be568b35a57a34f6ca703bc8f411
 SHA1 (patch-an) = 8416a0de32fec6cbf615083d44fd0b5add5cd8e3
 SHA1 (patch-ao) = aa9e0cd237460004d4e1f89a3f4bced11ee620b7
 SHA1 (patch-ap) = 75ca4b6a32f1c3ed1a085457b4de9bb228242fad
-SHA1 (patch-at) = 83f5680d43ad0e06e5eca517cbba2d0866ae42bc
-SHA1 (patch-au) = f6ba3953b892f40158e6e4bde5d8b28bf930f241
-SHA1 (patch-av) = 18a90c53d641305ef02f71bf443c84d50a2c3fff
-SHA1 (patch-aw) = a6b75b6c2b85d1b8247cee16fd23fbaffa346c05
-SHA1 (patch-ax) = 4f18da00e202b397615588480b78e4dc4248cc23
+SHA1 (patch-au) = 5e87df2bb202b6a45f588474a4df1e7ecc575288
+SHA1 (patch-av) = 8da3b718921df0f4a1e9a8924c6914d1bdc03bab
+SHA1 (patch-aw) = e94071bbefa01c54232915a0fbe211984e59943b
+SHA1 (patch-ax) = a055c366d7be91c4c5b96c3877de1a42947b9372
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/patches/patch-aa
--- a/sysutils/fam/patches/patch-aa     Mon Feb 09 17:36:37 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
---- acconfig.h.orig    Tue Dec 18 11:03:36 2001
-+++ acconfig.h
-@@ -47,6 +47,8 @@
- **  Otherwise, we'll use MNTTYPE_NFS.  */
- #undef HAVE_FSID_NFS2
- 
-+#undef HAVE_MNTENT_H
-+
- /* Define if we have MNTTYPE_NFS2 */
- #define HAVE_MNTTYPE_NFS2 0
- 
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/patches/patch-ac
--- a/sysutils/fam/patches/patch-ac     Mon Feb 09 17:36:37 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
---- configure.in.orig  Fri Dec 21 08:18:48 2001
-+++ configure.in
-@@ -95,6 +95,8 @@
- dnl AC_HEADER_SYS_WAIT
- dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h syslog.h unistd.h)
- 
-+AC_CHECK_HEADER(mntent.h, AC_DEFINE(HAVE_MNTENT_H))
-+
- dnl
- dnl  See if imon is available; if so, is it IRIX or Linux?
- dnl
-@@ -310,10 +312,10 @@
- dnl If we don't have MNTTYPE_NFS , we croak.
- dnl
- 
--FAM_DECL_IN_MNTENT(MNTTYPE_NFS, ,AC_MSG_ERROR(Didn't find MNTTYPE_NFS in mntent.h))
--FAM_DECL_IN_MNTENT(MNTTYPE_NFS2, AC_DEFINE(HAVE_MNTTYPE_NFS2))
--FAM_DECL_IN_MNTENT(MNTTYPE_NFS3, AC_DEFINE(HAVE_MNTTYPE_NFS3))
--FAM_DECL_IN_MNTENT(MNTTYPE_CACHEFS, AC_DEFINE(HAVE_MNTTYPE_CACHEFS))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_NFS, ,AC_MSG_ERROR(Didn't find MNTTYPE_NFS in mntent.h))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_NFS2, AC_DEFINE(HAVE_MNTTYPE_NFS2))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_NFS3, AC_DEFINE(HAVE_MNTTYPE_NFS3))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_CACHEFS, AC_DEFINE(HAVE_MNTTYPE_CACHEFS))
- 
- dnl
- dnl  Test for bindresvport() prototype.
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/patches/patch-aj
--- a/sysutils/fam/patches/patch-aj     Mon Feb 09 17:36:37 2004 +0000
+++ b/sysutils/fam/patches/patch-aj     Mon Feb 09 18:14:45 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.3 2002/12/17 19:43:41 jmmv Exp $
+$NetBSD: patch-aj,v 1.4 2004/02/09 18:14:45 jmmv Exp $
 
---- fam/Listener.c++.orig      Tue Jul 16 08:14:41 2002
+--- fam/Listener.c++.orig      2003-04-15 06:52:40.000000000 +0200
 +++ fam/Listener.c++
 @@ -22,6 +22,8 @@
  
@@ -10,8 +10,8 @@
 +#include <stdlib.h>
  #include <assert.h>
  #include <fcntl.h>
- #include <sys/types.h>
-@@ -32,6 +34,7 @@
+ #include <stdlib.h>
+@@ -33,6 +35,7 @@
  #include <rpc/clnt.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
@@ -19,30 +19,30 @@
  #include <sys/stat.h>
  #include <sys/un.h>
  #include <unistd.h>
-@@ -205,7 +208,7 @@ Listener::create_local_client(TCP_Client
-     unsetenv("TMPDIR");
+@@ -206,7 +209,7 @@ Listener::create_local_client(TCP_Client
+     putenv("TMPDIR=");
  
      char *tmpfile = tempnam("/tmp", ".fam");
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
      sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
  #else
      sockaddr_un sun = { AF_UNIX, "" };
-@@ -279,7 +282,7 @@ Listener::accept_localclient(int ofd, vo
+@@ -280,7 +283,7 @@ Listener::accept_localclient(int ofd, vo
  
      // Get the new socket.
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
      struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
  #else
      struct sockaddr_un sun = { AF_UNIX, "" };
-@@ -345,7 +348,7 @@ Listener::accept_localclient(int ofd, vo
+@@ -346,7 +349,7 @@ Listener::accept_localclient(int ofd, vo
  void
  Listener::dirty_ugly_hack()
  {
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
      static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, "/tmp/.fam_socket" };
  #else
      static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/patches/patch-al
--- a/sysutils/fam/patches/patch-al     Mon Feb 09 17:36:37 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/Makefile.am.orig       Tue Dec 18 11:03:37 2001
-+++ fam/Makefile.am
-@@ -72,6 +72,7 @@
-   main.c++ \
-   timeval.c++ \
-   timeval.h \
-+  mntent_compat.c++ \
-   @IMON_FUNCS@.c++
- 
- EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/patches/patch-at
--- a/sysutils/fam/patches/patch-at     Mon Feb 09 17:36:37 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-at,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- Makefile.am.orig   Tue Dec 18 11:03:36 2001
-+++ Makefile.am
-@@ -7,30 +7,3 @@
- rpm: dist
-       @cd build && $(MAKE) $(AM_MAKEFLAGS) rpm
- 
--#  We proceed even if these commands fail because this might be an install
--#  into $DESTDIR by a non-root user.
--install-exec-hook:
--      -@if test "no$(LDCONFIG)" != "no"; then \
--##        echo "Adding $(libdir) to ld.so.conf..."; \
--          $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \
--          exec $(LDCONFIG); \
--      fi
--##    @echo "Adding fam to rpc..."
--      -@$(EDITCONF) rpc add 391002 "sgi_fam           391002"
--##    @echo "Adding fam to inetd.conf..."
--      -@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \
--          "#  fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/"; \
--          "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam"
--      @echo "Restarting inetd..."
--      -@killall -HUP inetd
--
--#  We don't remove $(libdir) from ld.so.conf here because we don't have
--#  a way to tell whether we're the ones who added it, and other things
--#  probably use it as well.
--uninstall-local:
--##    @echo "Removing fam from rpc..."
--      -@$(EDITCONF) rpc remove 391002
--##    @echo "Removing fam from inetd.conf..."
--      -@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b'
--      @echo "Restarting inetd..."
--      -@killall -HUP inetd
diff -r 3d314b5c10ae -r f7c98c17d1ad sysutils/fam/patches/patch-au
--- a/sysutils/fam/patches/patch-au     Mon Feb 09 17:36:37 2004 +0000
+++ b/sysutils/fam/patches/patch-au     Mon Feb 09 18:14:45 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.3 2002/12/17 19:43:43 jmmv Exp $
+$NetBSD: patch-au,v 1.4 2004/02/09 18:14:45 jmmv Exp $
 
---- fam/Makefile.in.orig       Tue Jul 16 08:56:45 2002
+--- fam/Makefile.in.orig       2003-04-15 08:18:34.000000000 +0200
 +++ fam/Makefile.in
-@@ -28,7 +28,7 @@ bindir = @bindir@
+@@ -25,7 +25,7 @@ bindir = @bindir@
  sbindir = @sbindir@
  libexecdir = @libexecdir@
  datadir = @datadir@
@@ -11,7 +11,7 @@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
-@@ -173,6 +173,7 @@ fam_SOURCES = \
+@@ -181,6 +181,7 @@ fam_SOURCES = \
    main.c++ \
    timeval.c++ \
    timeval.h \
@@ -19,11 +19,11 @@
    @IMON_FUNCS@.c++
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/gtkspell Update gtkspell to 2.0.5. The docs ...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of gtkspell to 2.0.5.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/gtkspell Update gtkspell to 2.0.5. The docs ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of gtkspell to 2.0.5.
Indexes:
Home | Main Index | Thread Index | Old Index