diff options
| -rw-r--r-- | chinese/xpdf/Makefile | 14 | ||||
| -rw-r--r-- | chinese/xpdf/pkg-install | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile index c059d3665599..ffa7db858c55 100644 --- a/chinese/xpdf/Makefile +++ b/chinese/xpdf/Makefile @@ -21,7 +21,7 @@ COMMENT= Chinese xpdf font support RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf\ ${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-CNS1-0:${PORTSDIR}/print/adobe-cmaps \ - ${LOCALBASE}/share/fonts/TrueType/arphic/logo.gif:${PORTSDIR}/chinese/arphicttf + ${LOCALBASE}/share/arphicttf/logo.gif:${PORTSDIR}/chinese/arphicttf NO_BUILD= yes USE_X_PREFIX= yes @@ -31,15 +31,15 @@ SIMP_FILES= Adobe-GB1.cidToUnicode EUC-CN.unicodeMap GBK.unicodeMap \ TRAD_FILES= Adobe-CNS1.cidToUnicode Big5.unicodeMap \ Big5ascii.unicodeMap README do-install: - ${MKDIR} ${PREFIX}/share/xpdf/chinese-simplified + @${MKDIR} ${DATADIR}/chinese-simplified .for i in ${SIMP_FILES} - ${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-simplified/${i} ${PREFIX}/share/xpdf/chinese-simplified + ${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-simplified/${i} ${DATADIR}/chinese-simplified .endfor - ${MKDIR} ${PREFIX}/share/xpdf/chinese-traditional + @${MKDIR} ${DATADIR}/chinese-traditional .for i in ${TRAD_FILES} - ${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-traditional/${i} ${PREFIX}/share/xpdf/chinese-traditional + ${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-traditional/${i} ${DATADIR}/chinese-traditional .endfor - ${INSTALL_DATA} ${FILESDIR}/dot.xpdfrc ${PREFIX}/share/xpdf/chinese-traditional - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_DATA} ${FILESDIR}/dot.xpdfrc ${DATADIR}/chinese-traditional + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/chinese/xpdf/pkg-install b/chinese/xpdf/pkg-install index 26a5b27d2717..1810a1ea6743 100644 --- a/chinese/xpdf/pkg-install +++ b/chinese/xpdf/pkg-install @@ -4,6 +4,6 @@ if [ "$2" = "PRE-INSTALL" ]; then fi XPDFRC=${PKG_PREFIX}/etc/xpdfrc ADDRESOURCE=${PKG_PREFIX}/share/xpdf/chinese-traditional/dot.xpdfrc -/usr/bin/grep -F -v --file=${ADDRESOURCE} ${XPDFRC} > ${XPDFRC}.nochinese-traditional -/bin/cat ${XPDFRC}.nochinese-traditional ${ADDRESOURCE} > ${XPDFRC} -/bin/rm -f ${XPDFRC}.nochinese-traditional +grep -F -v --file=${ADDRESOURCE} ${XPDFRC} > ${XPDFRC}.nochinese-traditional +cat ${XPDFRC}.nochinese-traditional ${ADDRESOURCE} > ${XPDFRC} +rm -f ${XPDFRC}.nochinese-traditional |