From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 25 18:10:18 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A109016A41F for ; Mon, 25 Jul 2005 18:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 901F643D46 for ; Mon, 25 Jul 2005 18:10:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6PIAHMa024757 for ; Mon, 25 Jul 2005 18:10:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6PIAHb3024753; Mon, 25 Jul 2005 18:10:17 GMT (envelope-from gnats) Resent-Date: Mon, 25 Jul 2005 18:10:17 GMT Resent-Message-Id: <200507251810.j6PIAHb3024753@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10D7916A41F for ; Mon, 25 Jul 2005 18:09:52 +0000 (GMT) (envelope-from rafan@woodstock.rafan.org) Received: from muse.csie.ntu.edu.tw (muse.csie.ntu.edu.tw [140.112.28.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18F8643D48 for ; Mon, 25 Jul 2005 18:09:44 +0000 (GMT) (envelope-from rafan@woodstock.rafan.org) Received: from localhost (localhost [127.0.0.1]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id 3EBB7525BD; Tue, 26 Jul 2005 02:09:39 +0800 (CST) Received: from muse.csie.ntu.edu.tw ([127.0.0.1]) by localhost (muse.csie.ntu.edu.tw [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08906-48; Tue, 26 Jul 2005 02:09:37 +0800 (CST) Received: from woodstock.rafan.org (220-135-116-9.HINET-IP.hinet.net [220.135.116.9]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id 4FB875259F; Tue, 26 Jul 2005 02:09:37 +0800 (CST) Received: (from rafan@localhost) by woodstock.rafan.org (8.13.4/8.13.4/Submit) id j6PI9Wfa028079; Tue, 26 Jul 2005 02:09:32 +0800 (CST) (envelope-from rafan) Message-Id: <200507251809.j6PI9Wfa028079@woodstock.rafan.org> Date: Tue, 26 Jul 2005 02:09:32 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: statue@freebsd.netlab.cse.yzu.edu.tw Subject: ports/84087: [PATCH] chinese/CJK: unbreak X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2005 18:10:18 -0000 >Number: 84087 >Category: ports >Synopsis: [PATCH] chinese/CJK: unbreak >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 25 18:10:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 7.0-CURRENT i386 >Organization: NTU CSIE >Environment: System: FreeBSD woodstock.rafan.org 7.0-CURRENT FreeBSD 7.0-CURRENT #16: Mon Jul 25 00:03:17 CST 2005 >Description: - make it work with teTeX 3.0 - since it needs ttf2pk from print/freetype, a patch is included to make it buildable (see bottom) - this would close pr/79353 Port maintainer (statue@freebsd.netlab.cse.yzu.edu.tw) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- CJK-4.5.2_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/chinese/CJK/Makefile /home/rafan/tmp/ports/CJK/Makefile --- /usr/ports/chinese/CJK/Makefile Tue Jul 26 01:16:01 2005 +++ /home/rafan/tmp/ports/CJK/Makefile Tue Jul 26 01:16:41 2005 @@ -7,7 +7,7 @@ PORTNAME= CJK PORTVERSION= 4.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/statue/cjk/\ ftp://ftp.ffii.org/pub/cjk/ @@ -16,10 +16,6 @@ MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw COMMENT= A LaTeX2e macro package which enables the use of CJK scripts -BROKEN= "Installation and dependency problems" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2005-09-22 - BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \ ${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \ ttf2pk:${PORTSDIR}/print/freetype:build @@ -48,10 +44,10 @@ ${RM} -fr ${PREFIX}/share/examples/CJK ${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK @${MKDIR} ${ARPHICDIR} # Install Arphic fonts - @${LN} -s ${PREFIX}/share/fonts/TrueType/bkai00mp.ttf ${ARPHICDIR}/arb5_kai.ttf - @${LN} -s ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf ${ARPHICDIR}/arb5_sung.ttf - @${LN} -s ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf ${ARPHICDIR}/argb_sung.ttf - @${LN} -s ${PREFIX}/share/fonts/TrueType/gkai00mp.ttf ${ARPHICDIR}/argb_kai.ttf - @${LN} -s ttf2pk ${PREFIX}/share/texmf/ttf2tfm + @${LN} -fs ${PREFIX}/share/fonts/TrueType/bkai00mp.ttf ${ARPHICDIR}/arb5_kai.ttf + @${LN} -fs ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf ${ARPHICDIR}/arb5_sung.ttf + @${LN} -fs ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf ${ARPHICDIR}/argb_sung.ttf + @${LN} -fs ${PREFIX}/share/fonts/TrueType/gkai00mp.ttf ${ARPHICDIR}/argb_kai.ttf + @${LN} -fs ttf2pk ${PREFIX}/share/texmf/ttf2tfm .include diff -ruN --exclude=CVS /usr/ports/chinese/CJK/pkg-deinstall /home/rafan/tmp/ports/CJK/pkg-deinstall --- /usr/ports/chinese/CJK/pkg-deinstall Tue Jul 26 01:16:01 2005 +++ /home/rafan/tmp/ports/CJK/pkg-deinstall Tue Jul 26 01:59:26 2005 @@ -7,7 +7,7 @@ TEXMFMAIN=`kpsexpand '$TEXMFMAIN'` TEXMFCNF=${TEXMFMAIN}/web2c/texmf.cnf -SPECIALMAP=${TEXMFMAIN}/fontname/special.map +SPECIALMAP=${TEXMFMAIN}-dist/fonts/map/fontname/special.map # Edit web2c/texmf.cnf sed -e "/ttf2pk/d" ${TEXMFCNF} > ${TEXMFCNF}.tmp diff -ruN --exclude=CVS /usr/ports/chinese/CJK/scripts/post-install /home/rafan/tmp/ports/CJK/scripts/post-install --- /usr/ports/chinese/CJK/scripts/post-install Tue Jul 26 01:16:01 2005 +++ /home/rafan/tmp/ports/CJK/scripts/post-install Tue Jul 26 01:25:07 2005 @@ -20,34 +20,36 @@ cp -R data ${TEXMFMAIN}/ttf2pk; cd ${TEXMFMAIN}; ) +SPMAP="${TEXMFMAIN}-dist/fonts/map/fontname/special.map" + # fontname/special.map: add arb5kai/arb5sung/argbkai/argbsung entries. -if [ -n "`grep arb5kai ${TEXMFMAIN}/fontname/special.map`" ] +if [ -n "`grep arb5kai ${SPMAP}`" ] then echo Seems arb5kai already in special.map, file untouched. else - echo "@c Arphic BIG5 Kaiti TTF" >> ${TEXMFMAIN}/fontname/special.map - echo "arb5kai big5 arb5kai" >> ${TEXMFMAIN}/fontname/special.map + echo "@c Arphic BIG5 Kaiti TTF" >> ${SPMAP} + echo "arb5kai big5 arb5kai" >> ${SPMAP} fi -if [ -n "`grep arb5sung ${TEXMFMAIN}/fontname/special.map`" ] +if [ -n "`grep arb5sung ${SPMAP}`" ] then echo Seems arb5sung already in special.map, file untouched. else - echo "@c Arphic BIG5 Mingti TTF" >> ${TEXMFMAIN}/fontname/special.map - echo "arb5sung big5 arb5sung" >> ${TEXMFMAIN}/fontname/special.map + echo "@c Arphic BIG5 Mingti TTF" >> ${SPMAP} + echo "arb5sung big5 arb5sung" >> ${SPMAP} fi -if [ -n "`grep argbkai ${TEXMFMAIN}/fontname/special.map`" ] +if [ -n "`grep argbkai ${SPMAP}`" ] then echo Seems argbkai already in special.map, file untouched. else - echo "@c Arphic GB Kaiti TTF" >> ${TEXMFMAIN}/fontname/special.map - echo "argbkai gb argbkai" >> ${TEXMFMAIN}/fontname/special.map + echo "@c Arphic GB Kaiti TTF" >> ${SPMAP} + echo "argbkai gb argbkai" >> ${SPMAP} fi -if [ -n "`grep argbsung ${TEXMFMAIN}/fontname/special.map`" ] +if [ -n "`grep argbsung ${SPMAP}`" ] then echo Seems argbsung already in special.map, file untouched. else - echo "@c Arphic GB Sungti TTF" >> ${TEXMFMAIN}/fontname/special.map - echo "argbsung gb argbsung" >> ${TEXMFMAIN}/fontname/special.map + echo "@c Arphic GB Sungti TTF" >> ${SPMAP} + echo "argbsung gb argbsung" >> ${SPMAP} fi # ttf2pk/ttfonts.map: add arb5kai/arb5sung/argbkai/argbsung entries. --- CJK-4.5.2_2.patch ends here --- ===> Generating patch ===> Viewing diff with less diff -ruN --exclude=CVS /usr/ports/print/freetype/files/patch-contrib::ttf2pk::Makefile.in /home/rafan/tmp/ports/freetype/files/patch-contrib::ttf2pk::Makefile.in --- /usr/ports/print/freetype/files/patch-contrib::ttf2pk::Makefile.in Thu Jan 1 08:00:00 1970 +++ /home/rafan/tmp/ports/freetype/files/patch-contrib::ttf2pk::Makefile.in Tue Jul 26 01:53:53 2005 @@ -0,0 +1,16 @@ +--- contrib/ttf2pk/Makefile.in.orig Tue Jul 26 01:52:45 2005 ++++ contrib/ttf2pk/Makefile.in Thu Sep 3 13:12:57 1998 +@@ -61,11 +61,11 @@ + default all: $(PROGRAMS) + + ttf2pk: $(ttf2pkobjs) $(LIBDIR)/libttf.la +- $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o ttf2pk $(ttf2pkobjs) \ ++ $(LIBTOOL) --tag=C --mode=link $(CC) $(FT_CFLAGS) -o ttf2pk $(ttf2pkobjs) \ + $(LIBDIR)/libttf.la $(LDFLAGS) + + ttf2tfm: $(ttf2tfmobjs) $(LIBDIR)/libttf.la +- $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o ttf2tfm $(ttf2tfmobjs) \ ++ $(LIBTOOL) --tag=C --mode=link $(CC) $(FT_CFLAGS) -o ttf2tfm $(ttf2tfmobjs) \ + $(LIBDIR)/libttf.la $(LDFLAGS) + + install: $(PROGRAMS) ===> Done >Release-Note: >Audit-Trail: >Unformatted: