Update to 0.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7916 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 201 insertions, 0 deletions

diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
new file mode 100644
index 000000000..6aa317ff5
--- /dev/null
+++ b/sysutils/gnome-mount/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	gnome-mount
+# Date created:			04 June 2006
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/sysutils/gnome-mount/Makefile,v 1.2 2006/11/05 03:47:43 mezz Exp $
+#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.4 2006/10/05 07:37:38 mezz Exp $
+#
+
+PORTNAME=	gnome-mount
+PORTVERSION=	0.5
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	http://people.freedesktop.org/~david/dist/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A font-end to mount, umount, and eject using HAL
+
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
+
+USE_XLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-nautilus-extension
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	gnome-mount.schemas
+MAN1=		gnome-mount.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|0.5.8.1|0.5.8|g' \
+	    	${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
new file mode 100644
index 000000000..fa1d4818b
--- /dev/null
+++ b/sysutils/gnome-mount/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-mount-0.5.tar.gz) = 76622ff9af0131fc44687aed7204f84f
+SHA256 (gnome-mount-0.5.tar.gz) = f705a44a2534acdae8bae752c54066eb3fc85ce082b3a25a50310f4ad377019b
+SIZE (gnome-mount-0.5.tar.gz) = 408472
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
new file mode 100644
index 000000000..7a27d52d5
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
@@ -0,0 +1,71 @@
+--- src/gnome-mount-properties-view.c.orig	Mon Nov 13 21:14:43 2006
++++ src/gnome-mount-properties-view.c	Mon Nov 13 21:36:10 2006
+@@ -59,6 +59,33 @@ struct _GnomeMountPropertiesViewClass {
+ 	GtkVBoxClass base_class;
+ };
+ 
++#ifdef __FreeBSD__
++static struct opt {
++	int o_opt;
++	const char *o_name;
++} optnames[] = {
++	{ MNT_ASYNC,		"asynchronous" },
++	{ MNT_EXPORTED,		"NFS exported" },
++	{ MNT_LOCAL,		"local" },
++	{ MNT_NOATIME,		"noatime" },
++	{ MNT_NOEXEC,		"noexec" },
++	{ MNT_NOSUID,		"nosuid" },
++	{ MNT_NOSYMFOLLOW,	"nosymfollow" },
++	{ MNT_QUOTA,		"with quotas" },
++	{ MNT_RDONLY,		"read-only" },
++	{ MNT_SYNCHRONOUS,	"synchronous" },
++	{ MNT_UNION,		"union" },
++	{ MNT_NOCLUSTERR,	"noclusterr" },
++	{ MNT_NOCLUSTERW,	"noclusterw" },
++	{ MNT_SUIDDIR,		"suiddir" },
++	{ MNT_SOFTDEP,		"soft-updates" },
++	{ MNT_MULTILABEL,	"multilabel" },
++	{ MNT_ACLS,		"acls" },
++	{ MNT_GJOURNAL,		"gjournal" },
++	{ 0, NULL }
++};
++#endif
++
+ G_DEFINE_TYPE (GnomeMountPropertiesView, gm_properties_view, GTK_TYPE_VBOX)
+ 
+ static void
+@@ -445,13 +472,29 @@ static gboolean
+ mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
+ {
+ #ifdef __FreeBSD__
+-#error FIXME TODO XXX fix this up for FreeBSD. Thanks.
+ 	struct mtab_handle *mtab = handle;
+ 
+-	if (mtab->iter < mtab->n_mounts)
+-		return mtab->mounts[mtab->iter++].f_mntfromname;
+-	else
+-		return NULL;
++	if (mtab->iter < mtab->n_mounts) {
++		struct opt *o;
++		int flags;
++		GString *optstr;
++
++		optstr = g_string_new("");
++		flags = mtab->mounts[mtab->iter].f_flags & MNT_VISFLAGMASK;
++
++		for (o = optnames; flags && o->o_opt; o++) {
++			if (flags & o->o_opt) {
++				g_string_append_printf(optstr, ", %s", o->o_name);
++				flags &= ~o->o_opt;
++			}
++		}
++		*device_file = mtab->mounts[mtab->iter].f_mntfromname;
++		*mount_options = g_string_free(optstr, FALSE);
++		*mount_fstype = mtab->mounts[mtab->iter++].f_fstypename;
++		return TRUE;
++	} else {
++		return FALSE;
++	}
+ #else
+ 	struct mntent *mnt;
+ 
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
new file mode 100644
index 000000000..61d5c544a
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
@@ -0,0 +1,72 @@
+--- src/gnome-mount.c.orig	Sun Sep 17 01:17:54 2006
++++ src/gnome-mount.c	Mon Nov 13 21:40:26 2006
+@@ -51,9 +51,14 @@
+ #include <libhal.h>
+ #include <libhal-storage.h>
+ 
+-#ifndef sun
++#if !defined(sun) && !defined(__FreeBSD__)
+ #include <mntent.h>
+-#else
++#elif defined(__FreeBSD__)
++#include <fstab.h>
++#include <sys/param.h>
++#include <sys/ucred.h>
++#include <sys/mount.h>
++#elif defined(sun)
+ #include <sys/mnttab.h>
+ #endif
+ 
+@@ -582,19 +587,24 @@ static char *
+ get_mntent_mount_point(const char *device_file)
+ {
+ 	char *mount_point;
++#if! defined(sun) && !defined(__FreeBSD__)
+ 	FILE *f;
+-#ifndef sun
+ 	struct mntent mnt;
+ 	struct mntent *mnte;
+ 	char buf[512];
+-#else
++#elif defined(__FreeBSD__)
++	struct statfs *mounts;
++	int n_mounts;
++	int i;
++#elif defined(sun)
++	FILE *f;
+ 	struct mnttab mnt;
+ 	struct mnttab mpref = { NULL, NULL, NULL, NULL, NULL };
+ #endif
+ 
+ 	mount_point = NULL;
+ 
+-#ifndef sun
++#if !defined(sun) && !defined(__FreeBSD__)
+ 	if ((f = setmntent ("/proc/mounts", "r")) != NULL) {
+ 		
+ 		while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
+@@ -608,7 +618,7 @@ get_mntent_mount_point(const char *devic
+ 		endmntent (f);
+ 	}
+ 
+-#else /* sun */
++#elif defined(sun) /* sun */
+ 
+ 	if ((f = fopen(MNTTAB, "r")) != NULL) {
+ 		mpref.mnt_special = (char *)device_file;
+@@ -617,8 +627,13 @@ get_mntent_mount_point(const char *devic
+ 		}
+ 		fclose(f);
+ 	}
+-
+-#endif /* sun */
++#elif defined(__FreeBSD__)
++	n_mounts = getmntinfo(&mounts, MNT_NOWAIT);
++	for (i = 0; i < n_mounts; i++) {
++		if (!strcmp(mounts[i].f_mntfromname, device_file))
++			mount_point = g_strdup (mounts[i].f_mntonname);
++	}
++#endif /* sun && __FreeBSD__ */
+ 
+ out:
+ 	return (mount_point);
diff --git a/sysutils/gnome-mount/pkg-descr b/sysutils/gnome-mount/pkg-descr
new file mode 100644
index 000000000..a75d36294
--- /dev/null
+++ b/sysutils/gnome-mount/pkg-descr
@@ -0,0 +1,2 @@
+gnome-mount is a HAL-based front-end to mount, umount, and eject which
+offers a centralized place where settings for these commands are maintained.
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
new file mode 100644
index 000000000..685e8a439
--- /dev/null
+++ b/sysutils/gnome-mount/pkg-plist
@@ -0,0 +1,18 @@
+bin/gnome-eject
+bin/gnome-mount
+bin/gnome-umount
+lib/nautilus/extensions-1.0/libgnome-mount.a
+lib/nautilus/extensions-1.0/libgnome-mount.la
+lib/nautilus/extensions-1.0/libgnome-mount.so
+libdata/pkgconfig/gnome-mount.pc
+share/gnome/gnome-mount/gnome-mount-properties.glade
+share/locale/en_GB/LC_MESSAGES/gnome-mount.mo
+share/locale/es/LC_MESSAGES/gnome-mount.mo
+share/locale/it/LC_MESSAGES/gnome-mount.mo
+share/locale/ja/LC_MESSAGES/gnome-mount.mo
+share/locale/mk/LC_MESSAGES/gnome-mount.mo
+share/locale/nb/LC_MESSAGES/gnome-mount.mo
+share/locale/ru/LC_MESSAGES/gnome-mount.mo
+share/locale/sv/LC_MESSAGES/gnome-mount.mo
+share/locale/vi/LC_MESSAGES/gnome-mount.mo
+@dirrm share/gnome/gnome-mount