From 405badd9a7004e0f501182c8e9e3fa04a8689451 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sun, 17 Sep 2006 21:42:57 +0000
Subject: Add some FreeBSD-specific common top-level mount points that
 gnome-vfs should ignore.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7325 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/gnome-vfs/Makefile                           |  8 +++--
 .../files/patch-libgnomevfs_gnome-vfs-hal-mounts.c | 35 ++++++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 1bfdc223b..8d8228ef3 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.155 2006/08/22 00:22:31 ahze Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.156 2006/09/04 14:27:36 ahze Exp $
 #
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.16.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -82,8 +82,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+	    	s|/usr/X11R6|${X11BASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/libgnomevfs/xdgmime.c
+		${WRKSRC}/libgnomevfs/xdgmime.c \
+		${WRKSRC}/libgnomevfs/gnome-vfs-hal-mounts.c
 	@${REINPLACE_CMD} -e 's|-lacl||g' \
 		${WRKSRC}/configure
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
index 05dd579ba..5260a0f3e 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
@@ -1,5 +1,5 @@
---- libgnomevfs/gnome-vfs-hal-mounts.c.orig	Sun May  7 01:07:27 2006
-+++ libgnomevfs/gnome-vfs-hal-mounts.c	Sun May  7 01:07:42 2006
+--- libgnomevfs/gnome-vfs-hal-mounts.c.orig	Mon Aug  7 04:16:27 2006
++++ libgnomevfs/gnome-vfs-hal-mounts.c	Sun Sep 17 17:39:48 2006
 @@ -32,7 +32,9 @@
  #include <stdlib.h>
  #include <string.h>
@@ -10,3 +10,34 @@
  #include <sys/types.h>
  #include <unistd.h>
  #include <limits.h>
+@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume
+ 		"/",
+ 		"/bin",
+ 		"/boot",
++		"/compat/linux/proc",
++		"/compat/linux/sys",
+ 		"/dev",
+ 		"/etc",
+ 		"/home",
+ 		"/lib",
+ 		"/lib64",
++		"/libexec",
+ 		"/media",
+ 		"/mnt",
+ 		"/opt",
++		"/rescue",
+ 		"/root",
+ 		"/sbin",
+ 		"/srv",
+ 		"/tmp",
+ 		"/usr",
++		"/usr/local",
++		"/usr/obj",
++		"/usr/ports",
++		"/usr/src",
++		"/usr/X11R6",
+ 		"/var",
++		"/var/tmp",
+ 		"/proc",
+ 		"/sbin",
+ 		NULL
-- 
cgit v1.2.3