svn commit: r347074 - in head/sysutils/fusefs-s3fs: . files

[Tijl Coosemans]

Author: tijl
Date: Tue Mar  4 22:02:51 2014
New Revision: 347074
URL: http://svnweb.freebsd.org/changeset/ports/347074
QAT: https://qat.redports.org/buildarchive/r347074/

Log:
  - New LIB_DEPENDS syntax.
  - Staging.
  - Explicitly link with -lcrypto to fix build when curl has been
    configured without crypto support.
  - Add patch to fix build with Clang.
  
  PR:		ports/183467

Added:
  head/sysutils/fusefs-s3fs/files/
  head/sysutils/fusefs-s3fs/files/patch-src-curl.cpp   (contents, props changed)
Modified:
  head/sysutils/fusefs-s3fs/Makefile

Modified: head/sysutils/fusefs-s3fs/Makefile
==============================================================================
--- head/sysutils/fusefs-s3fs/Makefile	Tue Mar  4 21:06:03 2014	(r347073)
+++ head/sysutils/fusefs-s3fs/Makefile	Tue Mar  4 22:02:51 2014	(r347074)
@@ -11,20 +11,17 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	gslin at gslin.org
 COMMENT=	FUSE-based file system backed by Amazon S3
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		xml2:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
-PLIST_FILES=	bin/s3fs
+PLIST_FILES=	bin/s3fs man/man1/s3fs.1.gz
 USES=		fuse pkgconfig
+USE_OPENSSL=	yes
 
-MAN1=		s3fs.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's/libcrypto >= 0.9//g' ${WRKSRC}/configure
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${REINPLACE_CMD} -e '/^DEPS_LIBS =/s/$$/ -lcrypto/' \
+		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>

Added: head/sysutils/fusefs-s3fs/files/patch-src-curl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/fusefs-s3fs/files/patch-src-curl.cpp	Tue Mar  4 22:02:51 2014	(r347074)
@@ -0,0 +1,11 @@
+--- src/curl.cpp.orig	2014-03-04 22:16:31.000000000 +0100
++++ src/curl.cpp	2014-03-04 22:16:41.000000000 +0100
+@@ -53,7 +53,7 @@
+ // Typedef
+ //-------------------------------------------------------------------
+ struct case_insensitive_compare_func {
+-  bool operator ()(const string &a, const string &b) {
++  bool operator ()(const string &a, const string &b) const {
+     return strcasecmp(a.c_str(), b.c_str()) < 0;
+   }
+ };