pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update fam to 2.7.0. Fixes the following PR's:
details: https://anonhg.NetBSD.org/pkgsrc/rev/118f2166a830
branches: trunk
changeset: 471493:118f2166a830
user: minskim <minskim%pkgsrc.org@localhost>
date: Sun Mar 28 22:00:04 2004 +0000
description:
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@localhost)
removed const modifier from Scheduler.h to fix GCC 3.x build.
(wardle%sgi.com@localhost)
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@localhost] (wardle%sgi.com@localhost)
fixed warnings about typenames in BTree.h.
(wardle%sgi.com@localhost)
diffstat:
doc/CHANGES | 3 +-
sysutils/fam/MESSAGE | 4 +-
sysutils/fam/Makefile | 12 +-
sysutils/fam/PLIST | 9 +-
sysutils/fam/distinfo | 35 +-
sysutils/fam/patches/patch-ab | 40 +-
sysutils/fam/patches/patch-ae | 8 +-
sysutils/fam/patches/patch-af | 12 +-
sysutils/fam/patches/patch-ag | 17 +-
sysutils/fam/patches/patch-ah | 23 +-
sysutils/fam/patches/patch-ai | 8 +-
sysutils/fam/patches/patch-aj | 30 +-
sysutils/fam/patches/patch-ak | 13 -
sysutils/fam/patches/patch-an | 12 -
sysutils/fam/patches/patch-ao | 8 +-
sysutils/fam/patches/patch-ap | 8 +-
sysutils/fam/patches/patch-au | 29 +-
sysutils/fam/patches/patch-av | 12 -
sysutils/fam/patches/patch-aw | 22 -
sysutils/fam/patches/patch-ax | 775 +++++++----------------------------------
20 files changed, 282 insertions(+), 798 deletions(-)
diffs (truncated from 1334 to 300 lines):
diff -r 1bafdc815bc0 -r 118f2166a830 doc/CHANGES
--- a/doc/CHANGES Sun Mar 28 21:57:05 2004 +0000
+++ b/doc/CHANGES Sun Mar 28 22:00:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5325 2004/03/28 21:57:05 xtraeme Exp $
+$NetBSD: CHANGES,v 1.5326 2004/03/28 22:00:04 minskim Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1554,3 +1554,4 @@
Updated dict-client to 1.8.0nb3 [jmmv 2004-03-28]
Updated dict-server to 1.8.0nb2 [jmmv 2004-03-28]
Added XFree86-dirs-1.0 [xtraeme 2004-03-28]
+ Updated fam to 2.7.0 [minskim 2004-03-28]
diff -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/MESSAGE
--- a/sysutils/fam/MESSAGE Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/MESSAGE Sun Mar 28 22:00:04 2004 +0000
@@ -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 @@
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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/Makefile
--- a/sysutils/fam/Makefile Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/Makefile Sun Mar 28 22:00:04 2004 +0000
@@ -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 @@
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 @@
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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/PLIST
--- a/sysutils/fam/PLIST Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/PLIST Sun Mar 28 22:00:04 2004 +0000
@@ -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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/distinfo
--- a/sysutils/fam/distinfo Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/distinfo Sun Mar 28 22:00:04 2004 +0000
@@ -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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/patches/patch-ab
--- a/sysutils/fam/patches/patch-ab Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/patches/patch-ab Sun Mar 28 22:00:04 2004 +0000
@@ -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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/patches/patch-ae
--- a/sysutils/fam/patches/patch-ae Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/patches/patch-ae Sun Mar 28 22:00:04 2004 +0000
@@ -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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/patches/patch-af
--- a/sysutils/fam/patches/patch-af Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/patches/patch-af Sun Mar 28 22:00:04 2004 +0000
@@ -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 @@
#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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/patches/patch-ag
--- a/sysutils/fam/patches/patch-ag Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/patches/patch-ag Sun Mar 28 22:00:04 2004 +0000
@@ -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 @@
#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 -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/patches/patch-ah
--- a/sysutils/fam/patches/patch-ah Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/patches/patch-ah Sun Mar 28 22:00:04 2004 +0000
@@ -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>
+--- 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 HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
++#endif
+
#include <errno.h>
- #include <sys/param.h>
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- # include <sys/sysmacros.h>
- #endif
-
+ #include <string.h>
diff -r 1bafdc815bc0 -r 118f2166a830 sysutils/fam/patches/patch-ai
--- a/sysutils/fam/patches/patch-ai Sun Mar 28 21:57:05 2004 +0000
+++ b/sysutils/fam/patches/patch-ai Sun Mar 28 22:00:04 2004 +0000
@@ -1,8 +1,8 @@
Home |
Main Index |
Thread Index |
Old Index