Date: Mon, 16 Feb 2015 08:12:17 +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: r379072 - in head: audio/alsa-utils devel/onscripter devel/ponscripter-sekai devel/renpy devel/rlvm emulators/xsystem35 games/katawa-shoujo games/openra net-p2p/transmission-cli sysutil... Message-ID: <201502160812.t1G8CHrM080138@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Feb 16 08:12:16 2015 New Revision: 379072 URL: https://svnweb.freebsd.org/changeset/ports/379072 QAT: https://qat.redports.org/buildarchive/r379072/ Log: Improve style/consistency among the ports I maintain - Convert to COPYTREE_SHARE - Drop unnecessary MKDIR before COPYTREE_SHARE - Drop bsd.port.options.mk if only DOCS requires it without dependencies - Use separate backup if several REINPLACE_CMD against the same file - audio/alsa-utils: convert to LIBS Differential Revision: https://reviews.freebsd.org/D1851 Approved by: bapt (mentor) Modified: head/audio/alsa-utils/Makefile head/devel/onscripter/Makefile head/devel/ponscripter-sekai/Makefile head/devel/renpy/Makefile head/devel/rlvm/Makefile head/emulators/xsystem35/Makefile head/games/katawa-shoujo/Makefile head/games/openra/Makefile head/net-p2p/transmission-cli/Makefile head/sysutils/fusefs-simple-mtpfs/Makefile Modified: head/audio/alsa-utils/Makefile ============================================================================== --- head/audio/alsa-utils/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/audio/alsa-utils/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -32,14 +32,15 @@ MANPAGES_CONFIGURE_ENABLE=xmlto NLS_USES= gettext NLS_CONFIGURE_ENABLE=nls -NLS_LDFLAGS= -lintl +NLS_LIBS= -lintl post-patch: .SILENT ${REINPLACE_CMD} -e '/LIBS/s/-ldl//g; /LIBRT/s/-lrt//g;' \ ${WRKSRC}/configure ${FIND} -E ${WRKSRC} -type f -regex \ '.*\.([[:digit:]]|spec\.in|csv|xml)' -exec \ - ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \ + ${REINPLACE_CMD} -i .pathfix.bak \ + -e 's|/usr/share|${PREFIX}/share|g' \ -e 's|/etc/asound\.conf|${LOCALBASE}&|g' {} + .include <bsd.port.mk> Modified: head/devel/onscripter/Makefile ============================================================================== --- head/devel/onscripter/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/devel/onscripter/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -53,7 +53,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/www && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR} \ "! -name *.orig ! -name *.bak") Modified: head/devel/ponscripter-sekai/Makefile ============================================================================== --- head/devel/ponscripter-sekai/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/devel/ponscripter-sekai/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -54,7 +54,8 @@ post-patch: @${REINPLACE_CMD} -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/src/Makefile.ponscripter .if ! ${PORT_OPTIONS:MMANPAGES} - @${REINPLACE_CMD} -e '/install-man/d' \ + @${REINPLACE_CMD} -i .manpages.bak \ + -e '/install-man/d' \ -e 's/xmlto/${FALSE}/' \ ${WRKSRC}/configure .endif @@ -70,10 +71,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/misc/ponscripter-mode.el \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -. for f in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -. endfor + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> Modified: head/devel/renpy/Makefile ============================================================================== --- head/devel/renpy/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/devel/renpy/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -68,14 +68,12 @@ post-install: -exec ${STRIP_CMD} {} + ${LN} -fs ${DATADIR}/renpy.py \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDATA}" ${STAGEDIR}${DATADIR} \ "! -name *.orig ! -name *.bak") ${CHMOD} +x ${STAGEDIR}${DATADIR}/renpy.py ${CHMOD} -R u+w ${STAGEDIR}${DATADIR}/templates .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR} \ "! -name *.orig ! -name *.bak") Modified: head/devel/rlvm/Makefile ============================================================================== --- head/devel/rlvm/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/devel/rlvm/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -97,10 +97,8 @@ do-install: . ${STAGEDIR}${PREFIX}/share/locale) .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -. for f in ${PORTDOCS:Nnotes} - ${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -. endfor + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${PORTDOCS:Nnotes}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ notes ${STAGEDIR}${DOCSDIR}) .endif Modified: head/emulators/xsystem35/Makefile ============================================================================== --- head/emulators/xsystem35/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/emulators/xsystem35/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -68,14 +68,11 @@ post-patch: post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/instgame ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc;\ - ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/src/xsys35rc.sample ${STAGEDIR}${EXAMPLESDIR} - @(cd ${WRKSRC}/contrib; \ - ${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR}) - @(cd ${WRKSRC}/patch; \ - ${INSTALL_DATA} pastel.diff ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} \ + "*.*" ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_DATA} ${WRKSRC}/patch/pastel.diff \ + ${WRKSRC}/src/xsys35rc.sample \ + ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/games/katawa-shoujo/Makefile ============================================================================== --- head/games/katawa-shoujo/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/games/katawa-shoujo/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -27,7 +27,7 @@ NO_BUILD= yes INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/Katawa\ Shoujo-linux-x86 PORTDATA= * -PORTDOCS= * +PORTDOCS= *.pdf PLIST_FILES= bin/${PORTNAME} \ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ share/icons/hicolor/256x256/apps/${PORTNAME}.png @@ -43,8 +43,6 @@ OPTIONS_DEFINE= DOCS MANUAL_PACKAGE_BUILD= huge (470MiB) -.include <bsd.port.options.mk> - pre-install: ${PRINTF} '#! /bin/sh\nrenpy ${DATADIR} "$$@"\n' \ >${WRKDIR}/${PORTNAME} @@ -56,11 +54,8 @@ do-install: ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-${i}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${PORTNAME}.png .endfor - ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/game && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/*.pdf ${STAGEDIR}${DOCSDIR} -.endif + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/games/openra/Makefile ============================================================================== --- head/games/openra/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/games/openra/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -28,7 +28,7 @@ MAKE_ARGS= VERSION="${GH_TAGNAME}" INSTALL_TARGET= install-all install-linux-shortcuts DATADIR= ${PREFIX}/lib/${PORTNAME} PORTDATA= * -PORTDOCS= * +PORTDOCS= *.html OPTIONS_DEFINE= DOCS TEST ZENITY OPTIONS_DEFAULT=ZENITY @@ -71,8 +71,8 @@ post-build: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> Modified: head/net-p2p/transmission-cli/Makefile ============================================================================== --- head/net-p2p/transmission-cli/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/net-p2p/transmission-cli/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -112,10 +112,8 @@ general-patch: post-patch: general-patch general-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${DOCS}" ${STAGEDIR}${DOCSDIR}) post-install: general-install Modified: head/sysutils/fusefs-simple-mtpfs/Makefile ============================================================================== --- head/sysutils/fusefs-simple-mtpfs/Makefile Mon Feb 16 07:56:47 2015 (r379071) +++ head/sysutils/fusefs-simple-mtpfs/Makefile Mon Feb 16 08:12:16 2015 (r379072) @@ -41,8 +41,8 @@ SUB_FILES+= special_${PORTNAME} .endif post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .if exists(/etc/autofs) @${MKDIR} ${STAGEDIR}/etc/autofs ${INSTALL_SCRIPT} ${WRKDIR}/special_${PORTNAME} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502160812.t1G8CHrM080138>