From 52060c3fe76fab1da4b38236ae2148c03e3aaf23 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sun, 26 Nov 2006 21:34:49 +0000
Subject: Update mount options for vfat and ntfs file systems.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7958 df743ca5-7f9a-e211-a948-0013205c9059
---
 sysutils/gnome-mount/Makefile                      |  4 +--
 .../gnome-mount/files/patch-gnome-mount.schemas.in |  8 +++---
 sysutils/gnome-mount/files/patch-src_gnome-mount.c | 30 +++++++++++++++++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 41ef9828a..193976ed6 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.6 2006/11/14 02:46:51 marcus Exp $
+#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.7 2006/11/19 21:36:27 marcus Exp $
 #
 
 PORTNAME=	gnome-mount
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~david/dist/
 
diff --git a/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
index 28c9ceab3..3868c56b3 100644
--- a/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
+++ b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
@@ -1,11 +1,11 @@
---- gnome-mount.schemas.in.orig	Sun Nov 19 16:32:47 2006
-+++ gnome-mount.schemas.in	Sun Nov 19 16:34:14 2006
+--- gnome-mount.schemas.in.orig	Wed Jun 21 22:45:53 2006
++++ gnome-mount.schemas.in	Sun Nov 26 16:30:37 2006
 @@ -6,7 +6,7 @@
          <applyto>/system/storage/default_options/vfat/mount_options</applyto>
          <type>list</type>
          <list_type>string</list_type>
 -        <default>[shortname=winnt,uid=]</default>
-+        <default>[shortnames]</default>
++        <default>[shortnames,-u=]</default>
          <locale name="C">
            <short>Default mount options for vfat fs</short>
            <long>A list of default mount options for volumes formatted with the vfat file system.</long>
@@ -32,7 +32,7 @@
          <type>list</type>
          <list_type>string</list_type>
 -        <default>[umask=222]</default>
-+        <default>[]</default>
++        <default>[-m=222]</default>
          <locale name="C">
            <short>Default mount options for ntfs fs</short>
            <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
index 61d5c544a..786dbc40c 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
@@ -1,5 +1,5 @@
 --- src/gnome-mount.c.orig	Sun Sep 17 01:17:54 2006
-+++ src/gnome-mount.c	Mon Nov 13 21:40:26 2006
++++ src/gnome-mount.c	Sun Nov 26 16:28:25 2006
 @@ -51,9 +51,14 @@
  #include <libhal.h>
  #include <libhal-storage.h>
@@ -70,3 +70,31 @@
  
  out:
  	return (mount_point);
+@@ -1322,7 +1337,11 @@ volume_mount (const char *udi, LibHalVol
+ 	if (volume == NULL && (mount_options->len == 0)) {
+ 		/* volume from a non-pollable drive, just set uid.. */
+ 		
++#ifndef __FreeBSD__
+ 		snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
++#else
++		snprintf (uidbuf, sizeof (uidbuf) - 1, "-u=%u", getuid ());
++#endif
+ 		g_ptr_array_add (mount_options, uidbuf);
+ 		
+ 	} else if (((fstype_override != NULL) || (fstype != NULL)) && (mount_options->len == 0)) {
+@@ -1349,9 +1368,15 @@ volume_mount (const char *udi, LibHalVol
+ 				g_debug ("read default option '%s' from gconf strlist key %s", option, key);
+ 
+ 				/* special workaround to replace "uid=" with "uid=<actual uid of caller>" */
++#ifndef __FreeBSD__
+ 				if (strcmp (option, "uid=") == 0) {
+ 					g_free (option);
+ 					option = g_strdup_printf ("uid=%u", getuid ());
++#else
++				if (strcmp (option, "-u=") == 0) {
++					g_free (option);
++					option = g_strdup_printf ("-u=%u", getuid ());
++#endif
+ 				}
+ 				g_ptr_array_add (mount_options, option);
+ 
-- 
cgit v1.2.3