Date: Sun, 19 Jul 2015 07:42:22 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392488 - in head: devel/onscripter devel/ponscripter-sekai devel/renpy devel/rlvm emulators/ppsspp games/openra Message-ID: <201507190742.t6J7gMUh035998@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jul 19 07:42:21 2015 New Revision: 392488 URL: https://svnweb.freebsd.org/changeset/ports/392488 Log: Convert my ports to target option helpers Modified: head/devel/onscripter/Makefile (contents, props changed) head/devel/ponscripter-sekai/Makefile (contents, props changed) head/devel/renpy/Makefile (contents, props changed) head/devel/rlvm/Makefile (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) head/games/openra/Makefile (contents, props changed) Modified: head/devel/onscripter/Makefile ============================================================================== --- head/devel/onscripter/Makefile Sun Jul 19 07:42:01 2015 (r392487) +++ head/devel/onscripter/Makefile Sun Jul 19 07:42:21 2015 (r392488) @@ -38,27 +38,25 @@ PDA_DESC= Fit window size to screen on s PDA_CFLAGS?= -DPDA_AUTOSIZE UTF8_CFLAGS?= -DUTF8_CAPTION -DUTF8_FILESYSTEM -.include <bsd.port.options.mk> - post-patch: -.if ! ${PORT_OPTIONS:MLUA} - @${REINPLACE_CMD} '/optional: lua/,/^$$/d' ${WRKSRC}/${MAKEFILE} -.endif @${REINPLACE_CMD} -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/Makefile.onscripter @${REINPLACE_CMD} -e 's/luaL_checkint/(int)&eger/' \ ${WRKSRC}/LUAHandler.cpp +post-patch-LUA-off: + @${REINPLACE_CMD} '/optional: lua/,/^$$/d' ${WRKSRC}/${MAKEFILE} + .if !target(do-install) do-install: .for f in ${PLIST_FILES:T} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: (cd ${WRKSRC}/www && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR} \ "! -name *.orig ! -name *.bak") -.endif .endif # do-install .include <bsd.port.mk> Modified: head/devel/ponscripter-sekai/Makefile ============================================================================== --- head/devel/ponscripter-sekai/Makefile Sun Jul 19 07:42:01 2015 (r392487) +++ head/devel/ponscripter-sekai/Makefile Sun Jul 19 07:42:21 2015 (r392488) @@ -45,34 +45,30 @@ MANPAGES_PLIST_FILES=\ man/man7/ponscr-syntax.7.gz \ man/man7/ponscripter.7.gz -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e '/^ifdef DEBUG/,/^$$/d' \ -e 's/$$STRIPFLAG/${STRIP}/' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/src/Makefile.ponscripter -.if ! ${PORT_OPTIONS:MMANPAGES} + +post-patch-MANPAGES-off: @${REINPLACE_CMD} -i .manpages.bak \ -e '/install-man/d' \ -e 's/xmlto/${FALSE}/' \ ${WRKSRC}/configure -.endif -post-build: -.if ${PORT_OPTIONS:MMANPAGES} +post-build-MANPAGES-on: # Remove extraneous whitespace to unbreak manpage syntax ${REINPLACE_CMD} -e 's/^[[:space:]]*//; /^$$/d' \ ${WRKSRC}/doc/*.[0-9] -.endif post-install: ${INSTALL_DATA} ${WRKSRC}/misc/ponscripter-mode.el \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> Modified: head/devel/renpy/Makefile ============================================================================== --- head/devel/renpy/Makefile Sun Jul 19 07:42:01 2015 (r392487) +++ head/devel/renpy/Makefile Sun Jul 19 07:42:21 2015 (r392488) @@ -95,10 +95,10 @@ post-install: ! -name saves ! -name log.txt") ${CHMOD} +x ${STAGEDIR}${DATADIR}/renpy.py ${CHMOD} -R u+w ${STAGEDIR}${DATADIR}/templates -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR} \ "! -name *.orig ! -name *.bak") -.endif .include <bsd.port.mk> Modified: head/devel/rlvm/Makefile ============================================================================== --- head/devel/rlvm/Makefile Sun Jul 19 07:42:01 2015 (r392487) +++ head/devel/rlvm/Makefile Sun Jul 19 07:42:21 2015 (r392488) @@ -57,8 +57,6 @@ TEST_BUILD_DEPENDS=googletest>=1.7.0:${P luabind>0:${PORTSDIR}/devel/luabind TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-test -.include <bsd.port.options.mk> - post-patch: @${GREP} -Flr 'utf8cpp/' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.utf8cpp -e 's,utf8cpp/,,' @@ -70,10 +68,8 @@ post-patch: -e 's,truetype/mona,TrueType,' \ -e 's,truetype/[^/"]*,TTF,' -pre-install: -.if ${PORT_OPTIONS:MTEST} +pre-install-TEST-on: (cd ${WRKSRC} && build/${PORTNAME}_unittests) -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} \ @@ -87,15 +83,15 @@ do-install: ${INSTALL_DATA} -v $$f \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ done) -.if ${PORT_OPTIONS:MNLS} + +post-install-NLS-on: (cd ${WRKSRC}/build/locale && ${COPYTREE_SHARE} \ . ${STAGEDIR}${PREFIX}/share/locale) -.endif -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS:Nnotes}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ notes ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Sun Jul 19 07:42:01 2015 (r392487) +++ head/emulators/ppsspp/Makefile Sun Jul 19 07:42:21 2015 (r392488) @@ -70,7 +70,18 @@ post-patch: ${WRKSRC}/Qt/Settings.pri do-install: -.if ! ${PORT_OPTIONS:MQT*} +# XXX Vendor install is incomplete + ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \ + ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1 + (cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \ + "hicolor" ${STAGEDIR}${PREFIX}/share/icons) + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/assets/unix-icons/icon-512.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg + +post-install-SDL-on: # cmake doesn't pack assets into the app unlike qmake # XXX Convert to ${PORTDATA:N${PORTNAME}} once fmake is EOL (cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \ @@ -79,18 +90,9 @@ do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tu}* \ ${STAGEDIR}${DATADIR}/${PORTNAME} ${LN} -sf ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.else + +post-install-SDL-off: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin -.endif - ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \ - ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1 - (cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \ - "hicolor" ${STAGEDIR}${PREFIX}/share/icons) - ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_DATA} ${WRKSRC}/assets/unix-icons/icon-512.svg \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg .include <bsd.port.mk> Modified: head/games/openra/Makefile ============================================================================== --- head/games/openra/Makefile Sun Jul 19 07:42:01 2015 (r392487) +++ head/games/openra/Makefile Sun Jul 19 07:42:21 2015 (r392488) @@ -71,8 +71,6 @@ ZENITY_RUN_DEPENDS=xdg-open:${PORTSDIR}/ zenity:${PORTSDIR}/x11/zenity ZENITY_DESC= Use native crash dialog -.include <bsd.port.options.mk> - post-extract: @${MKDIR} ${WRKSRC}/thirdparty/download @${CP} -v ${DISTFILES:C/:.*//:N*.tar*:N*.zip:S,^,${_DISTDIR}/,} \ @@ -102,19 +100,15 @@ post-patch: ${REINPLACE_CMD} -e 's/"BSD"/"${OPSYS}"/' \ ${WRKSRC}/OpenRA.Game/Platform.cs -post-build: -.if ${PORT_OPTIONS:MDOCS} +post-build-DOCS-on: @${ECHO_MSG} Generating HTML documentation... @for f in ${WRKSRC}/*.md; do \ ${ECHO_MSG} markdown $$f -\> $${f%.md}.html; \ markdown $$f >$${f%.md}.html; \ done -.endif -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507190742.t6J7gMUh035998>