Update to 1.7.1

Make avahi optional [1]
Remove 6.x support.
Use bsd.port.options.mk

PR:		ports/153327 [1]
Submitted by:	"" <moonshade@pnhz.kz>


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

10 files changed, 367 insertions, 0 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
new file mode 100644
index 000000000..47fb8c4d6
--- /dev/null
+++ b/devel/gvfs/Makefile
@@ -0,0 +1,86 @@
+# New ports collection makefile for:	gvfs
+# Date created:		2007-11-06
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/devel/gvfs/Makefile,v 1.66 2010/11/13 01:48:28 kwm Exp $
+#
+
+PORTNAME=	gvfs
+PORTVERSION=	1.7.1
+CATEGORIES=	devel gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME virtual file system
+
+LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
+    		hal.1:${PORTSDIR}/sysutils/hal \
+		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
+		gnome-keyring:${PORTSDIR}/security/gnome-keyring
+RUN_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+
+USE_BZIP2=	yes
+USE_GNOME=	glib20 gnomehack gnomeprefix intlhack intltool
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-obexftp
+OPTIONS=	FUSE "Enable fuse" off \
+		AVAHI "Enable AVAHI" on \
+		SAMBA "Enable Samba" on \
+		GPHOTO2 "Enable Gphoto 2 camera support" on \
+		CDDA "Enable CDDA" on
+
+GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_FUSE)
+LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
+RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
+PLIST_SUB+=	FUSE=""
+.else
+CONFIGURE_ARGS+=	--disable-fuse
+PLIST_SUB+=	FUSE="@comment "
+.endif
+
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+GLIB_SCHEMAS+=	org.gnome.system.smb.gschema.xml
+PLIST_SUB+=	SMB=""
+.else
+CONFIGURE_ARGS+=	--disable-samba
+PLIST_SUB+=	SMB="@comment "
+.endif
+
+.if defined(WITH_CDDA)
+LIB_DEPENDS+=	cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio
+PLIST_SUB+=	CDDA=""
+.else
+CONFIGURE_ARGS+=	--disable-cdda
+PLIST_SUB+=	CDDA="@comment "
+.endif
+
+.if defined(WITH_GPHOTO2)
+LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+PLIST_SUB+=	GPHOTO2=""
+.else
+CONFIGURE_ARGS+=	--disable-gphoto2
+PLIST_SUB+=	GPHOTO2="@comment "
+.endif
+
+.if defined(WITH_AVAHI)
+LIB_DEPENDS+=	avahi-client.3:${PORTSDIR}/net/avahi-app
+GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
+PLIST_SUB+=	AVAHI=""
+.else
+CONFIGURE_ARGS+=--disable-avahi
+PLIST_SUB+=	AVAHI="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
new file mode 100644
index 000000000..b51547618
--- /dev/null
+++ b/devel/gvfs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gvfs-1.7.1.tar.bz2) = 38f119311619d40c52701626a2564b90a3aecb1224adf1d2ca04ea3c94bd57ea
+SIZE (gnome2/gvfs-1.7.1.tar.bz2) = 1406874
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in
new file mode 100644
index 000000000..658cccd6a
--- /dev/null
+++ b/devel/gvfs/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2008-07-22 23:17:58.000000000 -0400
++++ Makefile.in	2008-07-22 23:18:24.000000000 -0400
+@@ -269,7 +269,6 @@ SUBDIRS = \
+ 	gconf \
+ 	po   \
+ 	programs \
+-	test \
+ 	$(NULL)
+ 
+ EXTRA_DIST = \
diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in
new file mode 100644
index 000000000..1470cbce0
--- /dev/null
+++ b/devel/gvfs/files/patch-client_Makefile.in
@@ -0,0 +1,11 @@
+--- client/Makefile.in.orig	2010-12-26 18:25:46.000000000 +0100
++++ client/Makefile.in	2010-12-26 18:26:12.000000000 +0100
+@@ -196,7 +196,7 @@
+ EXPAT_LIBS = @EXPAT_LIBS@
+ FGREP = @FGREP@
+ FUSE_CFLAGS = @FUSE_CFLAGS@
+-FUSE_LIBS = @FUSE_LIBS@
++FUSE_LIBS = @FUSE_LIBS@ -lfuse
+ GDU_CFLAGS = @GDU_CFLAGS@
+ GDU_LIBS = @GDU_LIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
new file mode 100644
index 000000000..2ea9b3330
--- /dev/null
+++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
@@ -0,0 +1,22 @@
+--- client/gvfsfusedaemon.c.orig	2010-11-12 16:42:49.000000000 +0100
++++ client/gvfsfusedaemon.c	2010-11-21 18:23:36.000000000 +0100
+@@ -26,7 +26,9 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#ifdef __linux__
+ #include <sys/vfs.h>
++#endif
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -2340,7 +2342,9 @@
+   subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
+ 
+   /* Indicate O_TRUNC support for open() */
++#ifdef FUSE_CAP_ATOMIC_O_TRUNC
+   conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
++#endif
+ 
+   return NULL;
+ }
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
new file mode 100644
index 000000000..a2b691355
--- /dev/null
+++ b/devel/gvfs/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	2010-05-28 10:24:40.000000000 +0200
++++ configure	2010-05-28 10:25:59.000000000 +0200
+@@ -16253,7 +16253,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-larchive  $LIBS"
++LIBS="-larchive -lcrypto -lmd  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16298,7 +16298,7 @@
+                 if test x$with_archive_libs != x/usr/lib; then
+                         ARCHIVE_LIBS="-L$with_archive_libs -larchive"
+                 else
+-                	ARCHIVE_LIBS="-larchive"
++                	ARCHIVE_LIBS="-larchive -lcrypto -lmd"
+                 fi
+ 	else
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
+@@ -16307,7 +16307,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-larchive  $LIBS"
++LIBS="-larchive -lcrypto -lmd  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/devel/gvfs/files/patch-daemon_gvfswritechannel.c
new file mode 100644
index 000000000..54c421687
--- /dev/null
+++ b/devel/gvfs/files/patch-daemon_gvfswritechannel.c
@@ -0,0 +1,10 @@
+--- daemon/gvfswritechannel.c.orig	2007-12-22 18:50:10.000000000 -0500
++++ daemon/gvfswritechannel.c	2007-12-22 18:50:20.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <sys/un.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <string.h>
+ 
+ #include <glib.h>
+ #include <glib-object.h>
diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
new file mode 100644
index 000000000..6686b28ae
--- /dev/null
+++ b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
@@ -0,0 +1,14 @@
+--- monitor/gphoto2/ggphoto2volume.c.orig	2008-07-22 09:29:19.000000000 -0400
++++ monitor/gphoto2/ggphoto2volume.c	2008-07-22 23:22:30.000000000 -0400
+@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor   *
+     return NULL;
+ 
+   /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
++#ifdef __FreeBSD__
++  device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
++#else
+   device_path = hal_device_get_property_string (drive_device, "linux.device_file");
++#endif
+   if (strlen (device_path) == 0)
+     device_path = NULL;
+ 
diff --git a/devel/gvfs/pkg-descr b/devel/gvfs/pkg-descr
new file mode 100644
index 000000000..f6ea31130
--- /dev/null
+++ b/devel/gvfs/pkg-descr
@@ -0,0 +1,6 @@
+GVFS allows applications and users to treat any number of file system
+concepts as a part of the local filesystem. With GVFS, filesystems across
+the internet, on connected devices, and in multiple formats are as simple
+to access (and write code for) as any directory on the local machine.
+
+WWW: http://www.gnome.org/
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
new file mode 100644
index 000000000..25b246211
--- /dev/null
+++ b/devel/gvfs/pkg-plist
@@ -0,0 +1,177 @@
+bin/gvfs-cat
+bin/gvfs-copy
+bin/gvfs-info
+bin/gvfs-less
+bin/gvfs-ls
+bin/gvfs-mkdir
+bin/gvfs-monitor-dir
+bin/gvfs-monitor-file
+bin/gvfs-mount
+bin/gvfs-move
+bin/gvfs-open
+bin/gvfs-rename
+bin/gvfs-rm
+bin/gvfs-save
+bin/gvfs-set-attribute
+bin/gvfs-trash
+bin/gvfs-tree
+etc/profile.d/gvfs-bash-completion.sh
+include/gvfs-client/gvfs/gvfsurimapper.h
+include/gvfs-client/gvfs/gvfsuriutils.h
+lib/gio/modules/libgioremote-volume-monitor.la
+lib/gio/modules/libgioremote-volume-monitor.so
+lib/gio/modules/libgvfsdbus.la
+lib/gio/modules/libgvfsdbus.so
+%%AVAHI%%lib/libgvfscommon-dnssd.la
+%%AVAHI%%lib/libgvfscommon-dnssd.so
+%%AVAHI%%lib/libgvfscommon-dnssd.so.0
+lib/libgvfscommon.la
+lib/libgvfscommon.so
+lib/libgvfscommon.so.0
+%%FUSE%%libexec/gvfs-fuse-daemon
+%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
+libexec/gvfs-hal-volume-monitor
+libexec/gvfsd
+libexec/gvfsd-archive
+libexec/gvfsd-burn
+%%CDDA%%libexec/gvfsd-cdda
+libexec/gvfsd-computer
+libexec/gvfsd-dav
+%%AVAHI%%libexec/gvfsd-dnssd
+libexec/gvfsd-ftp
+%%GPHOTO2%%libexec/gvfsd-gphoto2
+libexec/gvfsd-http
+libexec/gvfsd-localtest
+libexec/gvfsd-metadata
+libexec/gvfsd-network
+libexec/gvfsd-sftp
+%%SMB%%libexec/gvfsd-smb
+%%SMB%%libexec/gvfsd-smb-browse
+libexec/gvfsd-trash
+%%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
+%%SMB%%share/GConf/gsettings/gvfs-smb.convert
+share/dbus-1/services/gvfs-daemon.service
+share/dbus-1/services/gvfs-metadata.service
+%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+%%DATADIR%%/mounts/archive.mount
+%%DATADIR%%/mounts/burn.mount
+%%CDDA%%%%DATADIR%%/mounts/cdda.mount
+%%DATADIR%%/mounts/computer.mount
+%%DATADIR%%/mounts/dav.mount
+%%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount
+%%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount
+%%DATADIR%%/mounts/ftp.mount
+%%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount
+%%DATADIR%%/mounts/http.mount
+%%DATADIR%%/mounts/localtest.mount
+%%DATADIR%%/mounts/network.mount
+%%DATADIR%%/mounts/sftp.mount
+%%SMB%%%%DATADIR%%/mounts/smb-browse.mount
+%%SMB%%%%DATADIR%%/mounts/smb.mount
+%%DATADIR%%/mounts/trash.mount
+%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
+%%DATADIR%%/remote-volume-monitors/hal.monitor
+share/locale/af/LC_MESSAGES/gvfs.mo
+share/locale/ar/LC_MESSAGES/gvfs.mo
+share/locale/as/LC_MESSAGES/gvfs.mo
+share/locale/ast/LC_MESSAGES/gvfs.mo
+share/locale/be@latin/LC_MESSAGES/gvfs.mo
+share/locale/bg/LC_MESSAGES/gvfs.mo
+share/locale/bn/LC_MESSAGES/gvfs.mo
+share/locale/bn_IN/LC_MESSAGES/gvfs.mo
+share/locale/ca/LC_MESSAGES/gvfs.mo
+share/locale/ca@valencia/LC_MESSAGES/gvfs.mo
+share/locale/cs/LC_MESSAGES/gvfs.mo
+share/locale/da/LC_MESSAGES/gvfs.mo
+share/locale/de/LC_MESSAGES/gvfs.mo
+share/locale/el/LC_MESSAGES/gvfs.mo
+share/locale/en@shaw/LC_MESSAGES/gvfs.mo
+share/locale/en_GB/LC_MESSAGES/gvfs.mo
+share/locale/es/LC_MESSAGES/gvfs.mo
+share/locale/et/LC_MESSAGES/gvfs.mo
+share/locale/eu/LC_MESSAGES/gvfs.mo
+share/locale/fi/LC_MESSAGES/gvfs.mo
+share/locale/fr/LC_MESSAGES/gvfs.mo
+share/locale/ga/LC_MESSAGES/gvfs.mo
+share/locale/gl/LC_MESSAGES/gvfs.mo
+share/locale/gu/LC_MESSAGES/gvfs.mo
+share/locale/he/LC_MESSAGES/gvfs.mo
+share/locale/hi/LC_MESSAGES/gvfs.mo
+share/locale/hu/LC_MESSAGES/gvfs.mo
+share/locale/id/LC_MESSAGES/gvfs.mo
+share/locale/it/LC_MESSAGES/gvfs.mo
+share/locale/ja/LC_MESSAGES/gvfs.mo
+share/locale/kk/LC_MESSAGES/gvfs.mo
+share/locale/kn/LC_MESSAGES/gvfs.mo
+share/locale/ko/LC_MESSAGES/gvfs.mo
+share/locale/ku/LC_MESSAGES/gvfs.mo
+share/locale/lt/LC_MESSAGES/gvfs.mo
+share/locale/lv/LC_MESSAGES/gvfs.mo
+share/locale/mai/LC_MESSAGES/gvfs.mo
+share/locale/mk/LC_MESSAGES/gvfs.mo
+share/locale/ml/LC_MESSAGES/gvfs.mo
+share/locale/mr/LC_MESSAGES/gvfs.mo
+share/locale/nb/LC_MESSAGES/gvfs.mo
+share/locale/nds/LC_MESSAGES/gvfs.mo
+share/locale/nl/LC_MESSAGES/gvfs.mo
+share/locale/nn/LC_MESSAGES/gvfs.mo
+share/locale/or/LC_MESSAGES/gvfs.mo
+share/locale/pa/LC_MESSAGES/gvfs.mo
+share/locale/pl/LC_MESSAGES/gvfs.mo
+share/locale/pt/LC_MESSAGES/gvfs.mo
+share/locale/pt_BR/LC_MESSAGES/gvfs.mo
+share/locale/ro/LC_MESSAGES/gvfs.mo
+share/locale/ru/LC_MESSAGES/gvfs.mo
+share/locale/sk/LC_MESSAGES/gvfs.mo
+share/locale/sl/LC_MESSAGES/gvfs.mo
+share/locale/sq/LC_MESSAGES/gvfs.mo
+share/locale/sr/LC_MESSAGES/gvfs.mo
+share/locale/sr@latin/LC_MESSAGES/gvfs.mo
+share/locale/sv/LC_MESSAGES/gvfs.mo
+share/locale/ta/LC_MESSAGES/gvfs.mo
+share/locale/te/LC_MESSAGES/gvfs.mo
+share/locale/th/LC_MESSAGES/gvfs.mo
+share/locale/tr/LC_MESSAGES/gvfs.mo
+share/locale/ug/LC_MESSAGES/gvfs.mo
+share/locale/uk/LC_MESSAGES/gvfs.mo
+share/locale/vi/LC_MESSAGES/gvfs.mo
+share/locale/zh_CN/LC_MESSAGES/gvfs.mo
+share/locale/zh_HK/LC_MESSAGES/gvfs.mo
+share/locale/zh_TW/LC_MESSAGES/gvfs.mo
+@dirrm %%DATADIR%%/remote-volume-monitors
+@dirrm %%DATADIR%%/mounts
+@dirrm %%DATADIR%%
+@dirrm include/gvfs-client/gvfs
+@dirrm include/gvfs-client
+@dirrmtry etc/profile.d
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as