head 1.3; access; symbols pkgsrc-2019Q4:1.2.0.94 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.90 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.88 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.86 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.84 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.82 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.80 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.78 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.76 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.74 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.70 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.68 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.66 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.64 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.62 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.60 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.58 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.56 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.54 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.52 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.50 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.48 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.46 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.44 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.42 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.40 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.38 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.36 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.34 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.32 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.30 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.28 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.26 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.24 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.22 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.20 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.18 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.16 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.14 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.12 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.10 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2020.01.16.15.17.36; author nia; state dead; branches; next 1.2; commitid gBWrmixy1VXmAVSB; 1.2 date 2008.12.25.05.33.20; author hasso; state Exp; branches; next 1.1; 1.1 date 2008.11.22.17.54.42; author jmcneill; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.11.22.17.54.42; author jmcneill; state Exp; branches; next ; desc @@ 1.3 log @sysutils: Remove gnome-mount. Another dead GNOME 2 component. @ text @$NetBSD: patch-aa,v 1.2 2008/12/25 05:33:20 hasso Exp $ --- 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 #include -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include #include #include @@@@ -59,7 +59,31 @@@@ struct _GnomeMountPropertiesViewClass { GtkVBoxClass base_class; }; -#ifdef __FreeBSD__ +#ifdef __NetBSD__ +static struct opt { + int o_opt; + const char *o_name; +} optnames[] = { + { MNT_ASYNC, "async" }, + { MNT_NOCOREDUMP, "nocoredump" }, + { MNT_NODEV, "nodev" }, + { MNT_NODEVMTIME, "nodevmtime" }, + { MNT_NOEXEC, "noexec" }, + { MNT_NOSUID, "nosuid" }, + { MNT_RDONLY, "rdonly" }, + { MNT_SYNCHRONOUS, "sync" }, + { MNT_UNION, "union" }, + { MNT_NOATIME, "noatime" }, + { MNT_SYMPERM, "symperm" }, + { MNT_SOFTDEP, "softdep" }, +#ifdef MNT_LOG + { MNT_LOG, "log" }, +#endif + { MNT_IGNORE, "hidden" }, + { 0, NULL } +}; +#endif +#if defined(__FreeBSD__) || defined(__DragonFly__) static struct opt { int o_opt; 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 +#ifdef __NetBSD__ +struct mtab_handle +{ + struct statvfs *mounts; + int n_mounts; + int iter; +}; +#endif /* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */ static void @@@@ -454,7 +490,7 @@@@ out: static gboolean mtab_open (gpointer *handle) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) struct mtab_handle *mtab; mtab = g_new0 (struct mtab_handle, 1); @@@@ -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__) || defined(__DragonFly__) struct mtab_handle *mtab = handle; if (mtab->iter < mtab->n_mounts) { @@@@ -484,7 +520,11 @@@@ mtab_next (gpointer handle, char **devic GString *optstr; optstr = g_string_new(""); +#if defined(__NetBSD__) + flags = mtab->mounts[mtab->iter].f_flag & MNT_VISFLAGMASK; +#else flags = mtab->mounts[mtab->iter].f_flags & MNT_VISFLAGMASK; +#endif for (o = optnames; flags && o->o_opt; o++) { if (flags & o->o_opt) { @@@@ -517,7 +557,7 @@@@ mtab_next (gpointer handle, char **devic static void mtab_close (gpointer handle) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) g_free (handle); #else fclose (handle); @ 1.2 log @Make it build on DragonFly. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/gnome-mount-properties-view.c.orig 2008-02-25 16:55:05.000000000 -0500 +++ src/gnome-mount-properties-view.c d10 1 a10 1 +#if defined(__FreeBSD__) || defined(__NetBSD__) d14 1 a14 1 @@@@ -59,6 +59,30 @@@@ struct _GnomeMountPropertiesViewClass { d18 1 d43 1 a43 1 #ifdef __FreeBSD__ d46 24 a69 1 @@@@ -345,6 +369,14 @@@@ struct mtab_handle d84 1 a84 1 @@@@ -454,7 +486,7 @@@@ out: d89 1 a89 1 +#if defined(__FreeBSD__) || defined(__NetBSD__) d93 1 a93 1 @@@@ -475,7 +507,7 @@@@ mtab_open (gpointer *handle) d98 1 a98 1 +#if defined(__FreeBSD__) || defined(__NetBSD__) d102 1 a102 1 @@@@ -484,7 +516,11 @@@@ mtab_next (gpointer handle, char **devic d114 1 a114 1 @@@@ -517,7 +553,7 @@@@ mtab_next (gpointer handle, char **devic d119 1 a119 1 +#if defined(__FreeBSD__) || defined(__NetBSD__) @ 1.1.1.1 log @Import gnome-mount version 0.8. The grand plan with gnome-mount is to get the appropriate GNOME software (such as gnome-volume-manager and gnome-vfs) to use this instead of invoking mount(1)/umount(1)/eject(1) / invoking methods on HAL directly. Included in gnome-mount is also gnome-umount and gnome-eject. All programs utilize the methods on HAL and as such run unprivileged. The rationale for gnome-mount is to have a centralized place (in gconf) where settings (e.g. mount options, mount location) are maintained. @ text @@