Re-enable the use of fam, to get a full-featured 'file' method. This was

disabled a while ago because it was causing lockups when using gnome-vfs2;
after the updates of fam and gnome-vfs2, this seems to be fixed (there have
been some fixes WRT fam support in this package).  Bump PKGREVISION to 2.

4 files changed, 7 insertions, 26 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index dcd2e1668f1..584d60156b3 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/02/08 21:00:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/02/09 18:45:52 jmmv Exp $
 #
 
 DISTNAME=		gnome-vfs-2.4.2
-PKGREVISION=		1
+PKGREVISION=		2
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.4/}
@@ -67,4 +67,5 @@ GCONF2_SCHEMAS=	system_http_proxy.schemas
 .include "../../textproc/intltool/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
+.include "../../sysutils/fam/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
index defe4092d63..d15b628f6b2 100644
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ b/sysutils/gnome-vfs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/12/28 23:35:46 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/02/09 18:45:52 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome-vfs2.
 #
@@ -9,7 +9,7 @@
 GNOME_VFS2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?=		gnome-vfs2>=2.4.1nb1
+BUILDLINK_DEPENDS.gnome-vfs2?=		gnome-vfs2>=2.4.2nb2
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
@@ -30,6 +30,7 @@ BUILDLINK_FILES.gnome-vfs2+=	lib/libgnomevfs-2.*
 .include "../../net/ORBit2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
+.include "../../sysutils/fam/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gnome-vfs2-buildlink
 
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index e0856f0ecee..37525d8c64e 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2004/02/06 19:09:35 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2004/02/09 18:45:52 jmmv Exp $
 
 SHA1 (gnome-vfs-2.4.2.tar.bz2) = a5439bdabc10b6ec8c8dbe01f90c772aa2d3e0f8
 Size (gnome-vfs-2.4.2.tar.bz2) = 1067445 bytes
-SHA1 (patch-aa) = 60c83646ac1ef72ba46525b70a581b556ed6c1a0
 SHA1 (patch-ab) = a162ffe1e0b396599d57af2c50a7843e75d9dbc1
 SHA1 (patch-ag) = 8dda137fe56462ee2336678a872a43611b11984f
 SHA1 (patch-ai) = d89edb0dc089818191c12360ae542c0edc9fe414
diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa
deleted file mode 100644
index 67673930d19..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/12/28 23:35:46 jmmv Exp $
-
---- configure.orig	2003-10-12 13:05:53.000000000 +0200
-+++ configure
-@@ -25226,6 +25226,7 @@ LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPE
- 
- FAM_MISSING_WARNING="Gnome-vfs depends on FAM to provide notification when files are altered (either through filesystem polling, or a kernel notification mechanism). If Gnome-vfs is built without FAM support, directories viewed with Nautilus or other applications will not remain in synch with the actual filesystem when they are altered by external processes. Particularly if you are a distributor please compile Nautilus with FAM support. FAM is available from http://oss.sgi.com/projects/fam/. A patch to add Linux Kernel 2.4 directory notify support to FAM (highly desirable) is available from http://people.redhat.com/alexl/files/"
- FAM_LIBS=
-+if false; then
- echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5
- echo $ECHO_N "checking for FAMOpen in -lfam... $ECHO_C" >&6
- if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
-@@ -25434,6 +25435,7 @@ else
-   { echo "$as_me:$LINENO: WARNING: *** FAM support will not be built (FAM library not found) $FAM_MISSING_WARNING ***" >&5
- echo "$as_me: WARNING: *** FAM support will not be built (FAM library not found) $FAM_MISSING_WARNING ***" >&2;}
- fi
-+fi
- 
- 
-