diff options
author | mat <mat@FreeBSD.org> | 2015-11-05 20:36:25 +0800 |
---|---|---|
committer | mat <mat@FreeBSD.org> | 2015-11-05 20:36:25 +0800 |
commit | 344522393988339d341fda0818f0281645323f90 (patch) | |
tree | 9cbf2a263e7841be76898ae832e7bfb273d3fd08 /x11-fonts | |
parent | a8ea83538e74965157afe830f9873190be5ac78a (diff) | |
download | freebsd-ports-gnome-344522393988339d341fda0818f0281645323f90.tar.gz freebsd-ports-gnome-344522393988339d341fda0818f0281645323f90.tar.zst freebsd-ports-gnome-344522393988339d341fda0818f0281645323f90.zip |
Fix ports that confused the meaning of WRKDIR and WRKSRC.
PR: 204056
Submitted by: mat
Reviewed by: bapt
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D2735
Diffstat (limited to 'x11-fonts')
-rw-r--r-- | x11-fonts/fira/Makefile | 2 | ||||
-rw-r--r-- | x11-fonts/noto/Makefile | 2 | ||||
-rw-r--r-- | x11-fonts/proggy_fonts/Makefile | 4 | ||||
-rw-r--r-- | x11-fonts/symbola/Makefile | 6 | ||||
-rw-r--r-- | x11-fonts/tmu/Makefile | 2 | ||||
-rw-r--r-- | x11-fonts/wqy/Makefile | 72 |
6 files changed, 44 insertions, 44 deletions
diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile index cd3561d6201a..80b38603c8c3 100644 --- a/x11-fonts/fira/Makefile +++ b/x11-fonts/fira/Makefile @@ -54,7 +54,7 @@ do-install-DOCS-on: do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for e in ${EXAMPLES_DISTFILES:R:C|:[^:]+$||} - (cd ${WRKDIR}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .endfor .include <bsd.port.mk> diff --git a/x11-fonts/noto/Makefile b/x11-fonts/noto/Makefile index 28b53e136f7e..2a7d49bfad9a 100644 --- a/x11-fonts/noto/Makefile +++ b/x11-fonts/noto/Makefile @@ -21,7 +21,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes post-extract: - ${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKDIR} + ${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKSRC} do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile index d28476374000..1d340fb1640c 100644 --- a/x11-fonts/proggy_fonts/Makefile +++ b/x11-fonts/proggy_fonts/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${CP} ${ALREADY_UNZIP} ${WRKDIR} - ${INSTALL_DATA} ${WRKDIR}/*.pcf* ${STAGEDIR}${FONTSDIR} + ${CP} ${ALREADY_UNZIP} ${WRKSRC} + ${INSTALL_DATA} ${WRKSRC}/*.pcf* ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/symbola/Makefile b/x11-fonts/symbola/Makefile index 9c5ffa851393..7b503fd3a671 100644 --- a/x11-fonts/symbola/Makefile +++ b/x11-fonts/symbola/Makefile @@ -26,9 +26,9 @@ PORTDOCS= * do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.htm ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.docx ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.docx ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.ttf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/tmu/Makefile b/x11-fonts/tmu/Makefile index 891d1633c8d8..bdca31bcb4b2 100644 --- a/x11-fonts/tmu/Makefile +++ b/x11-fonts/tmu/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= ${FONTSDIR}/tmu.ttf EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile index 8986af5affa6..54afa2a5b1aa 100644 --- a/x11-fonts/wqy/Makefile +++ b/x11-fonts/wqy/Makefile @@ -46,56 +46,56 @@ PORTDOCS= AUTHORS.bitmap ChangeLog.bitmap README.bitmap COPYING.bitmap \ LICENSE_Apache2.txt LICENSE_GPLv3.txt do-build: - ${PERL} ${WRKDIR}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKDIR}/wqy-unibit/wqy-unibit.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf - bdftopcf ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit.pcf - ${CP} ${WRKDIR}/wqy-bitmapsong/AUTHORS ${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap - ${CP} ${WRKDIR}/wqy-bitmapsong/ChangeLog ${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap - ${CP} ${WRKDIR}/wqy-bitmapsong/README ${WRKDIR}/wqy-bitmapsong/README.bitmap - ${CP} ${WRKDIR}/wqy-bitmapsong/COPYING ${WRKDIR}/wqy-bitmapsong/COPYING.bitmap - ${CP} ${WRKDIR}/wqy-zenhei/AUTHORS ${WRKDIR}/wqy-zenhei/AUTHORS.zenhei - ${CP} ${WRKDIR}/wqy-zenhei/ChangeLog ${WRKDIR}/wqy-zenhei/ChangeLog.zenhei - ${CP} ${WRKDIR}/wqy-zenhei/README ${WRKDIR}/wqy-zenhei/README.zenhei - ${CP} ${WRKDIR}/wqy-microhei-lite/AUTHORS.txt ${WRKDIR}/wqy-microhei-lite/AUTHORS.microheilite - ${CP} ${WRKDIR}/wqy-microhei-lite/ChangeLog.txt ${WRKDIR}/wqy-microhei-lite/ChangeLog.microheilite - ${CP} ${WRKDIR}/wqy-microhei-lite/README.txt ${WRKDIR}/wqy-microhei-lite/README.microheilite - ${CP} ${WRKDIR}/wqy-microhei/AUTHORS.txt ${WRKDIR}/wqy-microhei/AUTHORS.microhei - ${CP} ${WRKDIR}/wqy-microhei/ChangeLog.txt ${WRKDIR}/wqy-microhei/ChangeLog.microhei - ${CP} ${WRKDIR}/wqy-microhei/README.txt ${WRKDIR}/wqy-microhei/README.microhei + ${PERL} ${WRKSRC}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKSRC}/wqy-unibit/wqy-unibit.bdf > ${WRKSRC}/wqy-unibit/wqy-unibit_cjk.bdf + bdftopcf ${WRKSRC}/wqy-unibit/wqy-unibit_cjk.bdf > ${WRKSRC}/wqy-unibit/wqy-unibit.pcf + ${CP} ${WRKSRC}/wqy-bitmapsong/AUTHORS ${WRKSRC}/wqy-bitmapsong/AUTHORS.bitmap + ${CP} ${WRKSRC}/wqy-bitmapsong/ChangeLog ${WRKSRC}/wqy-bitmapsong/ChangeLog.bitmap + ${CP} ${WRKSRC}/wqy-bitmapsong/README ${WRKSRC}/wqy-bitmapsong/README.bitmap + ${CP} ${WRKSRC}/wqy-bitmapsong/COPYING ${WRKSRC}/wqy-bitmapsong/COPYING.bitmap + ${CP} ${WRKSRC}/wqy-zenhei/AUTHORS ${WRKSRC}/wqy-zenhei/AUTHORS.zenhei + ${CP} ${WRKSRC}/wqy-zenhei/ChangeLog ${WRKSRC}/wqy-zenhei/ChangeLog.zenhei + ${CP} ${WRKSRC}/wqy-zenhei/README ${WRKSRC}/wqy-zenhei/README.zenhei + ${CP} ${WRKSRC}/wqy-microhei-lite/AUTHORS.txt ${WRKSRC}/wqy-microhei-lite/AUTHORS.microheilite + ${CP} ${WRKSRC}/wqy-microhei-lite/ChangeLog.txt ${WRKSRC}/wqy-microhei-lite/ChangeLog.microheilite + ${CP} ${WRKSRC}/wqy-microhei-lite/README.txt ${WRKSRC}/wqy-microhei-lite/README.microheilite + ${CP} ${WRKSRC}/wqy-microhei/AUTHORS.txt ${WRKSRC}/wqy-microhei/AUTHORS.microhei + ${CP} ${WRKSRC}/wqy-microhei/ChangeLog.txt ${WRKSRC}/wqy-microhei/ChangeLog.microhei + ${CP} ${WRKSRC}/wqy-microhei/README.txt ${WRKSRC}/wqy-microhei/README.microhei do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} ${STAGEDIR}${PREFIX}/${CONFDDIR} ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} # WQY Bitmap Song - ${INSTALL_DATA} ${WRKDIR}/wqy-bitmapsong/*.pcf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-bitmapsong/*.pcf ${STAGEDIR}${FONTSDIR} # WQY Bitmap Song - ${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-unibit/wqy-unibit.pcf ${STAGEDIR}${FONTSDIR} # WQY TrueType Zenhei - ${INSTALL_DATA} ${WRKDIR}/wqy-zenhei/wqy-zenhei.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-zenhei/wqy-zenhei.ttc ${STAGEDIR}${FONTSDIR} # WQY TrueType MicroHei Lite - ${INSTALL_DATA} ${WRKDIR}/wqy-microhei-lite/wqy-microhei-lite.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-microhei-lite/wqy-microhei-lite.ttc ${STAGEDIR}${FONTSDIR} # WQY TrueType MicroHei - ${INSTALL_DATA} ${WRKDIR}/wqy-microhei/wqy-microhei.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-microhei/wqy-microhei.ttc ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} ${LN} -sf ${PREFIX}/${CONFAVAILDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFDDIR}/85-wqy.conf ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ - ${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap \ - ${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap \ - ${WRKDIR}/wqy-bitmapsong/README.bitmap \ - ${WRKDIR}/wqy-bitmapsong/COPYING.bitmap \ - ${WRKDIR}/wqy-bitmapsong/LOGO.png \ - ${WRKDIR}/wqy-zenhei/AUTHORS.zenhei \ - ${WRKDIR}/wqy-zenhei/ChangeLog.zenhei \ - ${WRKDIR}/wqy-zenhei/README.zenhei \ - ${WRKDIR}/wqy-microhei-lite/AUTHORS.microheilite \ - ${WRKDIR}/wqy-microhei-lite/ChangeLog.microheilite \ - ${WRKDIR}/wqy-microhei-lite/README.microheilite \ - ${WRKDIR}/wqy-microhei/AUTHORS.microhei \ - ${WRKDIR}/wqy-microhei/ChangeLog.microhei \ - ${WRKDIR}/wqy-microhei/README.microhei \ - ${WRKDIR}/wqy-microhei/LICENSE_Apache2.txt \ - ${WRKDIR}/wqy-microhei/LICENSE_GPLv3.txt \ + ${WRKSRC}/wqy-bitmapsong/AUTHORS.bitmap \ + ${WRKSRC}/wqy-bitmapsong/ChangeLog.bitmap \ + ${WRKSRC}/wqy-bitmapsong/README.bitmap \ + ${WRKSRC}/wqy-bitmapsong/COPYING.bitmap \ + ${WRKSRC}/wqy-bitmapsong/LOGO.png \ + ${WRKSRC}/wqy-zenhei/AUTHORS.zenhei \ + ${WRKSRC}/wqy-zenhei/ChangeLog.zenhei \ + ${WRKSRC}/wqy-zenhei/README.zenhei \ + ${WRKSRC}/wqy-microhei-lite/AUTHORS.microheilite \ + ${WRKSRC}/wqy-microhei-lite/ChangeLog.microheilite \ + ${WRKSRC}/wqy-microhei-lite/README.microheilite \ + ${WRKSRC}/wqy-microhei/AUTHORS.microhei \ + ${WRKSRC}/wqy-microhei/ChangeLog.microhei \ + ${WRKSRC}/wqy-microhei/README.microhei \ + ${WRKSRC}/wqy-microhei/LICENSE_Apache2.txt \ + ${WRKSRC}/wqy-microhei/LICENSE_GPLv3.txt \ ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> |