summaryrefslogtreecommitdiffstats
path: root/devel/gvfs
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-02-23 23:29:20 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-02-23 23:29:20 +0800
commit6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e (patch)
tree1eadfebd881b603269c0bd7e4e753fdfeb28a8a9 /devel/gvfs
parent040b4678fe4a6cc5d7eec2ec48e463c94dededdb (diff)
downloadmarcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.tar
marcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.tar.gz
marcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.tar.bz2
marcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.tar.lz
marcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.tar.xz
marcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.tar.zst
marcuscom-ports-6a3fd5d5bc8ba9942cbae5e199cabf3e1ef4f89e.zip
Update to 1.5.4.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13684 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gvfs')
-rw-r--r--devel/gvfs/Makefile7
-rw-r--r--devel/gvfs/distinfo6
-rw-r--r--devel/gvfs/files/patch-configure26
3 files changed, 21 insertions, 18 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index ffef91fa2..a3343ccc8 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gvfs/Makefile,v 1.56 2010/01/27 13:38:32 avl Exp $
+# $MCom: ports/devel/gvfs/Makefile,v 1.57 2010/02/10 20:05:10 kwm Exp $
#
PORTNAME= gvfs
-PORTVERSION= 1.5.3
+PORTVERSION= 1.5.4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -36,6 +36,9 @@ OPTIONS= FUSE "Enable fuse" off \
GPHOTO2 "Enable Gphoto 2 camera support" on \
CDDA "Enable CDDA" on
+# work around for bug in 1.5.4. Fixed upstream
+CONFIGURE_ARGS+=--with-dbus-service-dir=${PREFIX}/share/dbus-1/services
+
.include <bsd.port.pre.mk>
.if defined(WITH_FUSE)
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 631259df8..6224623a4 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.5.3.tar.bz2) = e0540360ccc0943d6a0c93c79981deee
-SHA256 (gnome2/gvfs-1.5.3.tar.bz2) = 1da0a375801eead6e589a86d7b38916d4770a09cf12c926e081f8c47a33d43d6
-SIZE (gnome2/gvfs-1.5.3.tar.bz2) = 1299775
+MD5 (gnome2/gvfs-1.5.4.tar.bz2) = 1e766cbb66c998ff8c382f20136f7377
+SHA256 (gnome2/gvfs-1.5.4.tar.bz2) = c7e23851681875a04bd6697657433a204be9e6895a845ca3cb5ee573ca17ab02
+SIZE (gnome2/gvfs-1.5.4.tar.bz2) = 1333291
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index 5139f5789..b780d9e0d 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2010-02-10 20:52:05.000000000 +0000
-+++ configure 2010-02-10 20:54:21.000000000 +0000
-@@ -15666,6 +15666,9 @@ fi
+--- configure.orig 2010-02-23 11:53:07.000000000 +0000
++++ configure 2010-02-23 11:56:03.000000000 +0000
+@@ -19061,6 +19061,9 @@
*-linux* | *-freebsd* | *-kfreebsd*-gnu)
use_gphoto2=yes
;;
@@ -10,16 +10,16 @@
*)
use_gphoto2=no
;;
-@@ -16191,7 +16194,7 @@ if test "${ac_cv_lib_archive_archive_ent
+@@ -20173,7 +20176,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. */
-
-@@ -16236,7 +16239,7 @@ $as_echo "#define HAVE_ARCHIVE /**/" >>c
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -20249,7 +20252,7 @@
if test x$with_archive_libs != x/usr/lib; then
ARCHIVE_LIBS="-L$with_archive_libs -larchive"
else
@@ -27,13 +27,13 @@
+ ARCHIVE_LIBS="-larchive -lcrypto -lmd"
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
-@@ -16245,7 +16248,7 @@ if test "${ac_cv_lib_archive_archive_ent
+ { $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5
+@@ -20258,7 +20261,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. */
-
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF