- Update to 4.8.0

- Respect LOCALBASE (ccmap/make.sh, pkg-install, pkg-deinstall)
- Respect NOPORTEXAMPLES
- Use COPYTREE_* where applicable

6 files changed, 44 insertions, 33 deletions

diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index dafd902b81c6..69942fe63e1f 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	latex-cjk
-PORTVERSION=	4.7.0
-PORTREVISION=	1
+PORTVERSION=	4.8.0
 CATEGORIES=	print chinese japanese korean
 MASTER_SITES=	http://cjk.ffii.org/ \
 		ftp://freebsd.csie.ntu.edu.tw/users/rafan/
@@ -72,18 +71,23 @@ post-patch:
 	# be compatible with Debian
 	@${CP} -p ${WRKSRC}/texinput/Bg5/c00kai.fd ${WRKSRC}/texinput/Bg5/c00bkai.fd
 	@${REINPLACE_CMD} -e 's,c00kai.fd,c00bkai.fd,; s,{kai},{bkai},' ${WRKSRC}/texinput/Bg5/c00bkai.fd
-	@${FIND} -E ${WRKSRC} -regex '.*.(orig|bak)' -delete
+.if defined(WITH_CCMAP)
+	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKDIR}/ccmap/make.sh
+.endif
+	@${FIND} -E ${WRKSRC} ${WRKDIR}/ccmap -regex '.*.(orig|bak)' -delete
 
 pre-su-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${RM} -fr ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR})
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
-	${RM} -fr ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples ${EXAMPLESDIR}
 
 # Install Arphic fonts for Type 3 or DVIPDFMx
 	@${ECHO_CMD} "Generating Arphic fonts' TFM files..."
@@ -114,8 +118,7 @@ post-install:
 .if !defined(WITHOUT_CCMAP)
 	@${ECHO_CMD} "Installing ccmap..."
 	${LOCALBASE}/bin/mktexlsr
-	cd ${WRKDIR}/ccmap && ${SH} make.sh
-	${CP} -R ${WRKDIR}/ccmap ${CJKDIR}/
+	cd ${WRKDIR}/ccmap && ${SH} make.sh && ${COPYTREE_SHARE} \* ${CJKDIR}/ccmap
 .endif
 
 # Install Arphic fonts in Unicode separation for Type 3 or DVIPDFMx
diff --git a/print/latex-cjk/distinfo b/print/latex-cjk/distinfo
index fa756c035f3e..b0270b05e4e1 100644
--- a/print/latex-cjk/distinfo
+++ b/print/latex-cjk/distinfo
@@ -1,6 +1,6 @@
-MD5 (cjk-4.7.0.tar.gz) = 3c9e8c45f5cb63d59307ec3eba0e2479
-SHA256 (cjk-4.7.0.tar.gz) = b3b2d9c4b1dfbbbce0a8e5fa3454edc9806ab835973b8db0245855068356e234
-SIZE (cjk-4.7.0.tar.gz) = 535037
+MD5 (cjk-4.8.0.tar.gz) = 8dc983370763dd35c0984c3b9fcd4f96
+SHA256 (cjk-4.8.0.tar.gz) = b6ef810624736f4f056595c251a2eda3623f74aecaedac22438aa9ce98862147
+SIZE (cjk-4.8.0.tar.gz) = 536876
 MD5 (cct-20060219-ccmap.tar.gz) = 71d682db938c1aa030ae9b30a2828156
 SHA256 (cct-20060219-ccmap.tar.gz) = 5fba1d89acff43e94575d17d3eacffdc202f513ed0ad3c1e00b22abc64b0870f
 SIZE (cct-20060219-ccmap.tar.gz) = 4078
diff --git a/print/latex-cjk/files/patch-utils-Makefiles b/print/latex-cjk/files/patch-utils-Makefiles
index 4eb9e6d958e1..4f21e25fd957 100644
--- a/print/latex-cjk/files/patch-utils-Makefiles
+++ b/print/latex-cjk/files/patch-utils-Makefiles
@@ -20,7 +20,7 @@
 +
 +hbf2gf_build:
 +	$(CHMOD) +x hbf2gf/config.guess hbf2gf/config.sub hbf2gf/configure
-+	(cd hbf2gf; ./configure --prefix=$(PREFIX) --with-kpathsea-lib=$(LOCALBASE)/lib --with-kpathsea-include=$(LOCALBASE)/include; $(MAKE) all)
++	(cd hbf2gf; ./configure --prefix=$(PREFIX) --mandir=$(MANPREFIX)/man --with-kpathsea-lib=$(LOCALBASE)/lib --with-kpathsea-include=$(LOCALBASE)/include; $(MAKE) all)
 +
 +all: hbf2gf_build
 +	$(MAKE) -C Bg5conv $@
diff --git a/print/latex-cjk/files/pkg-deinstall.in b/print/latex-cjk/files/pkg-deinstall.in
index 5608d7573f2d..1554aa264341 100644
--- a/print/latex-cjk/files/pkg-deinstall.in
+++ b/print/latex-cjk/files/pkg-deinstall.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LOCALBASE=/usr/local
+LOCALBASE="${LOCALBASE}"
 
 PATH=/bin:/usr/bin:${LOCALBASE}/bin; export PATH
 
