Date: Sun, 20 Jul 2014 09:02:14 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362305 - in head/chinese: CJKUnifonts CNS11643-font arphicttf cwtexttf fireflyttf opendesktop-fonts Message-ID: <201407200902.s6K92ELr027502@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Jul 20 09:02:14 2014 New Revision: 362305 URL: http://svnweb.freebsd.org/changeset/ports/362305 QAT: https://qat.redports.org/buildarchive/r362305/ Log: Convert 6 chinese font ponts to include with .CURDIR These ports were including chinese/ttfm/Makefile.ttf using an absolute path using PORTSDIR instead of a relative one using .CURDIR. In specific use cases, PORTSDIR will fail but .CURDIR always works. As a bonus, this allows <pre> & <post> inclusions to be removed as well. Covered by an old blanket permission (bapt) but only two of these ports have maintainers anyway. Modified: head/chinese/CJKUnifonts/Makefile head/chinese/CNS11643-font/Makefile head/chinese/arphicttf/Makefile head/chinese/cwtexttf/Makefile head/chinese/fireflyttf/Makefile head/chinese/opendesktop-fonts/Makefile Modified: head/chinese/CJKUnifonts/Makefile ============================================================================== --- head/chinese/CJKUnifonts/Makefile Sun Jul 20 08:15:16 2014 (r362304) +++ head/chinese/CJKUnifonts/Makefile Sun Jul 20 09:02:14 2014 (r362305) @@ -26,6 +26,5 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/ukai.ttc ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKDIR}/uming.ttc ${STAGEDIR}${FONTSDIR} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../ttfm/Makefile.ttf" +.include <bsd.port.mk> Modified: head/chinese/CNS11643-font/Makefile ============================================================================== --- head/chinese/CNS11643-font/Makefile Sun Jul 20 08:15:16 2014 (r362304) +++ head/chinese/CNS11643-font/Makefile Sun Jul 20 09:02:14 2014 (r362305) @@ -35,6 +35,5 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "*******************************************************************************" -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../ttfm/Makefile.ttf" +.include <bsd.port.mk> Modified: head/chinese/arphicttf/Makefile ============================================================================== --- head/chinese/arphicttf/Makefile Sun Jul 20 08:15:16 2014 (r362304) +++ head/chinese/arphicttf/Makefile Sun Jul 20 09:02:14 2014 (r362305) @@ -25,6 +25,5 @@ do-install: ${CP} -fr ${WRKSRC}/license ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/logo.gif ${WRKSRC}/release.txt ${STAGEDIR}${DATADIR} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../ttfm/Makefile.ttf" +.include <bsd.port.mk> Modified: head/chinese/cwtexttf/Makefile ============================================================================== --- head/chinese/cwtexttf/Makefile Sun Jul 20 08:15:16 2014 (r362304) +++ head/chinese/cwtexttf/Makefile Sun Jul 20 09:02:14 2014 (r362305) @@ -24,6 +24,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FONTSDIR} .endfor -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../ttfm/Makefile.ttf" +.include <bsd.port.mk> Modified: head/chinese/fireflyttf/Makefile ============================================================================== --- head/chinese/fireflyttf/Makefile Sun Jul 20 08:15:16 2014 (r362304) +++ head/chinese/fireflyttf/Makefile Sun Jul 20 09:02:14 2014 (r362305) @@ -22,8 +22,7 @@ PLIST_FILES= ${FONTSDIR_REL}/local.conf- OPTIONS_DEFAULT+=LGJ_FONT -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" +.include "${.CURDIR}/../ttfm/Makefile.ttf" OPTIONS_DEFINE+=LGJ_FONT LGJ_FONT_DESC= Patch for Taiwan horn @@ -49,4 +48,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${TTF} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${STAGEDIR}${FONTSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/chinese/opendesktop-fonts/Makefile ============================================================================== --- head/chinese/opendesktop-fonts/Makefile Sun Jul 20 08:15:16 2014 (r362304) +++ head/chinese/opendesktop-fonts/Makefile Sun Jul 20 09:02:14 2014 (r362305) @@ -18,8 +18,7 @@ NO_BUILD= yes TTF= odokai-ExtB.ttf odokai.ttf odosung-ExtB.ttf odosung.ttc PLIST_FILES= ${FONTSDIR_REL}/local.conf-odo -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" +.include "${.CURDIR}/../ttfm/Makefile.ttf" post-extract: @${CHMOD} 0755 ${WRKSRC}/license @@ -37,4 +36,4 @@ do-install: .endfor ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407200902.s6K92ELr027502>