diff options
author | jmmv <jmmv> | 2004-02-09 18:14:45 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-02-09 18:14:45 +0000 |
commit | d9b3bfb346686c47b1687515514766b01c60931f (patch) | |
tree | f3484de58c1a16c37cba4fe4f4b0b19031e8a277 /sysutils/fam | |
parent | a6d491687f94a39d9fd79a035c93a36b4e697678 (diff) | |
download | pkgsrc-d9b3bfb346686c47b1687515514766b01c60931f.tar.gz |
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 (limited to 'sysutils/fam')
-rw-r--r-- | sysutils/fam/MESSAGE | 17 | ||||
-rw-r--r-- | sysutils/fam/Makefile | 11 | ||||
-rw-r--r-- | sysutils/fam/buildlink2.mk | 5 | ||||
-rw-r--r-- | sysutils/fam/distinfo | 20 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-aa | 13 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-ac | 28 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-aj | 22 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-al | 12 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-at | 35 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-au | 24 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-av | 34 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-aw | 24 | ||||
-rw-r--r-- | sysutils/fam/patches/patch-ax | 257 |
13 files changed, 242 insertions, 260 deletions
diff --git a/sysutils/fam/MESSAGE b/sysutils/fam/MESSAGE new file mode 100644 index 00000000000..ebc9750fb4d --- /dev/null +++ b/sysutils/fam/MESSAGE @@ -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 --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile index 55774584516..ee7efcfd978 100644 --- a/sysutils/fam/Makefile +++ b/sysutils/fam/Makefile @@ -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 @@ COMMENT= File Alteration Monitor 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 --git a/sysutils/fam/buildlink2.mk b/sysutils/fam/buildlink2.mk index 9382dbc6d0d..56bc378460c 100644 --- a/sysutils/fam/buildlink2.mk +++ b/sysutils/fam/buildlink2.mk @@ -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 --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo index c19e9bbc509..d84a83e8119 100644 --- a/sysutils/fam/distinfo +++ b/sysutils/fam/distinfo @@ -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 --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa deleted file mode 100644 index 894a9271d86..00000000000 --- a/sysutils/fam/patches/patch-aa +++ /dev/null @@ -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 --git a/sysutils/fam/patches/patch-ac b/sysutils/fam/patches/patch-ac deleted file mode 100644 index cada84d7a08..00000000000 --- a/sysutils/fam/patches/patch-ac +++ /dev/null @@ -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 --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj index 466ad57bc67..cf94acea5e4 100644 --- a/sysutils/fam/patches/patch-aj +++ b/sysutils/fam/patches/patch-aj @@ -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 @@ $NetBSD: patch-aj,v 1.3 2002/12/17 19:43:41 jmmv Exp $ +#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 @@ $NetBSD: patch-aj,v 1.3 2002/12/17 19:43:41 jmmv Exp $ #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 --git a/sysutils/fam/patches/patch-al b/sysutils/fam/patches/patch-al deleted file mode 100644 index d1c30c51abb..00000000000 --- a/sysutils/fam/patches/patch-al +++ /dev/null @@ -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 --git a/sysutils/fam/patches/patch-at b/sysutils/fam/patches/patch-at deleted file mode 100644 index c57d78bdd67..00000000000 --- a/sysutils/fam/patches/patch-at +++ /dev/null @@ -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 --git a/sysutils/fam/patches/patch-au b/sysutils/fam/patches/patch-au index fefc088e4f8..d5e28dc5b08 100644 --- a/sysutils/fam/patches/patch-au +++ b/sysutils/fam/patches/patch-au @@ -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 @@ $NetBSD: patch-au,v 1.3 2002/12/17 19:43:43 jmmv Exp $ 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 @@ $NetBSD: patch-au,v 1.3 2002/12/17 19:43:43 jmmv Exp $ @IMON_FUNCS@.c++ -@@ -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 = +@@ -207,6 +208,7 @@ am_fam_OBJECTS = Activity.$(OBJEXT) Clie + 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 diff --git a/sysutils/fam/patches/patch-av b/sysutils/fam/patches/patch-av index 0e35593d322..ed67873ce7c 100644 --- a/sysutils/fam/patches/patch-av +++ b/sysutils/fam/patches/patch-av @@ -1,30 +1,12 @@ -$NetBSD: patch-av,v 1.2 2002/08/25 19:23:23 jlam Exp $ +$NetBSD: patch-av,v 1.3 2004/02/09 18:14:45 jmmv Exp $ ---- Makefile.in.orig Sun May 12 19:27:47 2002 +--- Makefile.in.orig 2003-04-15 08:17:10.000000000 +0200 +++ Makefile.in -@@ -388,25 +388,8 @@ - # 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 \ -- $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \ -- exec $(LDCONFIG); \ -- fi -- -@$(EDITCONF) rpc add 391002 "sgi_fam 391002" -- -@$(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 +@@ -427,7 +427,6 @@ install-data-am: --# 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: -- -@$(EDITCONF) rpc remove 391002 -- -@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b' -- @echo "Restarting inetd..." -- -@killall -HUP inetd + install-exec-am: + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + + install-info: install-info-recursive - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/sysutils/fam/patches/patch-aw b/sysutils/fam/patches/patch-aw index 1e1749c0617..4c9f7955194 100644 --- a/sysutils/fam/patches/patch-aw +++ b/sysutils/fam/patches/patch-aw @@ -1,22 +1,22 @@ -$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:23 jlam Exp $ +$NetBSD: patch-aw,v 1.3 2004/02/09 18:14:45 jmmv Exp $ ---- man/Makefile.in.orig Sun May 12 20:01:26 2002 +--- man/Makefile.in.orig 2003-04-15 08:19:24.000000000 +0200 +++ man/Makefile.in -@@ -124,7 +124,7 @@ +@@ -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 ; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ -@@ -157,7 +157,7 @@ ++ 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 ; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ ++ ext=3; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax index 78a54f1794c..cab449ebc00 100644 --- a/sysutils/fam/patches/patch-ax +++ b/sysutils/fam/patches/patch-ax @@ -1,9 +1,9 @@ -$NetBSD: patch-ax,v 1.2 2002/12/17 19:43:43 jmmv Exp $ +$NetBSD: patch-ax,v 1.3 2004/02/09 18:14:45 jmmv Exp $ ---- configure.orig Tue Dec 17 00:22:04 2002 +--- configure.orig 2003-04-15 08:17:16.000000000 +0200 +++ configure -@@ -5561,6 +5510,43 @@ fi - +@@ -9670,6 +9670,41 @@ _ACEOF + fi +ac_safe=`echo "mntent.h" | sed 'y%./+-%__p_%'` @@ -41,139 +41,210 @@ $NetBSD: patch-ax,v 1.2 2002/12/17 19:43:43 jmmv Exp $ +else + echo "$ac_t""no" 1>&6 +fi -+ -+ - if test `uname` = 'IRIX' || test `uname` = 'IRIX64'; then - have_imon=yes - cat >> confdefs.h <<\EOF -@@ -6117,129 +6106,8 @@ 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 -- echo $ac_n "checking mntent.h for MNTTYPE_NFS""... $ac_c" 1>&6 --echo "configure:6122: checking mntent.h for MNTTYPE_NFS" >&5 -- cat > conftest.$ac_ext <<EOF --#line 6124 "configure" --#include "confdefs.h" +- 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() { +-int +-main () +-{ -const char *foo = MNTTYPE_NFS; --; return 0; } --EOF --if { (eval echo configure:6131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* +- ; +- 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 "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- fam_have_decl_in_mntent=no +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fam_have_decl_in_mntent=no -fi --rm -f conftest* -- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6 +-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 "configure: error: Didn't find MNTTYPE_NFS in mntent.h" 1>&2; exit 1; } +- 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 $ac_n "checking mntent.h for MNTTYPE_NFS2""... $ac_c" 1>&6 --echo "configure:6150: checking mntent.h for MNTTYPE_NFS2" >&5 -- cat > conftest.$ac_ext <<EOF --#line 6152 "configure" --#include "confdefs.h" +- 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() { +-int +-main () +-{ -const char *foo = MNTTYPE_NFS2; --; return 0; } --EOF --if { (eval echo configure:6159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* +- ; +- 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 "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- fam_have_decl_in_mntent=no +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fam_have_decl_in_mntent=no -fi --rm -f conftest* -- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6 +-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 <<\EOF +- cat >>confdefs.h <<\_ACEOF -#define HAVE_MNTTYPE_NFS2 1 --EOF +-_ACEOF - -- else +- else - : - fi - - -- echo $ac_n "checking mntent.h for MNTTYPE_NFS3""... $ac_c" 1>&6 --echo "configure:6181: checking mntent.h for MNTTYPE_NFS3" >&5 -- cat > conftest.$ac_ext <<EOF --#line 6183 "configure" --#include "confdefs.h" +- 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() { +-int +-main () +-{ -const char *foo = MNTTYPE_NFS3; --; return 0; } --EOF --if { (eval echo configure:6190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* +- ; +- 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 "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- fam_have_decl_in_mntent=no +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fam_have_decl_in_mntent=no -fi --rm -f conftest* -- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6 +-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 <<\EOF +- cat >>confdefs.h <<\_ACEOF -#define HAVE_MNTTYPE_NFS3 1 --EOF +-_ACEOF - -- else +- else - : - fi - - -- echo $ac_n "checking mntent.h for MNTTYPE_CACHEFS""... $ac_c" 1>&6 --echo "configure:6212: checking mntent.h for MNTTYPE_CACHEFS" >&5 -- cat > conftest.$ac_ext <<EOF --#line 6214 "configure" --#include "confdefs.h" +- 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() { +-int +-main () +-{ -const char *foo = MNTTYPE_CACHEFS; --; return 0; } --EOF --if { (eval echo configure:6221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* +- ; +- 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 "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- fam_have_decl_in_mntent=no +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fam_have_decl_in_mntent=no -fi --rm -f conftest* -- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6 +-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 <<\EOF +- cat >>confdefs.h <<\_ACEOF -#define HAVE_MNTTYPE_CACHEFS 1 --EOF +-_ACEOF - -- else +- else - : - fi -- -- - echo $ac_n "checking netinet/in.h for bindresvport()""... $ac_c" 1>&6 --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 + + + echo "$as_me:$LINENO: checking netinet/in.h for bindresvport()" >&5 |