Make it build on DragonFly.

3 files changed, 60 insertions, 34 deletions

diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
index 4ccc893d019..1cbf7841a60 100644
--- a/sysutils/gnome-mount/distinfo
+++ b/sysutils/gnome-mount/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/12/25 05:33:20 hasso Exp $
 
 SHA1 (gnome-mount-0.8.tar.gz) = 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb
 RMD160 (gnome-mount-0.8.tar.gz) = 003800eda3edb7747714b1002bd1a1b50ea44fe9
 Size (gnome-mount-0.8.tar.gz) = 505788 bytes
-SHA1 (patch-aa) = f80152c75eef7963dff5ec557d8ff26fd3242b4c
-SHA1 (patch-ab) = c3f771562e599ddfd7abd15466995d78172704f4
+SHA1 (patch-aa) = 31479b417cf7c645cef6f3539aa49576d5104795
+SHA1 (patch-ab) = d2f85ebb00a5a11e7b60d94b6fbd7b7e695185c8
 SHA1 (patch-ac) = 026448555bd9710cda343b6573260e3dcaa28b20
diff --git a/sysutils/gnome-mount/patches/patch-aa b/sysutils/gnome-mount/patches/patch-aa
index 098507d0904..8905f2356c3 100644
--- a/sysutils/gnome-mount/patches/patch-aa
+++ b/sysutils/gnome-mount/patches/patch-aa
@@ -1,20 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2008/12/25 05:33:20 hasso Exp $
 
---- src/gnome-mount-properties-view.c.orig	2008-02-25 16:55:05.000000000 -0500
-+++ src/gnome-mount-properties-view.c
+--- src/gnome-mount-properties-view.c.orig	2008-02-25 23:55:05 +0200
++++ src/gnome-mount-properties-view.c	2008-12-24 22:38:36 +0200
 @@ -35,7 +35,7 @@
  #include <string.h>
  #include <gconf/gconf-client.h>
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <fstab.h>
  #include <sys/param.h>
  #include <sys/ucred.h>