diff --git a/print/latex-cjk/files/pkg-install.in b/print/latex-cjk/files/pkg-install.in
index b55b3aae8b4e..68b986239e6a 100644
--- a/print/latex-cjk/files/pkg-install.in
+++ b/print/latex-cjk/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LOCALBASE=/usr/local
+LOCALBASE="%%LOCALBASE%%"
 
 PATH=/bin:/usr/bin:${LOCALBASE}/bin; export PATH
 
diff --git a/print/latex-cjk/pkg-plist b/print/latex-cjk/pkg-plist
index 756b9cedaa8d..9da57ef4156e 100644
--- a/print/latex-cjk/pkg-plist
+++ b/print/latex-cjk/pkg-plist
@@ -68,28 +68,30 @@ bin/sjispdflatex
 %%PORTDOCS%%%%DOCSDIR%%/ruby.txt
 %%PORTDOCS%%%%DOCSDIR%%/thaifont.txt
 %%PORTDOCS%%%%DOCSDIR%%/vertical.txt
+%%PORTDOCS%%%%DOCSDIR%%/xCJK.txt
 share/emacs/site-lisp/CJK/cjkspace.el
 share/emacs/site-lisp/CJK/cjktilde.el
 share/emacs/site-lisp/CJK/emacs/cjk-enc.el
 share/emacs/site-lisp/CJK/emacs/thai-word.el
 share/emacs/site-lisp/CJK/mule-2.3/cjk-enc.el
-%%EXAMPLESDIR%%/Big5.tex
-%%EXAMPLESDIR%%/Big5vert.tex
-%%EXAMPLESDIR%%/CEF_test.tex
-%%EXAMPLESDIR%%/CJKbabel.tex
-%%EXAMPLESDIR%%/CJKfntef.tex
-%%EXAMPLESDIR%%/CJKmixed.tex
-%%EXAMPLESDIR%%/CJKutf8.tex
-%%EXAMPLESDIR%%/GB.tex
-%%EXAMPLESDIR%%/JIS.tex
-%%EXAMPLESDIR%%/KS.tex
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/SJIS.tex
-%%EXAMPLESDIR%%/UTF8.tex
-%%EXAMPLESDIR%%/muletest.tex
-%%EXAMPLESDIR%%/py_test.tex
-%%EXAMPLESDIR%%/rubytest.tex
-%%EXAMPLESDIR%%/thai.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Big5.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Big5vert.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CEF_test.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CJKbabel.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CJKfntef.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CJKmixed.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CJKutf8.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GB.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/JIS.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/KS.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SJIS.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/UTF8.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/muletest.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/py_test.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rubytest.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thai.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xCJK.tex
 share/texmf/fonts/sfd/Big5.sfd
 share/texmf/fonts/sfd/EUC.sfd
 share/texmf/fonts/sfd/SJIS.sfd
@@ -1673,6 +1675,7 @@ share/texmf/tex/latex/CJK/GB/c21song.fd
 share/texmf/tex/latex/CJK/JIS/EUC-JP.bdg
 share/texmf/tex/latex/CJK/JIS/EUC-JP.chr
 share/texmf/tex/latex/CJK/JIS/EUC-JP.enc
+share/texmf/tex/latex/CJK/JIS/EUC-JPdnp.enc
 share/texmf/tex/latex/CJK/JIS/JIS.cap
 share/texmf/tex/latex/CJK/JIS/JIS.cpx
 share/texmf/tex/latex/CJK/JIS/JISdnp.enc
@@ -1792,6 +1795,8 @@ share/texmf/tex/latex/CJK/UTF8/ja.cpx
 share/texmf/tex/latex/CJK/UTF8/ko-Hang.cpx
 share/texmf/tex/latex/CJK/UTF8/ko-Hang2.cpx
 share/texmf/tex/latex/CJK/UTF8/ko-Hani.cpx
+share/texmf/tex/latex/CJK/UTF8/xUTF8.chr
+share/texmf/tex/latex/CJK/UTF8/xUTF8.enc
 share/texmf/tex/latex/CJK/UTF8/zh-Hans.cpx
 share/texmf/tex/latex/CJK/UTF8/zh-Hant.cpx
 share/texmf/tex/latex/CJK/extended.chr
@@ -1812,6 +1817,9 @@ share/texmf/tex/latex/CJK/thai/c90enc.def
 share/texmf/tex/latex/CJK/thai/c90gar.fd
 share/texmf/tex/latex/CJK/thai/c90nrsr.fd
 share/texmf/tex/latex/CJK/thai/thaicjk.ldf
+share/texmf/tex/latex/CJK/xCJK.sty
+share/texmf/tex/latex/CJK/xpmC.chr
+share/texmf/tex/latex/CJK/xpmC.enc
 %%CCMAP%%share/texmf/tex/latex/CJK/ccmap/ccmap.sty
 %%CCMAP%%share/texmf/tex/latex/CJK/ccmap/makecmap.tex
 %%CCMAP%%share/texmf/tex/latex/CJK/ccmap/make.sh
@@ -2401,7 +2409,7 @@ share/texmf/tex/latex/CJK/thai/thaicjk.ldf
 @dirrm share/emacs/site-lisp/CJK/emacs
 @dirrm share/emacs/site-lisp/CJK/mule-2.3
 @dirrm share/emacs/site-lisp/CJK
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm share/texmf/fonts/tfm/CJK/arb5kai
 @dirrm share/texmf/fonts/tfm/CJK/arb5sung
 @dirrm share/texmf/fonts/tfm/CJK/argbkai