4 files changed, 12 insertions, 65 deletions

diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index f35b5f229ca1..121190ad4cae 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -1,15 +1,9 @@
-# New ports collection makefile for:	fusefs-s3fs
-# Date created:		2009-04-11
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	s3fs
-DISTVERSION=	1.19
-PORTREVISION=	1
+PORTVERSION=	1.61
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	gslin@gslin.org
@@ -19,8 +13,13 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
 PLIST_FILES=	bin/s3fs
+USE_FUSE=	yes
+
+MAN1=		s3fs.1
+
+post-patch:
+	${REINPLACE_CMD} -e 's/libcrypto >= 0.9//g' ${WRKSRC}/configure
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/fusefs-s3fs/distinfo b/sysutils/fusefs-s3fs/distinfo
index fcac462069e3..8ade06607d51 100644
--- a/sysutils/fusefs-s3fs/distinfo
+++ b/sysutils/fusefs-s3fs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (s3fs-1.19.tar.gz) = 7ba54895663750fd9ce357893ec8e45871b21399c0c7b6632b271f2075df7a42
-SIZE (s3fs-1.19.tar.gz) = 132384
+SHA256 (s3fs-1.61.tar.gz) = 47e6700c9ec65f85cc1eeb004dcf33b4533b3415466107f310fe167f49f35ec5
+SIZE (s3fs-1.61.tar.gz) = 155699
diff --git a/sysutils/fusefs-s3fs/files/patch-configure b/sysutils/fusefs-s3fs/files/patch-configure
deleted file mode 100644
index 76ee45456d19..000000000000
--- a/sysutils/fusefs-s3fs/files/patch-configure
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	2011-12-10 17:37:02.000000000 +0800
-+++ configure	2011-12-10 17:37:36.000000000 +0800
-@@ -3225,12 +3225,12 @@
-     pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9" 2>/dev/null`
-+  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3241,12 +3241,12 @@
-     pkg_cv_DEPS_LIBS="$DEPS_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9" 2>/dev/null`
-+  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3266,14 +3266,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9" 2>&1`
-+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6" 2>&1`
-         else
--	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9" 2>&1`
-+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DEPS_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9) were not met:
-+	as_fn_error $? "Package requirements (fuse >= 2.7 libcurl >= 7.0 libxml-2.0 >= 2.6) were not met:
- 
- $DEPS_PKG_ERRORS
- 
diff --git a/sysutils/fusefs-s3fs/pkg-descr b/sysutils/fusefs-s3fs/pkg-descr
index fb2f762c9817..f620ce90249d 100644
--- a/sysutils/fusefs-s3fs/pkg-descr
+++ b/sysutils/fusefs-s3fs/pkg-descr
@@ -1,5 +1,5 @@
 FUSE-based file system backed by Amazon S3. Mount a bucket as a local
 file system read/write. Store files/folders natively and
-transparently. 
+transparently.
 
-WWW:	http://code.google.com/p/s3fs/
+WWW: http://code.google.com/p/s3fs/