Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 07:38:23 +0000 (UTC)
From:      Veniamin Gvozdikov <vg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330615 - in head/sysutils/fusefs-zip: . files
Message-ID:  <201310170738.r9H7cNnY012953@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vg
Date: Thu Oct 17 07:38:22 2013
New Revision: 330615
URL: http://svnweb.freebsd.org/changeset/ports/330615

Log:
  - Fix build with clang
  
  PR:		ports/182885
  Submitted by:	Oleg Ginzburg <olevole@olevole.ru> (maintainer)
  Approved by:	eadler, osa, rm (mentors, implicit)

Added:
  head/sysutils/fusefs-zip/files/patch-lib_bigBuffer.h   (contents, props changed)
Modified:
  head/sysutils/fusefs-zip/Makefile

Modified: head/sysutils/fusefs-zip/Makefile
==============================================================================
--- head/sysutils/fusefs-zip/Makefile	Thu Oct 17 07:37:29 2013	(r330614)
+++ head/sysutils/fusefs-zip/Makefile	Thu Oct 17 07:38:22 2013	(r330615)
@@ -10,33 +10,29 @@ COMMENT=	FUSE filesystem to mount ZIP ar
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	zip:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libzip.so:${PORTSDIR}/archivers/libzip
 BUILD_DEPENDS=	libzip>=0.11.1:${PORTSDIR}/archivers/libzip
 
-USE_GMAKE=	yes
-USES=		fuse pkgconfig
+USES=		gmake fuse pkgconfig
 
-PLIST_FILES=	bin/${PORTNAME}
-MAN1=		${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTDOCS=	README TODO changelog
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-build:
-	(cd ${WRKSRC} && ${GMAKE} -C lib && \
-		${GMAKE} CXXFLAGS="-I${LOCALBASE}/include")
+post-patch:
+	@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Added: head/sysutils/fusefs-zip/files/patch-lib_bigBuffer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/fusefs-zip/files/patch-lib_bigBuffer.h	Thu Oct 17 07:38:22 2013	(r330615)
@@ -0,0 +1,10 @@
+--- lib/bigBuffer.h.orig	2013-10-11 01:12:58.000000000 +0400
++++ lib/bigBuffer.h	2013-10-11 01:13:02.000000000 +0400
+@@ -26,6 +26,7 @@
+ #include <unistd.h>
+ 
+ #include <vector>
++#include <string>
+ 
+ #include "types.h"
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310170738.r9H7cNnY012953>