From owner-svn-ports-head@FreeBSD.ORG Thu Dec 19 17:22:11 2013 Return-Path: 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 C08E0B53; Thu, 19 Dec 2013 17:22:11 +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 A128A1543; Thu, 19 Dec 2013 17:22:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJHMBts024406; Thu, 19 Dec 2013 17:22:11 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJHMB02024403; Thu, 19 Dec 2013 17:22:11 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312191722.rBJHMB02024403@svn.freebsd.org> From: Pawel Pekala Date: Thu, 19 Dec 2013 17:22:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336938 - in head/games/stepmania-devel: . 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 17:22:11 -0000 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 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 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 ++ + struct lua_State; + class ArchHooks + {