- Upgrade to 1.19

PR:		163161
Submitted by:	Gea-Suan Lin <gslin@gslin.org> (maintainer)

3 files changed, 58 insertions, 12 deletions

diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index 1ddd971f2794..6672a89d42d6 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -6,28 +6,22 @@
 #
 
 PORTNAME=	s3fs
-DISTVERSION=	r177
-PORTREVISION=	1
+DISTVERSION=	1.19
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	fusefs-
-DISTFILES=	${PORTNAME}-${DISTVERSION}-source${EXTRACT_SUFX}
 
 MAINTAINER=	gslin@gslin.org
 COMMENT=	FUSE-based file system backed by Amazon S3
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/gnome-config:${PORTSDIR}/x11/gnome-libs
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		fuse:${PORTSDIR}/sysutils/fusefs-libs \
-		iconv:${PORTSDIR}/converters/iconv \
 		xml2:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
-PLIST_FILES=	sbin/s3fs
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/s3fs ${PREFIX}/sbin
+GNU_CONFIGURE=	yes
+PLIST_FILES=	bin/s3fs
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/fusefs-s3fs/distinfo b/sysutils/fusefs-s3fs/distinfo
index cb9fb55265dd..fcac462069e3 100644
--- a/sysutils/fusefs-s3fs/distinfo
+++ b/sysutils/fusefs-s3fs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (s3fs-r177-source.tar.gz) = fbbaa0de79fa8bfbda5345ff9873fa8bfe773b13e7f8a3926b8a11447e3ff255
-SIZE (s3fs-r177-source.tar.gz) = 18145
+SHA256 (s3fs-1.19.tar.gz) = 7ba54895663750fd9ce357893ec8e45871b21399c0c7b6632b271f2075df7a42
+SIZE (s3fs-1.19.tar.gz) = 132384
diff --git a/sysutils/fusefs-s3fs/files/patch-configure b/sysutils/fusefs-s3fs/files/patch-configure
new file mode 100644
index 000000000000..76ee45456d19
--- /dev/null
+++ b/sysutils/fusefs-s3fs/files/patch-configure
@@ -0,0 +1,52 @@
+--- 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
+