diff options
| -rw-r--r-- | sysutils/gnome-mount/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/gnome-mount/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/gnome-mount/files/mntent.h | 56 | ||||
| -rw-r--r-- | sysutils/gnome-mount/files/patch-src_gnome-mount.c | 37 | ||||
| -rw-r--r-- | sysutils/gnome-mount/pkg-plist | 8 |
5 files changed, 98 insertions, 21 deletions
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile index 71c657dd3..6327c9efd 100644 --- a/sysutils/gnome-mount/Makefile +++ b/sysutils/gnome-mount/Makefile @@ -3,13 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.1 2006/06/04 17:40:15 marcus Exp $ +# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.2 2006/07/21 20:46:59 mezz Exp $ # PORTNAME= gnome-mount -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= sysutils gnome -MASTER_SITES= http://people.freedesktop.org/~david/ +MASTER_SITES= http://people.freedesktop.org/~david/dist/ MAINTAINER= gnome@FreeBSD.org COMMENT= A font-end to mount, umount, and eject using HAL @@ -17,12 +17,16 @@ 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 libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-nautilus-extension CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-mount.schemas +post-extract: + @${CP} -f ${FILESDIR}/mntent.h ${WRKSRC}/src + .include <bsd.port.mk> diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo index 5273de628..656c03825 100644 --- a/sysutils/gnome-mount/distinfo +++ b/sysutils/gnome-mount/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-mount-0.3.tar.gz) = 2bf5649b21e98378c49e44bbd42bf89d -SHA256 (gnome-mount-0.3.tar.gz) = 13269aa6f767b8e65eb795a29041308ac664ccff9b5ce15eacbf52c5d62dc719 -SIZE (gnome-mount-0.3.tar.gz) = 112926 +MD5 (gnome-mount-0.4.tar.gz) = 75f260ea6b0ec3c5e0af3c722fbd9568 +SHA256 (gnome-mount-0.4.tar.gz) = fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8 +SIZE (gnome-mount-0.4.tar.gz) = 364546 diff --git a/sysutils/gnome-mount/files/mntent.h b/sysutils/gnome-mount/files/mntent.h new file mode 100644 index 000000000..078b246cd --- /dev/null +++ b/sysutils/gnome-mount/files/mntent.h @@ -0,0 +1,56 @@ +/* + * mntent + * mntent.h - compatability header for FreeBSD + * + * Copyright (c) 2001 David Rufino <daverufino@btinternet.com> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(HAVE_MNTENT_H) +#include <mntent.h> +#else +#ifndef _MNTENT_H +#define _MNTENT_H +#include <stdio.h> + +#define MOUNTED "dummy" + +#define MNTTYPE_NFS "nfs" + +struct mntent { + char *mnt_fsname; + char *mnt_dir; + char *mnt_type; + char *mnt_opts; + int mnt_freq; + int mnt_passno; +}; + +#define setmntent(x,y) ((FILE *)0x1) +struct mntent *getmntent __P ((FILE *fp)); +char *hasmntopt __P ((const struct mntent *mnt, const char *option)); +#define endmntent(x) ((int)1) + +#endif /* _MNTENT_H */ +#endif /* HAVE_MNTENT_H */ diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c index 217cae97a..eb78bab37 100644 --- a/sysutils/gnome-mount/files/patch-src_gnome-mount.c +++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c @@ -1,18 +1,29 @@ ---- src/gnome-mount.c.orig Sun Jun 4 13:20:44 2006 -+++ src/gnome-mount.c Sun Jun 4 13:27:18 2006 -@@ -338,6 +338,7 @@ main (int argc, char *argv[]) +--- src/gnome-mount.c.orig Mon Sep 4 21:41:09 2006 ++++ src/gnome-mount.c Mon Sep 4 21:45:53 2006 +@@ -42,7 +42,7 @@ + #include <libhal.h> + #include <libhal-storage.h> - fsoptions = NULL; +-#include <mntent.h> ++#include "mntent.h" -+#ifdef __linux__ - snprintf (uidbuf, sizeof(uidbuf) - 1, "uid=%d", getuid()); + static DBusConnection *dbus_connection; + static LibHalContext *hal_ctx; +@@ -477,7 +477,7 @@ - /* TODO: read defaults from gconf */ -@@ -349,6 +350,7 @@ main (int argc, char *argv[]) - } else if (strcmp (fstype, "udf") == 0) { - fsoptions = g_list_append (fsoptions, uidbuf); + mount_point = NULL; + device_file = get_dev_file (volume, drive); +- ++#ifdef __linux__ + if (device_file != NULL) { + FILE *f; + struct mntent mnt; +@@ -497,7 +497,7 @@ + endmntent (f); } + } +- +#endif - - /* TODO: read per-volume settings from gconf and adjust fsoptions */ - + g_print (_("Mounted %s at \"%s\"\n"), device_file, mount_point); + g_free (mount_point); + } diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist index 12cb1f6e5..e9adc5d76 100644 --- a/sysutils/gnome-mount/pkg-plist +++ b/sysutils/gnome-mount/pkg-plist @@ -1,6 +1,12 @@ bin/gnome-eject bin/gnome-mount -bin/gnome-mount-properties bin/gnome-umount +nautilus/extensions-1.0/libgnome-mount.a +nautilus/extensions-1.0/libgnome-mount.la +nautilus/extensions-1.0/libgnome-mount.so +libdata/pkgconfig/gnome-mount.pc share/gnome/gnome-mount/gnome-mount-properties.glade +share/locale/it/LC_MESSAGES/gnome-mount.mo +share/locale/ja/LC_MESSAGES/gnome-mount.mo +share/locale/nb/LC_MESSAGES/gnome-mount.mo @dirrm share/gnome/gnome-mount |