Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

View File

@@ -0,0 +1,10 @@
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.

View File

@@ -0,0 +1,34 @@
# $NetBSD: Makefile,v 1.29 2013/06/06 12:55:03 wiz Exp $
#
DISTNAME= gnome-mount-0.8
PKGREVISION= 24
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://hal.freedesktop.org/
COMMENT= Programs for mounting, unmounting and ejecting storage devices
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= YES
GCONF_SCHEMAS+= gnome-mount.schemas
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
post-extract:
${CP} ${FILESDIR}/gnome-mount.schemas.in.NetBSD ${WRKSRC}/gnome-mount.schemas.in
.endif
.include "../../devel/GConf/schemas.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../security/libgnome-keyring/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/hal/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View File

@@ -0,0 +1,36 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:05 joerg Exp $
bin/gnome-eject
bin/gnome-mount
bin/gnome-umount
lib/nautilus/extensions-2.0/libgnome-mount.la
lib/pkgconfig/gnome-mount.pc
man/man1/gnome-mount.1
share/gconf/schemas/gnome-mount.schemas
share/gnome-mount/gnome-mount-properties.glade
share/locale/ar/LC_MESSAGES/gnome-mount.mo
share/locale/be/LC_MESSAGES/gnome-mount.mo
share/locale/be@latin/LC_MESSAGES/gnome-mount.mo
share/locale/ca/LC_MESSAGES/gnome-mount.mo
share/locale/da/LC_MESSAGES/gnome-mount.mo
share/locale/dz/LC_MESSAGES/gnome-mount.mo
share/locale/el/LC_MESSAGES/gnome-mount.mo
share/locale/en_GB/LC_MESSAGES/gnome-mount.mo
share/locale/es/LC_MESSAGES/gnome-mount.mo
share/locale/fi/LC_MESSAGES/gnome-mount.mo
share/locale/fr/LC_MESSAGES/gnome-mount.mo
share/locale/hu/LC_MESSAGES/gnome-mount.mo
share/locale/it/LC_MESSAGES/gnome-mount.mo
share/locale/ja/LC_MESSAGES/gnome-mount.mo
share/locale/lv/LC_MESSAGES/gnome-mount.mo
share/locale/mk/LC_MESSAGES/gnome-mount.mo
share/locale/nb/LC_MESSAGES/gnome-mount.mo
share/locale/oc/LC_MESSAGES/gnome-mount.mo
share/locale/pa/LC_MESSAGES/gnome-mount.mo
share/locale/pl/LC_MESSAGES/gnome-mount.mo
share/locale/pt/LC_MESSAGES/gnome-mount.mo
share/locale/pt_BR/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
share/locale/zh_HK/LC_MESSAGES/gnome-mount.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mount.mo

View File

@@ -0,0 +1,20 @@
# $NetBSD: buildlink3.mk,v 1.19 2013/02/16 11:18:27 wiz Exp $
BUILDLINK_TREE+= gnome-mount
.if !defined(GNOME_MOUNT_BUILDLINK3_MK)
GNOME_MOUNT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-mount+= gnome-mount>=0.8nb1
BUILDLINK_ABI_DEPENDS.gnome-mount+= gnome-mount>=0.8nb20
BUILDLINK_PKGSRCDIR.gnome-mount?= ../../sysutils/gnome-mount
#.include "../../security/gnome-keyring/buildlink3.mk"
#.include "../../sysutils/dbus-glib/buildlink3.mk"
#.include "../../sysutils/hal/buildlink3.mk"
#.include "../../sysutils/libnotify/buildlink3.mk"
#.include "../../sysutils/nautilus/buildlink3.mk"
#.include "../../x11/gtk2/buildlink3.mk"
.endif # GNOME_MOUNT_BUILDLINK3_MK
BUILDLINK_TREE+= -gnome-mount

View File

@@ -0,0 +1,8 @@
$NetBSD: distinfo,v 1.3 2009/03/10 05:24:35 dsainty 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) = 31479b417cf7c645cef6f3539aa49576d5104795
SHA1 (patch-ab) = ca905485a13762e197be6862b04a801f5716ddcd
SHA1 (patch-ac) = 026448555bd9710cda343b6573260e3dcaa28b20

View File

