From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 18 11:04:02 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C170845E;
 Mon, 18 Mar 2013 11:04:02 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B67298F;
 Mon, 18 Mar 2013 11:04:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IB42Ab009879;
 Mon, 18 Mar 2013 11:04:02 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2IB4253009877;
 Mon, 18 Mar 2013 11:04:02 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201303181104.r2IB4253009877@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 18 Mar 2013 11:04:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314551 - in head/audio/sbagen: . 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.14
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: Mon, 18 Mar 2013 11:04:02 -0000

Author: gahr
Date: Mon Mar 18 11:04:01 2013
New Revision: 314551
URL: http://svnweb.freebsd.org/changeset/ports/314551

Log:
  - Fix build with clang
  - While at it, get rid of PTHREAD_LIBS

Added:
  head/audio/sbagen/files/
  head/audio/sbagen/files/patch-sbagen.c   (contents, props changed)
Modified:
  head/audio/sbagen/Makefile   (contents, props changed)

Modified: head/audio/sbagen/Makefile
==============================================================================
--- head/audio/sbagen/Makefile	Mon Mar 18 10:23:47 2013	(r314550)
+++ head/audio/sbagen/Makefile	Mon Mar 18 11:04:01 2013	(r314551)
@@ -19,12 +19,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,linux/soundcard\.h,sys/soundcard.h,g' \
-		${WRKSRC}/sbagen.c
-
 do-build:
-	(cd ${WRKSRC} && ${CC} ${CFLAGS} -DT_LINUX ${PTHREAD_LIBS} -lm \
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} -DT_LINUX -pthread -lm \
 		sbagen.c -o sbagen)
 
 do-install:

Added: head/audio/sbagen/files/patch-sbagen.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/sbagen/files/patch-sbagen.c	Mon Mar 18 11:04:01 2013	(r314551)
@@ -0,0 +1,29 @@
+--- sbagen.c.orig	2013-03-18 12:02:21.000000000 +0100
++++ sbagen.c	2013-03-18 12:02:43.000000000 +0100
+@@ -141,7 +141,7 @@
+ #endif
+ 
+ #ifdef OSS_AUDIO
+- #include <linux/soundcard.h>
++ #include <sys/soundcard.h>
+  //WAS: #include <sys/soundcard.h>
+ #endif
+ #ifdef WIN_AUDIO
+@@ -181,7 +181,7 @@
+ void warn(char *fmt, ...) ;
+ void * Alloc(size_t len) ;
+ char * StrDup(char *str) ;
+-inline int calcNow() ;
++static inline int calcNow() ;
+ void loop() ;
+ void outChunk() ;
+ void corrVal(int ) ;
+@@ -1207,7 +1207,7 @@
+   time_ref_ms= 1000*tt->tm_sec + 60000*tt->tm_min + 3600000*tt->tm_hour;
+ }  
+ 
+-inline int  
++static inline int  
+ calcNow() {
+   struct timeval tv;
+   if (0 != gettimeofday(&tv, 0)) error("Can't get current time");