[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs2 Do not use fam. This solves *lots...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8eda7d2dddfc
branches:  trunk
changeset: 465376:8eda7d2dddfc
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Dec 28 23:35:46 2003 +0000

description:
Do not use fam.  This solves *lots* of lockups in nautilus (finally!) and
probably other applications using gnome-vfs2 (yeah, it removes some minor
functionality... but until it's solved, this is better than nothing).

Bump PKGREVISION to 1.

Found by xtraeme@ with help from marcus@freebsd.

diffstat:

 sysutils/gnome-vfs2/Makefile         |   4 ++--
 sysutils/gnome-vfs2/buildlink2.mk    |   5 ++---
 sysutils/gnome-vfs2/distinfo         |   3 ++-
 sysutils/gnome-vfs2/patches/patch-aa |  20 ++++++++++++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)

diffs (82 lines):

diff -r 0a1496efa438 -r 8eda7d2dddfc sysutils/gnome-vfs2/Makefile
--- a/sysutils/gnome-vfs2/Makefile      Sun Dec 28 21:54:31 2003 +0000
+++ b/sysutils/gnome-vfs2/Makefile      Sun Dec 28 23:35:46 2003 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/12/14 19:47:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/28 23:35:46 jmmv Exp $
 #
 
 DISTNAME=              gnome-vfs-2.4.1
 PKGNAME=               ${DISTNAME:S/vfs/vfs2/}
+PKGREVISION=           1
 CATEGORIES=            sysutils gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.4/}
 EXTRACT_SUFX=          .tar.bz2
@@ -62,5 +63,4 @@
 .include "../../net/ORBit2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
-.include "../../sysutils/fam/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0a1496efa438 -r 8eda7d2dddfc sysutils/gnome-vfs2/buildlink2.mk
--- a/sysutils/gnome-vfs2/buildlink2.mk Sun Dec 28 21:54:31 2003 +0000
+++ b/sysutils/gnome-vfs2/buildlink2.mk Sun Dec 28 23:35:46 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.12 2003/12/14 19:47:26 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2003/12/28 23:35:46 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.1
+BUILDLINK_DEPENDS.gnome-vfs2?=         gnome-vfs2>=2.4.1nb1
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=       ../../sysutils/gnome-vfs2
 
 EVAL_PREFIX+=                          BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
@@ -30,7 +30,6 @@
 .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 -r 0a1496efa438 -r 8eda7d2dddfc sysutils/gnome-vfs2/distinfo
--- a/sysutils/gnome-vfs2/distinfo      Sun Dec 28 21:54:31 2003 +0000
+++ b/sysutils/gnome-vfs2/distinfo      Sun Dec 28 23:35:46 2003 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/12/14 19:47:26 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2003/12/28 23:35:46 jmmv Exp $
 
 SHA1 (gnome-vfs-2.4.1.tar.bz2) = ab045dea3fc4a85a204d69ea24e50c54cb06746d
 Size (gnome-vfs-2.4.1.tar.bz2) = 1060029 bytes
+SHA1 (patch-aa) = 60c83646ac1ef72ba46525b70a581b556ed6c1a0
 SHA1 (patch-ag) = 8dda137fe56462ee2336678a872a43611b11984f
 SHA1 (patch-ai) = d89edb0dc089818191c12360ae542c0edc9fe414
diff -r 0a1496efa438 -r 8eda7d2dddfc sysutils/gnome-vfs2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-vfs2/patches/patch-aa      Sun Dec 28 23:35:46 2003 +0000
@@ -0,0 +1,20 @@
+$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
+ 
+ 
+