@@ -0,0 +1,77 @@
<gconfschemafile>
<!-- $NetBSD: gnome-mount.schemas.in.NetBSD,v 1.1 2008/11/24 01:16:18 jmcneill Exp $ -->
<schemalist>
<schema>
<key>/schemas/system/storage/default_options/vfat/mount_options</key>
<applyto>/system/storage/default_options/vfat/mount_options</applyto>
<type>list</type>
<list_type>string</list_type>
<default>[-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>
</locale>
</schema>
<schema>
<key>/schemas/system/storage/default_options/iso9660/mount_options</key>
<applyto>/system/storage/default_options/iso9660/mount_options</applyto>
<type>list</type>
<list_type>string</list_type>
<default>[-u=]</default>
<locale name="C">
<short>Default mount options for iso9660 fs</short>
<long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/storage/default_options/udf/mount_options</key>
<applyto>/system/storage/default_options/udf/mount_options</applyto>
<type>list</type>
<list_type>string</list_type>
<default>[-u=]</default>
<locale name="C">
<short>Default mount options for udf fs</short>
<long>A list of default mount options for volumes formatted with the udf file system.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/storage/default_options/ntfs/mount_options</key>
<applyto>/system/storage/default_options/ntfs/mount_options</applyto>
<type>list</type>
<list_type>string</list_type>
<default>[-u=]</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>
</locale>
</schema>
<schema>
<key>/schemas/system/storage/default_options/ntfs/fstype_override</key>
<applyto>/system/storage/default_options/ntfs/fstype_override</applyto>
<type>string</type>
<default>ntfs-3g</default>
<locale name="C">
<short>When 'ntfs' is detected, what file system driver to use by default</short>
<long>The name of the file system driver to use by default when 'ntfs' is detected. This is useful for configuring the system to use the 'ntfs-3g' driver for all 'ntfs' file systems by default. User can still choose to use the 'ntfs' file system driver by overriding it per-volume or on the command line.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/storage/default_options/ntfs-3g/mount_options</key>
<applyto>/system/storage/default_options/ntfs-3g/mount_options</applyto>
<type>list</type>
<list_type>string</list_type>
<default>[locale=]</default>
<locale name="C">
<short>Default mount options for ntfs-3g fs</short>
<long>A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

View File

@@ -0,0 +1,122 @@
$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 <string.h>
#include <gconf/gconf-client.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <fstab.h>
#include <sys/param.h>
#include <sys/ucred.h>
@@ -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);

View File

@@ -0,0 +1,125 @@
$NetBSD: patch-ab,v 1.3 2009/03/10 05:24:36 dsainty Exp $
--- src/gnome-mount.c.orig 2008-04-17 11:41:32.000000000 +1200
+++ src/gnome-mount.c 2009-03-10 17:11:00.000000000 +1300
@@ -30,6 +30,7 @@
#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
+#include <locale.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -51,9 +52,9 @@
#define NOTIFY_EXPIRES_DEFAULT -1
#endif
-#if !defined(sun) && !defined(__FreeBSD__)
+#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
#include <mntent.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <fstab.h>
#include <sys/param.h>
#include <sys/ucred.h>
@@ -677,15 +678,19 @@
get_mntent_mount_point(const char *device_file)
{
char *mount_point;
-#if! defined(sun) && !defined(__FreeBSD__)
+#if! defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
FILE *f;
struct mntent mnt;
struct mntent *mnte;
char buf[512];
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
struct statfs *mounts;
int n_mounts;
int i;
+#elif defined(__NetBSD__)
+ struct statvfs *mounts;
+ int n_mounts;
+ int i;
#elif defined(sun)
FILE *f;
struct mnttab mnt;
@@ -694,7 +699,7 @@
mount_point = NULL;
-#if !defined(sun) && !defined(__FreeBSD__)
+#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) {
@@ -717,13 +722,13 @@
}
fclose(f);
}
-#elif defined(__FreeBSD__)
+#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__ && __DragonFly__ */
out:
return (mount_point);
@@ -862,7 +867,7 @@
static gboolean
fstab_open (gpointer *handle)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
return setfsent () == 1;
#else
*handle = fopen ("/etc/fstab", "r");
@@ -873,7 +878,7 @@
static char *
fstab_next (gpointer handle, char **mount_point)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
struct fstab *fstab;
fstab = getfsent ();
@@ -901,7 +906,7 @@
static void
fstab_close (gpointer handle)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
endfsent ();
#else
fclose (handle);
@@ -1116,7 +1121,7 @@
return ret;
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#define MOUNT "/sbin/mount"
#define UMOUNT "/sbin/umount"
#else
@@ -1451,7 +1456,7 @@
if (volume == NULL && (mount_options->len == 0)) {
/* volume from a non-pollable drive, just set uid.. */
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
#else
snprintf (uidbuf, sizeof (uidbuf) - 1, "-u=%u", getuid ());
@@ -1482,7 +1487,7 @@
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 !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
if (strcmp (option, "uid=") == 0) {
g_free (option);
option = g_strdup_printf ("uid=%u", getuid ());

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
--- Makefile.in.orig 2008-11-22 12:44:39.000000000 -0500
+++ Makefile.in
@@ -248,7 +248,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src po
-schemadir = $(sysconfdir)/gconf/schemas
+schemadir = $(datadir)/gconf/schemas
schema_in_files = gnome-mount.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
pkgconfigdir = $(libdir)/pkgconfig