From owner-svn-ports-head@FreeBSD.ORG  Tue Mar  4 20:01:39 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 45C2F93B;
 Tue,  4 Mar 2014 20:01:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 18F34C4;
 Tue,  4 Mar 2014 20:01:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s24K1cMA085589;
 Tue, 4 Mar 2014 20:01:38 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s24K1csO085585;
 Tue, 4 Mar 2014 20:01:38 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201403042001.s24K1csO085585@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 4 Mar 2014 20:01:38 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Mar 2014 20:01:39 -0000

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;
+ }