Date: Thu, 20 Jan 2000 11:20:03 -0800 (PST) From: Keith Jang <keith@ml.tw.freebsd.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/16042: chinese/CJK is out of date Message-ID: <200001201920.LAA15711@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/16042; it has been noted by GNATS.
From: Keith Jang <keith@ml.tw.freebsd.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/16042: chinese/CJK is out of date
Date: Fri, 21 Jan 2000 03:17:48 +0800
This patch should be applied after the previous patch.
It fixes several bugs in *.el file, and post-install
scripts.
Please commit to unbroke chinese/CJK port, thanks.
diff -urN CJK.orig/Makefile CJK/Makefile
--- CJK.orig/Makefile Thu Jan 20 16:05:38 2000
+++ CJK/Makefile Thu Jan 20 17:09:03 2000
@@ -26,8 +26,10 @@
post-install:
.if !defined(NOPORTDOCS)
+ ${RM} -fr ${PREFIX}/share/doc/CJK
${CP} -R ${WRKSRC}/doc ${PREFIX}/share/doc/CJK
.endif
+ ${RM} -fr ${PREFIX}/share/examples/CJK
${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
MAN1= bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \
diff -urN CJK.orig/files/md5 CJK/files/md5
--- CJK.orig/files/md5 Thu Jan 20 16:05:38 2000
+++ CJK/files/md5 Thu Jan 20 16:05:51 2000
@@ -1 +1 @@
-MD5 (cjk-current.tar.gz) = 6f5702b22863747737fe76cbc89c3a35
+MD5 (cjk-current.tar.gz) = b2a7cd7189b47b6fd4ce830f255f143c
diff -urN CJK.orig/patches/patch-aa CJK/patches/patch-aa
--- CJK.orig/patches/patch-aa Thu Jan 20 16:05:38 2000
+++ CJK/patches/patch-aa Thu Jan 20 17:05:19 2000
@@ -1,6 +1,6 @@
--- Makefile.orig Thu Jan 1 08:00:00 1970
+++ Makefile Sat Feb 20 08:10:54 1999
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,24 @@
+#
+# Makefile for CJK to apply on Unix systems more smoothly.
+#
@@ -18,6 +18,7 @@
+ $(MAKE) -C utils $@
+
+install-texinput:
++ (rm -fr $(CJK_DIR)); && \
+ (mkdir -p $(CJK_DIR)); && \
+ ($(CP) -R texinput/* $(CJK_DIR)); && \
+ ($(CHOWN) -R $(SHAREOWN).$(SHAREGRP) $(CJK_DIR))
diff -urN CJK.orig/patches/patch-ac CJK/patches/patch-ac
--- CJK.orig/patches/patch-ac Thu Jan 20 16:05:38 2000
+++ CJK/patches/patch-ac Thu Jan 20 17:06:43 2000
@@ -1,6 +1,6 @@
--- utils/Makefile.orig Thu Jan 6 20:50:10 2000
+++ utils/Makefile Thu Jan 6 20:52:17 2000
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,52 @@
+CC = /usr/bin/cc
+CFLAGS = -Wall -O
+
@@ -33,6 +33,7 @@
+hbf2gf_install:
+ $(CHMOD) +x hbf2gf/mkinstalldirs
+ $(MAKE) -C hbf2gf install
++ $(RM) -fr $(TEXMF_DIR)/hbf2gf
+ $(CP) -R hbf2gf/cfg $(TEXMF_DIR)/hbf2gf
+
+install: hbf2gf_install
diff -urN CJK.orig/pkg/PLIST CJK/pkg/PLIST
--- CJK.orig/pkg/PLIST Thu Jan 20 16:05:38 2000
+++ CJK/pkg/PLIST Thu Jan 20 16:22:23 2000
@@ -47,8 +47,8 @@
share/doc/CJK/vertical.doc
share/emacs/site-lisp/CJK/cjkspace.el
share/emacs/site-lisp/CJK/cjktilde.el
-share/emacs/site-lisp/CJK/emacs-20.3/cjk-enc.el
share/emacs/site-lisp/CJK/emacs-20/cjk-enc.el
+share/emacs/site-lisp/CJK/emacs-20.3/cjk-enc.el
share/emacs/site-lisp/CJK/mule-2.3/cjk-enc.el
share/examples/CJK/Big5.tex
share/examples/CJK/Big5vert.tex
@@ -478,7 +478,7 @@
@dirrm share/texmf/fonts/tfm/arphic/argbsung
@dirrm share/texmf/fonts/tfm/arphic
@dirrm share/texmf/fonts/truetype/arphic
-@dirrm share/texmf/fonts/truetype
+@unexec rmdir %D/share/texmf/fonts/truetype 2>/dev/null || true
@dirrm share/texmf/hbf2gf
@dirrm share/texmf/tex/latex/CJK/Bg5
@dirrm share/texmf/tex/latex/CJK/CEF
diff -urN CJK.orig/scripts/post-install CJK/scripts/post-install
--- CJK.orig/scripts/post-install Thu Jan 20 16:05:38 2000
+++ CJK/scripts/post-install Thu Jan 20 16:57:45 2000
@@ -1,7 +1,7 @@
#!/bin/sh
PATH=/bin:/usr/bin:/usr/local/bin
-TEXMFMAIN=${PREFIX}/share/texmf
+TEXMFMAIN=`kpsexpand '$TEXMFMAIN'`
# Some mktexpk incorrectly calls ttf2pk with -p option, delete it.
if [ ! -z "`grep "ttf2pk -p" ${PREFIX}/bin/mktexpk`" ]
@@ -16,6 +16,7 @@
(cd ${PORTSDIR}/print/freetype/work/freetype-1.3/contrib/ttf2pk;
./configure --prefix=${PREFIX} --with-kpathsea-dir=${PREFIX};
make depend all install;
+ rm -fr ${TEXMFMAIN}/ttf2pk ${TEXMFMAIN}/ttf2tfm;
cp -R data ${TEXMFMAIN}/ttf2pk;
cd ${TEXMFMAIN}; ln -s ttf2pk ttf2tfm; )
--
Make it clear and strong.
keith@freebsd.sinica.edu.tw
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001201920.LAA15711>