1 files changed, 36 insertions, 26 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index 3986b8bf6cfb..368848c2e6ed 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -17,13 +17,12 @@ DISTFILES=	${DISTNAME}.tar.gz
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	A LaTeX2e macro package which enables the use of CJK scripts
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
-		${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
+		latex:${PORTSDIR}/print/teTeX \
 		ttf2pk:${PORTSDIR}/print/freetype-tools
-RUN_DEPENDS:=	${BUILD_DEPENDS} # Equal to BUILD_DEPENDS, immediate effect
-
-BUILD_DEPENDS+=	ttf2pt1:${PORTSDIR}/print/ttf2pt1 \
-		${LOCALBASE}/share/ttf2pt1/maps/cugb.map:${PORTSDIR}/chinese/ttf2pt1
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		${LOCALBASE}/share/ttf2pt1/maps/cugb.map:${PORTSDIR}/chinese/ttf2pt1 \
+		ttf2pt1:${PORTSDIR}/print/ttf2pt1
 
 USE_GMAKE=	yes
 USE_FREETYPE=	yes
@@ -34,11 +33,11 @@ MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \
 SUB_FILES=	pkg-message
 SUB_LIST=	TEXMFMAIN=${LOCALBASE}/share/texmf
 
-INSTALL_DIR=	/usr/bin/install -d -m 0755 -o root -g wheel
+INSTALL_DIR=	${INSTALL} -d -m 0755 -o root -g wheel
 
 CJKDIR=		${PREFIX}/share/texmf/tex/latex/CJK
-WRKFONTDIR=	${WRKDIR}/fonts
 CJKMAPDIR=	${PREFIX}/share/texmf/fonts/map/CJK
+WRKFONTDIR=	${WRKDIR}/fonts
 
 # Options: WITH_*/WITHOUT_*
 OPTIONS=	CCMAP       "CCT CCMap package (for PDFTeX's CID support)" on \
@@ -56,7 +55,6 @@ PLIST_SUB+=	CCMAP=""
 .endif
 
 .if !defined(WITHOUT_DVIPDFMX)
-BUILD_DEPENDS+=	dvipdfmx:${PORTSDIR}/print/dvipdfmx
 RUN_DEPENDS+=	dvipdfmx:${PORTSDIR}/print/dvipdfmx
 # Configuration is done by "pkg-install"
 .endif
@@ -71,35 +69,43 @@ pre-patch:
 	@${RM} -f ${WRKSRC}/Makefile
 
 post-patch:
-	@${FIND} ${WRKSRC}/texinput -name \*.orig | ${XARGS} -n 1 ${RM} -f
+	@${FIND} ${WRKSRC}/texinput -name \*.orig -delete
 
 pre-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${RM} -fr ${PREFIX}/share/doc/CJK
-	${CP} -R ${WRKSRC}/doc ${PREFIX}/share/doc/CJK
+	${RM} -fr ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
 .endif
-	${RM} -fr ${PREFIX}/share/examples/CJK
-	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
+	${RM} -fr ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples ${EXAMPLESDIR}
 
 # Install Arphic fonts for Type 3 or DVIPDFMx
 	@${ECHO_CMD} "Generating Arphic fonts' TFM files..."
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh   arb5sung arb5sung.ttf UBig5
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh   arb5kai  arb5kai.ttf  UBig5
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh   argbsung argbsung.ttf UGB
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh   argbkai  argbkai.ttf  UGB
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		arb5sung arb5sung.ttf UBig5
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		arb5kai arb5kai.ttf UBig5
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		argbsung argbsung.ttf UGB
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		argbkai argbkai.ttf UGB
 
 # Install Arphic fonts for Type 1 and PDFTeX
 	@${ECHO_CMD} "Generating Type 1 Arphic fonts..."
 	${MKDIR} ${WRKFONTDIR}
 	${ECHO} -n "" > ${WRKFONTDIR}/CJK-type1.map
 	${ECHO} -n "" > ${WRKFONTDIR}/CJK-pdftex.map
-	cd ${WRKFONTDIR} && LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installt1enc.sh arb5sung arb5sung.ttf Bg5
-	cd ${WRKFONTDIR} && LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installt1enc.sh arb5kai  arb5kai.ttf  Bg5
-	cd ${WRKFONTDIR} && LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installt1enc.sh argbsung argbsung.ttf GB
-	cd ${WRKFONTDIR} && LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installt1enc.sh argbkai  argbkai.ttf  GB
+	cd ${WRKFONTDIR} && ${SETENV} LOCALBASE=${LOCALBASE} ${SH} \
+		${SCRIPTDIR}/installt1enc.sh arb5sung arb5sung.ttf Bg5
+	cd ${WRKFONTDIR} && ${SETENV} LOCALBASE=${LOCALBASE} ${SH} \
+		${SCRIPTDIR}/installt1enc.sh arb5kai arb5kai.ttf Bg5
+	cd ${WRKFONTDIR} && ${SETENV} LOCALBASE=${LOCALBASE} ${SH} \
+		${SCRIPTDIR}/installt1enc.sh argbsung argbsung.ttf GB
+	cd ${WRKFONTDIR} && ${SETENV} LOCALBASE=${LOCALBASE} ${SH} \
+		${SCRIPTDIR}/installt1enc.sh argbkai argbkai.ttf GB
 
 # Install package ccmap
 .if !defined(WITHOUT_CCMAP)
@@ -112,10 +118,14 @@ post-install:
 # Install Arphic fonts in Unicode separation for Type 3 or DVIPDFMx
 .if defined(WITH_UTF8ARPHIC)
 	@${ECHO_CMD} "Generating Arphic fonts' TFM files in Unicode..."
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh arb5sungu arb5sung.ttf Unicode
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh arb5kaiu  arb5kai.ttf  Unicode
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh argbsungu argbsung.ttf Unicode
-	LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh argbkaiu  argbkai.ttf  Unicode
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		arb5sungu arb5sung.ttf Unicode
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		arb5kaiu arb5kai.ttf Unicode
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		argbsungu argbsung.ttf Unicode
+	${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/installtfm.sh \
+		argbkaiu argbkai.ttf Unicode
 .endif
 
 # Mapping files for updmap(1) and PDFTeX