diff options
author | marino <marino@FreeBSD.org> | 2014-07-20 17:02:14 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2014-07-20 17:02:14 +0800 |
commit | 7d5500d303da46e78cfdd03387dd71bb068b9a5f (patch) | |
tree | 5db0a0f77af5fa9e35921c97814d913e78c45985 /chinese | |
parent | d3abbed849ba480dee4bfd43557b6f677026b416 (diff) | |
download | freebsd-ports-gnome-7d5500d303da46e78cfdd03387dd71bb068b9a5f.tar.gz freebsd-ports-gnome-7d5500d303da46e78cfdd03387dd71bb068b9a5f.tar.zst freebsd-ports-gnome-7d5500d303da46e78cfdd03387dd71bb068b9a5f.zip |
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.
Diffstat (limited to 'chinese')
-rw-r--r-- | chinese/CJKUnifonts/Makefile | 5 | ||||
-rw-r--r-- | chinese/CNS11643-font/Makefile | 5 | ||||
-rw-r--r-- | chinese/arphicttf/Makefile | 5 | ||||
-rw-r--r-- | chinese/cwtexttf/Makefile | 5 | ||||
-rw-r--r-- | chinese/fireflyttf/Makefile | 5 | ||||
-rw-r--r-- | chinese/opendesktop-fonts/Makefile | 5 |
6 files changed, 12 insertions, 18 deletions
diff --git a/chinese/CJKUnifonts/Makefile b/chinese/CJKUnifonts/Makefile index 73d6beb7d647..8df4a4d0f515 100644 --- a/chinese/CJKUnifonts/Makefile +++ b/chinese/CJKUnifonts/Makefile @@ -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> diff --git a/chinese/CNS11643-font/Makefile b/chinese/CNS11643-font/Makefile index 36a79c7ff289..4809d2cd8db6 100644 --- a/chinese/CNS11643-font/Makefile +++ b/chinese/CNS11643-font/Makefile @@ -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> diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile index 1eca5e760ddc..f14ed358c155 100644 --- a/chinese/arphicttf/Makefile +++ b/chinese/arphicttf/Makefile @@ -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> diff --git a/chinese/cwtexttf/Makefile b/chinese/cwtexttf/Makefile index 9d7d3ea1d9af..4114262b1c63 100644 --- a/chinese/cwtexttf/Makefile +++ b/chinese/cwtexttf/Makefile @@ -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> diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile index 638bd58fc6fd..e3140563e76b 100644 --- a/chinese/fireflyttf/Makefile +++ b/chinese/fireflyttf/Makefile @@ -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> diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index ba0de62955bb..79ca736cae7a 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -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> |