From tkato432@yahoo.com  Mon Dec 16 18:04:35 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id F26A63AC
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:03:41 +0000 (UTC)
Received: from omta03.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id C56271876
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:03:41 +0000 (UTC)
Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106])
	by omta03.auone-net.jp (au one net mail) with ESMTP id 2F96F1880004
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 17 Dec 2013 03:03:40 +0900 (JST)
Message-Id: <20131217024852.9383724bd5b8e8b64e2969ce@yahoo.com>
Date: Tue, 17 Dec 2013 02:48:52 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: games/stepmania-devel: Fix build with clang

>Number:         184822
>Category:       ports
>Synopsis:       games/stepmania-devel: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:04 UTC 2013
>Closed-Date:    Thu Dec 19 17:22:21 UTC 2013
>Last-Modified:  Thu Dec 19 17:30:00 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/stepmania-devel/Makefile games/stepmania-devel/Makefile
--- /usr/ports/games/stepmania-devel/Makefile	2013-11-11 13:55:18.000000000 +0900
+++ games/stepmania-devel/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -6,6 +6,7 @@
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE
+PROJECTHOST=	sm-ssc
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-SM5-alpha3-src
 
@@ -24,11 +25,10 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-SM5-alpha3
 
-PROJECTHOST=	sm-ssc
 USE_BZIP2=	yes
+USES=		iconv pathfix perl5 pkgconfig shebangfix
 USE_XORG=	x11 xau xdmcp xext xrandr xrender xtst
 USE_GL=		gl glu
-USES=		pathfix iconv shebangfix perl5 pkgconfig
 USE_GNOME=	gtk20
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
@@ -38,7 +38,7 @@
 		extern/zlib/zlib2ansi
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lpthread
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_WITH=	vorbis
@@ -53,8 +53,10 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^LIBS/s|-lpthread|${ICONV_LIB}|' -e 's/-finline-limit=300//g' \
-			 ${WRKSRC}/src/Makefile.in
+		's|-lpthread |-pthread |' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^LIBS/s|-lpthread|${ICONV_LIB}| ; \
+		 s|-finline-limit=300||g' ${WRKSRC}/src/Makefile.in
 
 pre-build:
 	@${ECHO_CMD} -n > ${WRKDIR}/stepmania.sh
@@ -62,7 +64,7 @@
 	@${ECHO_CMD} 'cd ${PREFIX}/lib/stepmania; ./stepmania $$@' >> ${WRKDIR}/stepmania.sh
 
 post-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} SMData)
 
 do-install:
diff -urN /usr/ports/games/stepmania-devel/files/patch-ArchHooks.h games/stepmania-devel/files/patch-ArchHooks.h
--- /usr/ports/games/stepmania-devel/files/patch-ArchHooks.h	1970-01-01 09:00:00.000000000 +0900
+++ games/stepmania-devel/files/patch-ArchHooks.h	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- src/arch/ArchHooks/ArchHooks.h.orig
++++ src/arch/ArchHooks/ArchHooks.h
+@@ -1,6 +1,8 @@
+ #ifndef ARCH_HOOKS_H
+ #define ARCH_HOOKS_H
+ 
++#include <ctime>
++
+ struct lua_State;
+ class ArchHooks
+ {
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Thu Dec 19 17:08:12 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184822 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Thu Dec 19 17:22:20 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184822 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184822: commit references a PR
Date: Thu, 19 Dec 2013 17:22:18 +0000 (UTC)

 Author: pawel
 Date: Thu Dec 19 17:22:10 2013
 New Revision: 336938
 URL: http://svnweb.freebsd.org/changeset/ports/336938
 
 Log:
   Fix build with clang
   
   PR:		ports/184822
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Added:
   head/games/stepmania-devel/files/patch-ArchHooks.h   (contents, props changed)
 Modified:
   head/games/stepmania-devel/Makefile
 
 Modified: head/games/stepmania-devel/Makefile
 ==============================================================================
 --- head/games/stepmania-devel/Makefile	Thu Dec 19 16:59:39 2013	(r336937)
 +++ head/games/stepmania-devel/Makefile	Thu Dec 19 17:22:10 2013	(r336938)
 @@ -6,6 +6,7 @@ PORTVERSION=	5.0.a3
  PORTEPOCH=	1
  CATEGORIES=	games
  MASTER_SITES=	GOOGLE_CODE
 +PROJECTHOST=	sm-ssc
  PKGNAMESUFFIX=	-devel
  DISTNAME=	${PORTNAME}-SM5-alpha3-src
  
 @@ -24,11 +25,10 @@ OPTIONS_DEFAULT=VORBIS
  
  WRKSRC=		${WRKDIR}/${PORTNAME}-SM5-alpha3
  
 -PROJECTHOST=	sm-ssc
  USE_BZIP2=	yes
 +USES=		iconv pathfix perl5 pkgconfig shebangfix
  USE_XORG=	x11 xau xdmcp xext xrandr xrender xtst
  USE_GL=		gl glu
 -USES=		pathfix iconv shebangfix perl5 pkgconfig
  USE_GNOME=	gtk20
  USE_PERL5=	build
  GNU_CONFIGURE=	yes
 @@ -38,7 +38,7 @@ SHEBANG_FILES=	Utils/*.pl \
  		extern/zlib/zlib2ansi
  
  CPPFLAGS+=	-I${LOCALBASE}/include
 -LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lpthread
 +LDFLAGS+=	-L${LOCALBASE}/lib -lX11
  
  VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
  VORBIS_CONFIGURE_WITH=	vorbis
 @@ -53,8 +53,10 @@ CONFIGURE_ENV+=	ac_cv_lib_pulse_pa_strea
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		'/^LIBS/s|-lpthread|${ICONV_LIB}|' -e 's/-finline-limit=300//g' \
 -			 ${WRKSRC}/src/Makefile.in
 +		's|-lpthread |-pthread |' ${WRKSRC}/configure
 +	@${REINPLACE_CMD} -e \
 +		'/^LIBS/s|-lpthread|${ICONV_LIB}| ; \
 +		 s|-finline-limit=300||g' ${WRKSRC}/src/Makefile.in
  
  pre-build:
  	@${ECHO_CMD} -n > ${WRKDIR}/stepmania.sh
 @@ -62,7 +64,7 @@ pre-build:
  	@${ECHO_CMD} 'cd ${PREFIX}/lib/stepmania; ./stepmania $$@' >> ${WRKDIR}/stepmania.sh
  
  post-build:
 -	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 +	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
  		${MAKEFILE} ${MAKE_ARGS} SMData)
  
  do-install:
 @@ -85,4 +87,7 @@ do-install:
  	@(${TAR} -C ${WRKSRC}/Docs --exclude "Licenses.txt" -cf - . | \
  		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -)
  
 +post-install:
 +	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/stepmania/GtkModule.so
 +
  .include <bsd.port.mk>
 
 Added: head/games/stepmania-devel/files/patch-ArchHooks.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/stepmania-devel/files/patch-ArchHooks.h	Thu Dec 19 17:22:10 2013	(r336938)
 @@ -0,0 +1,11 @@
 +--- src/arch/ArchHooks/ArchHooks.h.orig
 ++++ src/arch/ArchHooks/ArchHooks.h
 +@@ -1,6 +1,8 @@
 + #ifndef ARCH_HOOKS_H
 + #define ARCH_HOOKS_H
 + 
 ++#include <ctime>
 ++
 + struct lua_State;
 + class ArchHooks
 + {
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