-@@ -59,6 +59,30 @@ struct _GnomeMountPropertiesViewClass {
+@@ -59,7 +59,31 @@ struct _GnomeMountPropertiesViewClass {
  	GtkVBoxClass base_class;
  };
  
+-#ifdef __FreeBSD__
 +#ifdef __NetBSD__
 +static struct opt {
 +	int o_opt;
@@ -39,10 +40,33 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
 +	{ 0, NULL }
 +};
 +#endif
- #ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
  static struct opt {
  	int o_opt;
-@@ -345,6 +369,14 @@ struct mtab_handle
+ 	const char *o_name;
+@@ -79,8 +103,12 @@ static struct opt {
+ 	{ MNT_NOCLUSTERW,	"noclusterw" },
+ 	{ MNT_SUIDDIR,		"suiddir" },
+ 	{ MNT_SOFTDEP,		"soft-updates" },
++#ifdef MNT_MULTILABEL
+ 	{ MNT_MULTILABEL,	"multilabel" },
++#endif
++#ifdef MNT_ACLS
+ 	{ MNT_ACLS,		"acls" },
++#endif
+ #ifdef MNT_GJOURNAL
+ 	{ MNT_GJOURNAL,		"gjournal" },
+ #endif
+@@ -337,7 +365,7 @@ populate_ui_from_gconf (GnomeMountProper
+ 	g_object_unref (gconf_client);
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ struct mtab_handle
+ {
+   struct statfs	*mounts;
+@@ -345,6 +373,14 @@ struct mtab_handle
    int		iter;
  };
  #endif
@@ -57,25 +81,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  
  /* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */
  static void
-@@ -454,7 +486,7 @@ out:
+@@ -454,7 +490,7 @@ out:
  static gboolean
  mtab_open (gpointer *handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	struct mtab_handle *mtab;
  
  	mtab = g_new0 (struct mtab_handle, 1);
-@@ -475,7 +507,7 @@ mtab_open (gpointer *handle)
+@@ -475,7 +511,7 @@ mtab_open (gpointer *handle)
  static gboolean
  mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	struct mtab_handle *mtab = handle;
  
  	if (mtab->iter < mtab->n_mounts) {
-@@ -484,7 +516,11 @@ mtab_next (gpointer handle, char **devic
+@@ -484,7 +520,11 @@ mtab_next (gpointer handle, char **devic
  		GString *optstr;
  
  		optstr = g_string_new("");
@@ -87,12 +111,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  
  		for (o = optnames; flags && o->o_opt; o++) {
  			if (flags & o->o_opt) {
-@@ -517,7 +553,7 @@ mtab_next (gpointer handle, char **devic
+@@ -517,7 +557,7 @@ mtab_next (gpointer handle, char **devic
  static void
  mtab_close (gpointer handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	g_free (handle);
  #else
  	fclose (handle);
diff --git a/sysutils/gnome-mount/patches/patch-ab b/sysutils/gnome-mount/patches/patch-ab
index 34297894584..81baff483d4 100644
--- a/sysutils/gnome-mount/patches/patch-ab
+++ b/sysutils/gnome-mount/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/25 05:33:20 hasso Exp $
 
---- src/gnome-mount.c.orig	2008-04-16 19:41:32.000000000 -0400
-+++ src/gnome-mount.c
+--- src/gnome-mount.c.orig	2008-04-17 02:41:32 +0300
++++ src/gnome-mount.c	2008-12-24 22:39:47 +0200
 @@ -31,6 +31,10 @@
  #include <string.h>
  #include <stdlib.h>
@@ -18,23 +18,25 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  #endif
  
 -#if !defined(sun) && !defined(__FreeBSD__)
-+#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <mntent.h>
 -#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <fstab.h>
  #include <sys/param.h>
  #include <sys/ucred.h>
-@@ -677,7 +681,7 @@ static char *
+@@ -677,15 +681,19 @@ static char *
  get_mntent_mount_point(const char *device_file)
  {
  	char *mount_point;
 -#if! defined(sun) && !defined(__FreeBSD__)
-+#if! defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if! defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  	FILE *f;
  	struct mntent mnt;
  	struct mntent *mnte;
-@@ -686,6 +690,10 @@ get_mntent_mount_point(const char *devic
+ 	char buf[512];
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
  	struct statfs *mounts;
  	int n_mounts;
  	int i;
@@ -50,7 +52,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  	mount_point = NULL;
  
 -#if !defined(sun) && !defined(__FreeBSD__)
-+#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  	if ((f = setmntent ("/proc/mounts", "r")) != NULL) {
  		
  		while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
@@ -59,14 +61,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  		fclose(f);
  	}
 -#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	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__ */
-+#endif /* sun && __FreeBSD__ && __NetBSD__ */
++#endif /* sun && __FreeBSD__ && __NetBSD__ && __DragonFly__ */
  
  out:
  	return (mount_point);
@@ -75,7 +77,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  fstab_open (gpointer *handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	return setfsent () == 1;
  #else
  	*handle = fopen ("/etc/fstab", "r");
@@ -84,7 +86,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  fstab_next (gpointer handle, char **mount_point)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	struct fstab *fstab;
  
  	fstab = getfsent ();
@@ -93,7 +95,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  fstab_close (gpointer handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	endfsent ();
  #else
  	fclose (handle);
@@ -102,7 +104,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  }
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #define MOUNT		"/sbin/mount"
  #define UMOUNT		"/sbin/umount"
  #else
@@ -111,7 +113,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  		/* volume from a non-pollable drive, just set uid.. */
  		
 -#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  		snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
  #else
  		snprintf (uidbuf, sizeof (uidbuf) - 1, "-u=%u", getuid ());
@@ -120,7 +122,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
  
  				/* special workaround to replace "uid=" with "uid=<actual uid of caller>" */
 -#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  				if (strcmp (option, "uid=") == 0) {
  					g_free (option);
  					option = g_strdup_printf ("uid=%u", getuid ());