Bug 184822

Comment 1 Pawel Pekala 2013-12-19 17:08:12 UTC

Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.

Comment 2 dfilter service 2013-12-19 17:22:18 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"

Comment 3 Pawel Pekala 2013-12-19 17:22:20 UTC

State Changed
From-To: open->closed

Committed. Thanks!