Date: Tue, 4 Mar 2014 20:01:38 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347064 - in head/sysutils/fusefs-gstfs: . files Message-ID: <201403042001.s24K1csO085585@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Mar 4 20:01:38 2014 New Revision: 347064 URL: http://svnweb.freebsd.org/changeset/ports/347064 QAT: https://qat.redports.org/buildarchive/r347064/ Log: - Add DOCS and EXAMPLES option. - Staging. - Replace gcc with $(CC) to fix build on FreeBSD 10. - Add small patch to fix incorrect use of pthread_join (found by clang). Added: head/sysutils/fusefs-gstfs/files/ head/sysutils/fusefs-gstfs/files/patch-xcode.c (contents, props changed) Modified: head/sysutils/fusefs-gstfs/Makefile Modified: head/sysutils/fusefs-gstfs/Makefile ============================================================================== --- head/sysutils/fusefs-gstfs/Makefile Tue Mar 4 19:46:38 2014 (r347063) +++ head/sysutils/fusefs-gstfs/Makefile Tue Mar 4 20:01:38 2014 (r347064) @@ -3,6 +3,7 @@ PORTNAME= gstfs PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://bobcopeland.com/gstfs/releases/ \ http://mirror.mcx2.org/ @@ -11,6 +12,8 @@ PKGNAMEPREFIX= fusefs- MAINTAINER= dhn@FreeBSD.org COMMENT= On-demand, transcoding filesystem (using GStreamer pipeline) +OPTIONS_DEFINE= DOCS EXAMPLES + USES= fuse pkgconfig USE_GSTREAMER= yes @@ -19,17 +22,14 @@ PLIST_FILES= bin/${PORTNAME} PORTDOCS= README PORTEXAMPLES= ogg2mp3.sh mp32wav.sh -NO_STAGE= yes -do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ +post-patch: + @${REINPLACE_CMD} 's/gcc/$$(CC)/' ${WRKSRC}/Makefile -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -.endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/ -.endif +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Added: head/sysutils/fusefs-gstfs/files/patch-xcode.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-gstfs/files/patch-xcode.c Tue Mar 4 20:01:38 2014 (r347064) @@ -0,0 +1,19 @@ +--- xcode.c.orig 2014-03-04 20:53:11.000000000 +0100 ++++ xcode.c 2014-03-04 20:54:14.000000000 +0100 +@@ -41,7 +41,6 @@ + + struct pipe_params thread_params; + pthread_t thread; +- void *thread_status; + + pipeline = gst_parse_launch(pipeline_str, &error); + if (error) +@@ -83,7 +82,7 @@ + + // close read-side so pipe will terminate + close(pipefds[1]); +- pthread_join(thread, thread_status); ++ pthread_join(thread, NULL); + + return 0; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403042001.s24K1csO085585>