Date: Sun, 1 May 2005 02:03:37 +0800 (CST) From: statue <statue@webbbs.yzu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80482: Update port: chinese/kon2 Message-ID: <200504301803.j3UI3b4w013195@webbbs.yzu.edu.tw> Resent-Message-ID: <200504301810.j3UIA2WD052687@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80482
>Category: ports
>Synopsis: Update port: chinese/kon2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 30 18:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: statue
>Release: FreeBSD 4.9-PRERELEASE i386
>Organization:
[MAINTAINER]
>Environment:
System: FreeBSD windtop.yzu.edu.tw 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #0: Wed Sep 24 14:53:36 CST 2003 visor@windtop.yzu.edu.tw:/usr/src/sys/compile/web i386
>Description:
add gb2312 font support.
>How-To-Repeat:
>Fix:
diff -ruN kon2.orig/Makefile kon2/Makefile
--- kon2.orig/Makefile Sat Apr 30 22:32:10 2005
+++ kon2/Makefile Sun May 1 01:55:37 2005
@@ -8,32 +8,27 @@
PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../../japanese/kon2-16dot
-EXTRA_PATCHES= ${.CURDIR}/files/patch-lib::coding.c
CATEGORIES= chinese
MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/chinese/kcfonts:patch
+BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/chinese/kcfonts:patch \
+ ${NONEXISTENT}:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps:extract
USE_REINPLACE= yes
KCFONTS_WRKSRC= `cd ${PORTSDIR}/chinese/kcfonts; make -V WRKSRC`
+GB16ST_WRKSRC= `cd ${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps; make -V WRKSRC`
-PLIST_FILES= share/fonts/bdf/kc15f.bdf.gz
+PLIST_FILES= share/fonts/bdf/kc15f.bdf.gz \
+ share/fonts/bdf/gb16st.bdf.gz \
+ share/fonts/bdf/8x16.bdf.gz
post-patch: post-patch-zhkon2
post-patch-zhkon2:
- @${REINPLACE_CMD} -e "s;jiskan16.bdf.gz;kc15f.bdf.gz;g" \
- -e "s;ja_JP.ujis:Coding;ja_JP.ujis:;g" \
- -e "s;zh_TW.big5:;zh_TW.big5:Coding;g" \
- -e "s;BIG5.HKU-0;BIG5-0;g" \
- -e "s,GB2312.1980,GBK,g" \
- ${WRKSRC}/kon.cfg.FreeBSD
- @${REINPLACE_CMD} -e "s;BIG5.HKU-0;BIG5-0;g" \
- -e "s;BIG5, 0;BIG5, 0xfefe;g" \
- -e "s,GB2312.1980,GBK,g" \
- ${WRKSRC}/lib/coding.c
@${REINPLACE_CMD} -e 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/term.c \
${WRKSRC}/src/display/vga.c
+ @cd ${WRKSRC} && ${PATCH} < ${.CURDIR}/files/patch-lib::coding.c
+ @cd ${WRKSRC} && ${PATCH} < ${.CURDIR}/files/patch-kon.cfg.FreeBSD
post-build: post-build-zhkon2
post-build-zhkon2:
@@ -43,5 +38,7 @@
post-install-zhkon2:
@${MKDIR} ${PREFIX}/share/fonts/bdf
cd ${KCFONTS_WRKSRC} && ./kc15f | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/kc15f.bdf.gz
+ cd ${GB16ST_WRKSRC} && cat fonts/bdf/misc/gb16st.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/gb16st.bdf.gz
+ cd ${GB16ST_WRKSRC} && cat fonts/bdf/misc/8x16.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/8x16.bdf.gz
.include "${MASTERDIR}/Makefile"
diff -ruN kon2.orig/files/patch-kon.cfg.FreeBSD kon2/files/patch-kon.cfg.FreeBSD
--- kon2.orig/files/patch-kon.cfg.FreeBSD Thu Jan 1 08:00:00 1970
+++ kon2/files/patch-kon.cfg.FreeBSD Sun May 1 01:40:51 2005
@@ -0,0 +1,34 @@
+--- kon.cfg.FreeBSD.orig Sun May 1 01:39:21 2005
++++ kon.cfg.FreeBSD Sun May 1 01:40:35 2005
+@@ -115,8 +115,10 @@
+
+ # Startup command definition (usually font loading commands are specified)
+ bdf-zcat16:@@KON16FONT@@
++ gzip -cd @@PREFIX@@/share/fonts/bdf/8x16.bdf.gz | /usr/local/bin/fld -t bdf -n
+ gzip -cd @@PREFIX@@/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n
+- gzip -cd @@PREFIX@@/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n
++ gzip -cd @@PREFIX@@/share/fonts/bdf/kc15f.bdf.gz | /usr/local/bin/fld -t bdf -n
++ gzip -cd @@PREFIX@@/share/fonts/bdf/gb16st.bdf.gz | /usr/local/bin/fld -t bdf -n
+ bdf-zcat14:@@KON14FONT@@
+ gzip -cd @@PREFIX@@/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n
+ gzip -cd @@PREFIX@@/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n
+@@ -199,16 +201,16 @@
+ # BIG5.HKU-0, GB2312.1980-1, JISX0208.1983-0, KSC5601.1987-0
+ # EUC, SJIS
+
+-ja_JP.ujis:Coding
++ja_JP.ujis:
+ JISX0201.1976-0 JISX0208.1983-0 EUC
+
+ ja_JP.sjis:
+ JISX0201.1976-0 JISX0208.1983-0 SJIS
+
+-zh_TW.big5:
++zh_TW.Big5:Coding
+ ISO8859-1 BIG5.HKU-0
+
+-zh_CN.ugb:
++zh_CN.GB2312:
+ ISO8859-1 GB2312.1980-0
+
+ ko_KR.euc:
diff -ruN kon2.orig/files/patch-lib::coding.c kon2/files/patch-lib::coding.c
--- kon2.orig/files/patch-lib::coding.c Sat Apr 30 22:32:10 2005
+++ kon2/files/patch-lib::coding.c Sun May 1 01:53:59 2005
@@ -1,20 +1,24 @@
---- lib/coding.c.orig Sat May 3 01:39:46 2003
-+++ lib/coding.c Sat May 3 01:41:08 2003
-@@ -43,10 +43,10 @@
+--- lib/coding.c.orig Fri Jan 24 15:08:40 1997
++++ lib/coding.c Sun May 1 01:53:52 2005
+@@ -120,7 +120,7 @@
- static u_int GB2312(u_char ch1, u_char ch2)
- {
-- if (ch1 > 0x29)
-- return(((ch1 - 0x27) * 94 + ch2 - 0x21) << 5);
-+ if (ch1 < 0x80)
-+ return(((ch1 - 0x81) * 191 + ch2 - 0x40) << 5);
- else
-- return(((ch1 - 0x21) * 94 + ch2 - 0x21) << 5);
-+ return(((ch1 - 0x81) * 191 + 63 + ch2 - 0x80) << 5);
- }
-
- static u_int BIG5(u_char ch1, u_char ch2)
-@@ -135,7 +135,7 @@
+ struct fontRegs fDRegs[] = {
+ /* DF_GB2312 */
+- { GB2312, 0, "GB2312.1980-0", NULL, 0, 0, 'A', 0, 0},
++ { FldGB2312, 0, "GB2312.1980-0", NULL, 0, 0, 'A', 0, 0},
+ /* DF_JISX0208 */
+ {JISX0208, 0,"JISX0208.1983-0", NULL, 0, 0, 'B', 0, 0},
+ /* DF_KSC5601 */
+@@ -128,19 +128,19 @@
+ /* DF_JISX0212 */
+ {JISX0208, 0, "JISX0212", NULL, 0, 0, 'D', 0, 0},
+ /* DF_BIG5_0 */
+- { BIG5, 0, "BIG5.HKU-0", NULL, 0, 0, '0', 0, 0},
++ { BIG5, 0, "BIG5-0", NULL, 0, 0, '0', 0, 0},
+ /* DF_BIG5_1 */
+- { BIG5, 0, "BIG5.HKU-0", NULL, 0, 0, '1', 0, 0},
++ { BIG5, 0, "BIG5-0", NULL, 0, 0, '1', 0, 0},
+ { NULL, 0, NULL, NULL, 0, 0, 0, 0, 0}
};
struct fontLoaderRegs fldDRegs[] = {
@@ -23,3 +27,10 @@
{FldJISX0208, 0x7424},
{ FldKSC5601, 0x7D7E},
{FldJISX0208, 0x7424},
+- { BIG5, 0},
+- { BIG5, 0},
++ { BIG5, 0xfefe},
++ { BIG5, 0xfefe},
+ { NULL, 0}
+ };
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504301803.j3UI3b4w013195>