* Add optional gphoto2 support

* Add missing dependencies on gnome-keyring and avahi-app.


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

4 files changed, 67 insertions, 12 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 1ceff5626..4f1d46e55 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/gvfs/Makefile,v 1.12 2008/02/12 01:13:00 marcus Exp $
+#    $MCom: ports/devel/gvfs/Makefile,v 1.13 2008/02/25 21:42:14 kwm Exp $
 
 PORTNAME=	gvfs
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
@@ -15,7 +16,9 @@ COMMENT=	GNOME virtual file system
 
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
     		hal.1:${PORTSDIR}/sysutils/hal \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+		soup-2.4.1:${PORTSDIR}/devel/libsoup \
+		gnome-keyring:${PORTSDIR}/security/gnome-keyring \
+		avahi-client.3:${PORTSDIR}/net/avahi-app
 
 USE_GNOME=	glib20 gnomehack gnomeprefix intlhack gconf2
 USE_GMAKE=	yes
@@ -24,10 +27,10 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--disable-gphoto2
 
 OPTIONS=	FUSE "Enable fuse" on \
-		SAMBA "Enable Samba" on
+		SAMBA "Enable Samba" on \
+		GPHOTO2 "Enable Gphoto 2 camera support" on
 #		CDDA "Enable CDDA" on
 
 .include <bsd.port.pre.mk>
@@ -56,6 +59,14 @@ 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
+
 post-extract:
 .for f in http dav smb smb-browse
 	@${CP} ${FILESDIR}/${f}.mount.in \
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index 5df10687b..5187da5d4 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2008-02-11 20:06:07.000000000 -0500
-+++ configure	2008-02-11 20:06:54.000000000 -0500
-@@ -24557,7 +24557,7 @@ if test "x$enable_http" != "xno"; then
+--- configure.orig	2008-02-25 16:48:49.000000000 -0500
++++ configure	2008-02-25 16:51:17.000000000 -0500
+@@ -24589,7 +24589,7 @@ if test "x$enable_http" != "xno"; then
    msg_http=yes
  fi
  
@@ -9,7 +9,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for HTTP" >&5
-@@ -24707,7 +24707,7 @@ if test "x$enable_cdda" != "xno"; then
+@@ -24857,7 +24857,7 @@ if test "x$enable_cdda" != "xno"; then
    msg_cdda=yes
  fi
  
@@ -18,7 +18,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for CDDA" >&5
-@@ -24858,7 +24858,7 @@ if test "x$enable_fuse" != "xno"; then
+@@ -25008,7 +25008,7 @@ if test "x$enable_fuse" != "xno"; then
    msg_fuse=yes
  fi
  
@@ -27,7 +27,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for FUSE" >&5
-@@ -25009,7 +25009,7 @@ if test "x$enable_gconf" != "xno"; then
+@@ -25159,7 +25159,7 @@ if test "x$enable_gconf" != "xno"; then
    msg_gconf=yes
  fi
  
@@ -36,7 +36,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for GCONF" >&5
-@@ -25161,7 +25161,7 @@ if test "x$enable_hal" != "xno"; then
+@@ -25312,7 +25312,7 @@ if test "x$enable_hal" != "xno"; then
    msg_hal=yes
  fi
  
@@ -45,7 +45,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for HAL" >&5
-@@ -25343,7 +25343,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
+@@ -25494,7 +25494,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
    have_hal_fast_init=yes
  fi
  
@@ -54,3 +54,31 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_HAL_FAST_INIT 1
+@@ -25540,13 +25540,16 @@ fi
+     *-linux*)
+       use_gphoto2=yes
+       ;;
++    *-freebsd*)
++      use_gphoto2=yes
++      ;;
+     *)
+       use_gphoto2=no
+       ;;
+   esac
+ 
+-  if test "x$msg_gphoto2" == "xyes"; then
+-    if test "x$use_gphoto2" == "xyes"; then
++  if test "x$msg_gphoto2" = "xyes"; then
++    if test "x$use_gphoto2" = "xyes"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GPHOTO2" >&5
+@@ -25702,7 +25705,7 @@ if test "x$enable_keyring" != "xno"; the
+   msg_keyring=yes
+ fi
+ 
+-  if test "x$msg_keyring" == "xyes"; then
++  if test "x$msg_keyring" = "xyes"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for KEYRING" >&5
diff --git a/devel/gvfs/files/patch-hal_ghalvolume.c b/devel/gvfs/files/patch-hal_ghalvolume.c
new file mode 100644
index 000000000..519718969
--- /dev/null
+++ b/devel/gvfs/files/patch-hal_ghalvolume.c
@@ -0,0 +1,14 @@
+--- hal/ghalvolume.c.orig	2008-02-25 16:51:39.000000000 -0500
++++ hal/ghalvolume.c	2008-02-25 16:52:00.000000000 -0500
+@@ -550,7 +550,11 @@ g_hal_volume_new (GVolumeMonitor   *volu
+         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-plist b/devel/gvfs/pkg-plist
index 87f3fba77..a0ce4c5fd 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -31,6 +31,7 @@ libexec/gvfsd-computer
 libexec/gvfsd-dav
 libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
+%%GPHOTO2%%libexec/gvfsd-gphoto2
 libexec/gvfsd-http
 libexec/gvfsd-localtest
 libexec/gvfsd-network
@@ -44,6 +45,7 @@ share/gvfs/mounts/burn.mount
 share/gvfs/mounts/computer.mount
 share/gvfs/mounts/dav.mount
 share/gvfs/mounts/dns-sd.mount
+%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
 share/gvfs/mounts/http.mount
 share/gvfs/mounts/localtest.mount
 share/gvfs/mounts/network.mount