From owner-svn-ports-head@FreeBSD.ORG Mon Nov 11 02:40:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org 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 ESMTP id D801A94D; Mon, 11 Nov 2013 02:40:42 +0000 (UTC) (envelope-from danilo@FreeBSD.org) 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 C5ADD2270; Mon, 11 Nov 2013 02:40:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB2egV1037582; Mon, 11 Nov 2013 02:40:42 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB2egq4037581; Mon, 11 Nov 2013 02:40:42 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311110240.rAB2egq4037581@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Mon, 11 Nov 2013 02:40:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333470 - head/games/stepmania-devel 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 02:40:43 -0000 Author: danilo Date: Mon Nov 11 02:40:42 2013 New Revision: 333470 URL: http://svnweb.freebsd.org/changeset/ports/333470 Log: - Convert LIB_DEPENDS to new syntax - Use options helpers - Add stage support Modified: head/games/stepmania-devel/Makefile Modified: head/games/stepmania-devel/Makefile ============================================================================== --- head/games/stepmania-devel/Makefile Mon Nov 11 02:10:02 2013 (r333469) +++ head/games/stepmania-devel/Makefile Mon Nov 11 02:40:42 2013 (r333470) @@ -16,8 +16,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/Docs/Licenses.txt BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad \ - GLEW:${PORTSDIR}/graphics/glew +LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad \ + libGLEW.so:${PORTSDIR}/graphics/glew OPTIONS_DEFINE= PULSEAUDIO VORBIS DOCS OPTIONS_DEFAULT=VORBIS @@ -40,24 +40,21 @@ SHEBANG_FILES= Utils/*.pl \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lpthread -NO_STAGE= yes +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_WITH= vorbis + .include .if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio +LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio .else CONFIGURE_ENV+= ac_cv_lib_pulse_pa_stream_new=no .endif -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis -.else -CONFIGURE_ARGS+=--without-vorbis -.endif - post-patch: @${REINPLACE_CMD} -e \ - '/^LIBS/s|-lpthread|${ICONV_LIB}|' ${WRKSRC}/src/Makefile.in + '/^LIBS/s|-lpthread|${ICONV_LIB}|' -e 's/-finline-limit=300//g' \ + ${WRKSRC}/src/Makefile.in pre-build: @${ECHO_CMD} -n > ${WRKDIR}/stepmania.sh @@ -69,28 +66,23 @@ post-build: ${MAKEFILE} ${MAKE_ARGS} SMData) do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/stepmania.sh ${PREFIX}/bin/stepmania - ${INSTALL_DATA} ${WRKSRC}/stepmania.desktop ${PREFIX}/share/applications - @${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_SCRIPT} ${WRKDIR}/stepmania.sh ${STAGEDIR}${PREFIX}/bin/stepmania + ${INSTALL_DATA} ${WRKSRC}/stepmania.desktop ${STAGEDIR}${PREFIX}/share/applications + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps cd ${WRKSRC}/icons/hicolor/scalable/apps && ${INSTALL_DATA} \ - stepmania-ssc.svg ${PREFIX}/share/icons/hicolor/scalable/apps + stepmania-ssc.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps .for i in 16 22 24 32 36 48 64 72 96 128 192 256 - @${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps cd ${WRKSRC}/icons/hicolor/${i}x${i}/apps && ${INSTALL_DATA} \ - stepmania-ssc.png ${PREFIX}/share/icons/hicolor/${i}x${i}/apps + stepmania-ssc.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps .endfor - @${MKDIR} ${PREFIX}/lib/stepmania - ${INSTALL_PROGRAM} ${WRKSRC}/src/stepmania ${PREFIX}/lib/stepmania - ${INSTALL_DATA} ${WRKSRC}/src/GtkModule.so ${PREFIX}/lib/stepmania - @${MKDIR} ${PREFIX}/lib/stepmania/Packages - ${INSTALL_DATA} ${WRKSRC}/GameData.smzip ${PREFIX}/lib/stepmania/Packages -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/stepmania + ${INSTALL_PROGRAM} ${WRKSRC}/src/stepmania ${STAGEDIR}${PREFIX}/lib/stepmania + ${INSTALL_DATA} ${WRKSRC}/src/GtkModule.so ${STAGEDIR}${PREFIX}/lib/stepmania + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/stepmania/Packages + ${INSTALL_DATA} ${WRKSRC}/GameData.smzip ${STAGEDIR}${PREFIX}/lib/stepmania/Packages + @${MKDIR} ${STAGEDIR}${DOCSDIR} @(${TAR} -C ${WRKSRC}/Docs --exclude "Licenses.txt" -cf - . | \ - ${TAR} -C ${DOCSDIR} --unlink -xf -) - @${FIND} ${DOCSDIR} -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP} - @${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE} - @${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx -.endif + ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -) .include