1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

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.
This commit is contained in:
John Marino 2014-07-20 09:02:14 +00:00
parent 8ab3849088
commit 8ecbb368fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362305
6 changed files with 12 additions and 18 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -22,8 +22,7 @@ PLIST_FILES= ${FONTSDIR_REL}/local.conf-sung
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>

View File

@ -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>