Date: Sun, 24 Feb 2002 16:50:17 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35271: update port: chinese/zhcon Message-ID: <20020224085017.EC5C53E9BCB@utopia.leeym.com>
next in thread | raw e-mail | index | archive | help
>Number: 35271 >Category: ports >Synopsis: update port: chinese/zhcon >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Feb 24 02:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD utopia.leeym.com 4.5-STABLE FreeBSD 4.5-STABLE #31: Sun Feb 24 05:23:41 CST 2002 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386 >Description: Update zhcon to version 0.2 Add zh_TW.Big5 po messages Remove big5 IME extra-patches and merge it into standard FreeBSD patches Optional big5-phone IME .mb files are available here: ftp://freebsd.ntu.edu.tw/FreeBSD/taiwan/users/leeym/distfiles/ This port still have some minor known bugs. please check news://tw.bbs.comp.386bsd or news://freebsd.taiwan.chinese >How-To-Repeat: >Fix: diff -ruN --exclude CVS /usr/ports/chinese/zhcon/Makefile zhcon/Makefile --- /usr/ports/chinese/zhcon/Makefile Wed Oct 17 05:26:08 2001 +++ zhcon/Makefile Sun Feb 24 16:14:16 2002 @@ -6,58 +6,27 @@ # PORTNAME= zhcon -PORTVERSION= 0.14f -PORTREVISION= 4 +PORTVERSION= 0.2 +PORTEPOCH= 1 CATEGORIES= chinese -MASTER_SITES= http://freebsd.sinica.edu.tw/~statue/ \ - ftp://ftp.gnuchina.org/pub/linux/chinese/inputmethod/console/zhcon/BSDPort/ \ - http://www.cis.nctu.edu.tw/~gis89501/zhcon/ -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} zhb5-ime-2.tgz +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= statue@freebsd.sinica.edu.tw +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext + GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-included-gettext=${LOCALBASE} USE_GMAKE= yes MAN1= zhcon.1 .include <bsd.port.pre.mk> -.if defined(WITH_BIG5) -PLIST_SUB+= BIG5IME="" -.else -PLIST_SUB+= BIG5IME="@comment " -.endif - -.if !defined(WITH_BIG5) -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with Big5 IME support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BIG5=yes\"" - @${ECHO_MSG} -.endif - post-patch: .if ${OSVERSION} > 500012 - @${PERL} -pi -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,' ${WRKSRC}/${PORTNAME}/*.cpp -.endif -.if defined(WITH_BIG5) -.for file in zhcon-0.14-big5-bar.diff.gz zhcon-0.14-big5-dirty-ime.diff.gz - @${GZCAT} ${WRKDIR}/zh-big5-ime/${file} | ${PATCH} ${PATCH_DIST_ARGS:S/p0/p1/} -.endfor -.endif - -post-build: -.if defined(WITH_BIG5) - @cd ${WRKDIR}/zh-big5-ime; ${SETENV} BATCH=yes ./configure; make all -.endif - -post-install: -.if defined(WITH_BIG5) -.for file in big5-*.mb - @${INSTALL_DATA} ${WRKDIR}/zh-big5-ime/mb/${file} ${PREFIX}/lib/zhcon -.endfor - @${INSTALL_DATA} ${WRKDIR}/zh-big5-ime/zhcon.cfg.big5 ${PREFIX}/lib/zhcon/zhcon.cfg + @${PERL} -pi.bak -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,' ${WRKSRC}/src/*.cpp .endif .include <bsd.port.post.mk> diff -ruN --exclude CVS /usr/ports/chinese/zhcon/distinfo zhcon/distinfo --- /usr/ports/chinese/zhcon/distinfo Wed Oct 17 05:26:08 2001 +++ zhcon/distinfo Fri Feb 22 12:30:59 2002 @@ -1,2 +1 @@ -MD5 (zhcon-0.14f.tar.gz) = d7a8c49bc7b7d97cd30385f0110806bc -MD5 (zhb5-ime-2.tgz) = b28e10fc9c07baa0b574bf6253714450 +MD5 (zhcon-0.2.tar.gz) = 67ea99f487c9c2d878238213e5162560 diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/extrapatch-aa zhcon/files/extrapatch-aa --- /usr/ports/chinese/zhcon/files/extrapatch-aa Tue Sep 11 21:30:04 2001 +++ zhcon/files/extrapatch-aa Thu Jan 1 08:00:00 1970 @@ -1,13 +0,0 @@ ---- src/cin2mb.c.orig Tue Sep 11 02:27:51 2001 -+++ src/cin2mb.c Tue Sep 11 09:14:54 2001 -@@ -229,7 +229,10 @@ - buf[0] = buf[1] = buf[2] = buf[3] = '\0'; - if(fwrite(buf, sizeof(char), 4, fout)!=4) { - printf("Fatal write 0000 failed.\n"); -+ goto error_close_fout; - } -+ -+ return(0); - - error_close_fout: - if(fout!=NULL) fclose(fout); diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-aa zhcon/files/patch-aa --- /usr/ports/chinese/zhcon/files/patch-aa Sun Sep 9 00:37:56 2001 +++ zhcon/files/patch-aa Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Sat Sep 8 19:16:35 2001 -+++ configure Sat Sep 8 19:16:51 2001 -@@ -707,7 +707,7 @@ - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. -- for ac_prog in ginstall scoinst install; do -+ for ac_prog in install scoinst ginstall; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-ab zhcon/files/patch-ab --- /usr/ports/chinese/zhcon/files/patch-ab Mon Sep 10 02:07:00 2001 +++ zhcon/files/patch-ab Thu Jan 1 08:00:00 1970 @@ -1,28 +0,0 @@ ---- zhcon/bsdfactory.cpp.orig Sun Sep 9 13:19:32 2001 -+++ zhcon/bsdfactory.cpp Sun Sep 9 13:54:13 2001 -@@ -102,11 +102,24 @@ - } - - printf ("len %d\n", buflen); -+#if (__FreeBSD__ <= 3) - if ((vga = open("/dev/vga", O_RDWR | O_NDELAY)) < 0) { -+#else -+ if ((vga = open("/dev/mem", O_RDWR | O_NDELAY)) < 0) { -+#endif - throw(runtime_error("Can not open vga device.\n")); - } - -- buf = static_cast<char *>(mmap(0, buflen, PROT_READ | PROT_WRITE, MAP_SHARED, vga, 0)); -+ if ((buf = static_cast<char *>(valloc(buflen))) == NULL) { -+ throw(runtime_error("Can not open vga device.\n")); -+ } -+ -+#if (__FreeBSD__ <= 3) -+#define GRAPH_BASE 0x0 -+#else -+#define GRAPH_BASE 0xA0000 -+#endif -+ buf = static_cast<char *>(mmap(buf, buflen, PROT_READ | PROT_WRITE, MAP_FILE|MAP_SHARED|MAP_FIXED, vga, GRAPH_BASE)); - close(vga); - - if (buf == MAP_FAILED) diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-configure zhcon/files/patch-configure --- /usr/ports/chinese/zhcon/files/patch-configure Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-configure Sun Feb 24 14:31:44 2002 @@ -0,0 +1,21 @@ +--- configure.orig Fri Feb 15 21:01:04 2002 ++++ configure Sun Feb 24 14:25:34 2002 +@@ -818,8 +818,9 @@ + CFLAGS=" -O2 -DNDEBUG -funsigned-char -Wall " + CXXFLAGS=" -O2 -DNDEBUG -funsigned-char -Wall " + fi +-LIBS=" -L/usr/lib/unicon" ++LIBS=" -L/usr/lib/unicon -L$ac_default_prefix/lib" + LDFLAGS=" -Wl,-rpath=/usr/lib/unicon" ++CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" + + + +@@ -2780,6 +2781,7 @@ + + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + INTLLIBS="-lintl $LIBICONV" ++ LIBS="-lintl $LIBS" + fi + + gt_save_LIBS="$LIBS" diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-po::Makefile.in.in zhcon/files/patch-po::Makefile.in.in --- /usr/ports/chinese/zhcon/files/patch-po::Makefile.in.in Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-po::Makefile.in.in Sun Feb 24 14:31:44 2002 @@ -0,0 +1,16 @@ +--- po/Makefile.in.in.orig Mon Dec 17 21:02:37 2001 ++++ po/Makefile.in.in Sun Feb 24 14:25:34 2002 +@@ -20,12 +20,9 @@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + +-prefix = #@prefix@ ++prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +- +-#force using /usr/share/locale as destdir of *.po files +-datadir = /usr/share + localedir = $(datadir)/locale + gettextsrcdir = $(datadir)/gettext/po + diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-po::zh_TW.Big5.po zhcon/files/patch-po::zh_TW.Big5.po --- /usr/ports/chinese/zhcon/files/patch-po::zh_TW.Big5.po Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-po::zh_TW.Big5.po Sun Feb 24 16:30:55 2002 @@ -0,0 +1,285 @@ +--- po/zh_TW.Big5.po.orig Tue Feb 19 12:58:16 2002 ++++ po/zh_TW.Big5.po Sun Feb 24 14:25:34 2002 +@@ -6,166 +6,165 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "POT-Creation-Date: 2002-02-16 18:15+0000\n" +-"PO-Revision-Date: 2001-10-26 22:22PRC\n" ++"PO-Revision-Date: 2002-02-24 14:30+0800\n" + "Last-Translator: ejoy <ejoy@users.sourceforge.net>\n" + "Language-Team: \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Type: text/plain; charset=Big5\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: KBabel 0.9.5\n" + + #: src/overspotclient.cpp:67 src/overspotclient.cpp:72 + #: src/overspotclient.cpp:215 + msgid "[" +-msgstr "" ++msgstr "i" + + #: src/overspotclient.cpp:68 + msgid "Full" +-msgstr "��" ++msgstr "" + + #: src/overspotclient.cpp:68 + msgid "Half" +-msgstr "モ�" ++msgstr "b" + + #: src/overspotclient.cpp:69 + msgid "Ch" +-msgstr "〈" ++msgstr "C" + + #: src/overspotclient.cpp:69 + msgid "En" +-msgstr "◇" ++msgstr ".," + + #: src/overspotclient.cpp:70 src/overspotclient.cpp:72 + #: src/overspotclient.cpp:217 + msgid "]" +-msgstr "" ++msgstr "j" + + #: src/configserver.cpp:27 + msgid "input option" +-msgstr "输入法选项" ++msgstr "Jkﶵ" + + #: src/configserver.cpp:28 + msgid "Select Encode" +-msgstr "叫匡拒襟截よΑ:" ++msgstr "sX覡" + + #: src/configserver.cpp:29 + msgid "Encode-Detect Method" +-msgstr "" ++msgstr "sX覡" + + #: src/configserver.cpp:30 + msgid "Quit" +-msgstr "退出菜单" ++msgstr "hX" + + #: src/configserver.cpp:34 src/configserver.cpp:170 +-#, fuzzy + msgid "Current Encode-Detect Method:" +-msgstr "当前内码识别方式:" ++msgstr "ثesX覡:" + + #: src/configserver.cpp:39 src/configserver.cpp:48 src/configserver.cpp:58 + msgid "Back" +-msgstr "" ++msgstr "^Wſ" + + #: src/configserver.cpp:43 + msgid "Input Option:" +-msgstr "输入法选项:" ++msgstr "Jkﶵ:" + + #: src/configserver.cpp:44 src/configserver.cpp:235 + msgid "Auto Select Unique Word" +-msgstr "无重码自动上屏" ++msgstr "Wr۰ʿ" + + #: src/configserver.cpp:46 + msgid "Input Encode" +-msgstr "输入法选项" ++msgstr "JksX" + + #: src/configserver.cpp:52 + msgid "Please Select Encode:" +-msgstr "请选择编码方式:" ++msgstr "пܽsX覡:" + + #: src/configserver.cpp:63 + msgid "System Menu" +-msgstr "系统菜单" ++msgstr "tο" + + #: src/configserver.cpp:123 + msgid "Current Encode:" +-msgstr "当前编码方式:" ++msgstr "ثesX覡:" + + #: src/configserver.cpp:211 + msgid "Current Input Encode(native only)" +-msgstr "当前输入法编码(native only)" ++msgstr "ثeJksX(native only)" + + #: src/zhcon.cpp:85 + msgid "Please visit zhcon.gnuchina.org for more information." +-msgstr "" ++msgstr "аѦzhconzhcon.gnuchina.orgHohTC" + + #: src/zhcon.cpp:86 + msgid "Zhcon supports GB2312,GBK,BIG5,JIS,KSCM encode." +-msgstr "" ++msgstr "zhcon䴩GB2312,GBK,BIG5,JIS,KSCMؽsX覡C" + + #: src/zhcon.cpp:87 + msgid "You can use CTRL-ALT-0 to toggle prompt bar." +-msgstr "" ++msgstr "iHϥCTRL-ALT-0ܱC" + + #: src/zhcon.cpp:88 + msgid "Press CTRL-ALT-H for online help." +-msgstr "" ++msgstr "Ы CTRL-ALT-H ܨDUTC" + + #: src/zhcon.cpp:89 + msgid "Zhcon supports 12,14,16,24 pixel fonts,you can change in zhcon.conf" +-msgstr "" ++msgstr "zhcon䴩12,14,16,24hؤPI}rAziHbzhcon.conf]wrC" + + #: src/zhcon.cpp:90 + msgid "You can use 24 pixel font on 17 monitor to get better visual effect." +-msgstr "" ++msgstr "b17TܾWiHϥ1024X768M24I}ronܮĪGC" + + #: src/zhcon.cpp:91 + msgid "Hit CTRL-D to quit zhcon." +-msgstr "" ++msgstr "iHϥCTRL-DӰhXzhcon." + + #: src/zhcon.cpp:92 + msgid "You can find user manual in doc/." +-msgstr "" ++msgstr "ϥΤUbdoc/ؿUC" + + #: src/zhcon.cpp:93 + msgid "" + "Zhcon can use input methods from Unicon[TurboLinux],read manual for detail." + msgstr "" ++"zhconϥUnicon[TurboLinux]JkAо\\ŪUHoԲӪTC" + + #: src/zhcon.cpp:94 + msgid "Zhcon is optimized for running under Linux FrameBuffer." +-msgstr "" ++msgstr "zhconLinuxFrameBufferXʧ@F̨ΤơAbFrameBufferUiHǫήĪGC" + + #: src/zhcon.cpp:95 + msgid "Press CTRL-F7 to change input style" +-msgstr "" ++msgstr "iHCTRL-F7JC" + + #: src/zhcon.cpp:603 + msgid "screen resolution" +-msgstr "" ++msgstr "ùѪR" + + #: src/zhcon.cpp:606 +-#, fuzzy + msgid "default encode" +-msgstr "请选择编码方式:" ++msgstr "w]sX " + + #: src/inputmanager.cpp:706 + msgid "Press CTRL-ALT-H to exit help" +-msgstr "" ++msgstr "Ы CTRL-ALT-H hXDUf" + + #: src/inputmanager.cpp:707 + msgid "ALT -SPACE Open/Close CJK mode" +-msgstr "" ++msgstr "ALT-SPACE }/CJK覡" + + #: src/inputmanager.cpp:708 + msgid "CTRL-SPACE Open/Close input method" +-msgstr "" ++msgstr "CTRL-SPACE }/Jk" + + #: src/inputmanager.cpp:709 + msgid "SHIFT-PageUp/PageDown/Up/Down Scroll & Display History" +-msgstr "" ++msgstr "SHIFT-PageUp/PageDown/Up/Down svù" + + #: src/inputmanager.cpp:711 + msgid "CTRL key:" +-msgstr "" ++msgstr "CTRL \\:" + + #: src/inputmanager.cpp:712 + msgid "F1 GB2312" +@@ -189,61 +188,60 @@ + + #: src/inputmanager.cpp:717 + msgid "F9 Switch & Auto Detect" +-msgstr "" ++msgstr "F9 ۰ʰ覡" + + #: src/inputmanager.cpp:718 +-#, fuzzy + msgid "F10 Sys Menu" +-msgstr "系统菜单" ++msgstr "F10 " + + #: src/inputmanager.cpp:719 + msgid "F7 Input Style" +-msgstr "" ++msgstr "F7 J" + + #: src/inputmanager.cpp:720 + msgid "D Exit zhcon" +-msgstr "" ++msgstr "D hXzhcon" + + #: src/inputmanager.cpp:722 + msgid "Chinese/English Mode:" +-msgstr "" ++msgstr "^Ҧ:" + + #: src/inputmanager.cpp:723 + msgid "CTRL-, Full/Half Char" +-msgstr "" ++msgstr "Ctrl-, /b" + + #: src/inputmanager.cpp:724 + msgid "CTRL-. Full/Half Comma" +-msgstr "" ++msgstr "Ctrl-. I" + + #: src/inputmanager.cpp:726 + msgid "CTRL-ALT-NUM:" +-msgstr "" ++msgstr "CTRL-ALT-Ʀr:" + + #: src/inputmanager.cpp:727 + msgid "0 Prompt Mode" +-msgstr "" ++msgstr "0 iJܪA" + + #: src/inputmanager.cpp:728 + msgid "1..9 Select IME 1..9" +-msgstr "" ++msgstr "1..9 ܿJk1..9" + + #: src/inputmanager.cpp:730 + msgid "Special Input Key:" +-msgstr "" ++msgstr "J\\:" + + #: src/inputmanager.cpp:731 + msgid "CTRL-SHIFT Next IME" +-msgstr "" ++msgstr "CTRL-SHIFT U@ӿJk" + + #: src/inputmanager.cpp:732 + msgid "SPACE Select Number 0" +-msgstr "" ++msgstr "SPACE ثe~r" + + #: src/inputmanager.cpp:733 + msgid "+/- Next/Prev page" +-msgstr "" ++msgstr "+/- Կre½" + + #: src/inputmanager.cpp:734 + msgid "ESC Reset Input Area" +-msgstr "" ++msgstr "ESC MſJ" diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-src::Makefile.am zhcon/files/patch-src::Makefile.am --- /usr/ports/chinese/zhcon/files/patch-src::Makefile.am Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-src::Makefile.am Sun Feb 24 14:31:44 2002 @@ -0,0 +1,15 @@ +--- src/Makefile.am.orig Tue Dec 18 20:39:48 2001 ++++ src/Makefile.am Sun Feb 24 14:25:34 2002 +@@ -9,10 +9,10 @@ + + install-data-local: + $(mkinstalldirs) $(libdir)/zhcon/ +- $(INSTALL_DATA) $(srcdir)/zhcon.conf /etc/zhcon.conf ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf.sample + + uninstall-local: +- -rm -f /etc/zhcon.conf ++ -rm -f $(PREFIX)/etc/zhcon.conf.sample + + bin_PROGRAMS = zhcon + AM_INSTALL_PROGRAM_FLAGS= -m 4775 diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-src::Makefile.in zhcon/files/patch-src::Makefile.in --- /usr/ports/chinese/zhcon/files/patch-src::Makefile.in Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-src::Makefile.in Sun Feb 24 14:31:44 2002 @@ -0,0 +1,15 @@ +--- src/Makefile.in.orig Sun Feb 17 02:15:15 2002 ++++ src/Makefile.in Sun Feb 24 14:25:35 2002 +@@ -441,10 +441,10 @@ + + install-data-local: + $(mkinstalldirs) $(libdir)/zhcon/ +- $(INSTALL_DATA) $(srcdir)/zhcon.conf /etc/zhcon.conf ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf.sample + + uninstall-local: +- -rm -f /etc/zhcon.conf ++ -rm -f $(PREFIX)/etc/zhcon.conf.sample + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-src::display::fbdev.cpp zhcon/files/patch-src::display::fbdev.cpp --- /usr/ports/chinese/zhcon/files/patch-src::display::fbdev.cpp Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-src::display::fbdev.cpp Sun Feb 24 14:31:44 2002 @@ -0,0 +1,29 @@ +--- src/display/fbdev.cpp.orig Fri Feb 15 20:15:58 2002 ++++ src/display/fbdev.cpp Sun Feb 24 14:25:35 2002 +@@ -202,7 +202,11 @@ + } + + // printf ("len %d\n", mpBufLen); ++#if (__FreeBSD__ <= 3) + if ((mFd = open("/dev/vga", O_RDWR | O_NDELAY)) < 0) { ++#else ++ if ((mFd = open("/dev/mem", O_RDWR | O_NDELAY)) < 0) { ++#endif + throw(runtime_error("Can not open vga device.\n")); + } + +@@ -229,8 +233,13 @@ + throw(runtime_error("color depth unsupported in this version\n" + "use 8bpp instead!")); + } ++#if (__FreeBSD__ <= 3) ++#define GRAPH_BASE 0x0 ++#else ++#define GRAPH_BASE 0xA0000 ++#endif + mpBuf = static_cast<char *>(mmap(0, mpBufLen, PROT_READ | PROT_WRITE, +- MAP_SHARED, mFd, 0)); ++ MAP_FILE|MAP_SHARED|MAP_FIXED, mFd, GRAPH_BASE)); + + if (mpBuf == MAP_FAILED) + throw(runtime_error("mmap() failed!")); diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-src::nativeinputserver.cpp zhcon/files/patch-src::nativeinputserver.cpp --- /usr/ports/chinese/zhcon/files/patch-src::nativeinputserver.cpp Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-src::nativeinputserver.cpp Sun Feb 24 14:31:44 2002 @@ -0,0 +1,45 @@ +--- src/nativeinputserver.cpp.orig Sun Feb 10 01:18:58 2002 ++++ src/nativeinputserver.cpp Sun Feb 24 14:25:35 2002 +@@ -151,10 +151,31 @@ + } + else { + mInput.erase(mInput.end() - 1); +- Beep(); ++ //Beep(); ++ switch(c) ++ { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ case '4': ++ case '5': ++ case '6': ++ case '7': ++ case '8': ++ case '9': ++ case '+': ++ case '=': ++ case '-': ++ case '_': ++ goto Select; ++ default: ++ Beep(); ++ } + } + } + } else { ++Select: + if (mList.mCount > 0) { + switch (c) { + case 033: +@@ -210,6 +231,9 @@ + if (c < mShownWords) { + s = Select(c); + rBuf = s; ++ mpIme->Reset(); ++ mInput = ""; ++ mList.Reset(); + } else + Beep(); + break; diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-src::zhcon.cpp zhcon/files/patch-src::zhcon.cpp --- /usr/ports/chinese/zhcon/files/patch-src::zhcon.cpp Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-src::zhcon.cpp Sun Feb 24 14:31:44 2002 @@ -0,0 +1,48 @@ +--- src/zhcon.cpp.orig Sun Feb 17 02:12:17 2002 ++++ src/zhcon.cpp Sun Feb 24 14:31:41 2002 +@@ -113,7 +113,7 @@ + string cfgfile = getenv("HOME"); + cfgfile += "/.zhconrc"; + if (access(cfgfile.c_str(), R_OK) != 0) +- cfgfile = "/etc/zhcon.conf"; ++ cfgfile = PREFIX"/etc/zhcon.conf"; + + // char c;cin>>c; + ConfigFile f(cfgfile.c_str()); +@@ -129,6 +129,7 @@ + InstallVtHandle(); + InstallSignal(); + ForkPty(); ++ SetEncode(mDefaultEncode, mDefaultEncode); + InitInputManager(f); + if (f.GetOption("startupmsg",true)) + StartupMsg(); +@@ -489,23 +490,23 @@ + string s; + s = f.GetOption(string("defaultencode"), string("gb2312")); + if (s == "gb2312") { +- SetEncode(GB2312,GB2312); ++ //SetEncode(GB2312,GB2312); + setenv("LC_ALL", "zh_CN.GB2312", 1); + mDefaultEncode = GB2312; + } else if (s == "gbk") { +- SetEncode(GBK,GBK); ++ //SetEncode(GBK,GBK); + setenv("LC_ALL", "zh_CN.GBK", 1); + mDefaultEncode = GBK; + } else if (s == "big5") { +- SetEncode(BIG5,BIG5); ++ //SetEncode(BIG5,BIG5); + setenv("LC_ALL", "zh_TW.Big5", 1); + mDefaultEncode = BIG5; + } else if (s == "jis") { +- SetEncode(JIS,JIS); ++ //SetEncode(JIS,JIS); + setenv("LC_ALL", "ja.JIS", 1); + mDefaultEncode = JIS; + } else if (s == "kscm") { +- SetEncode(KSCM,KSCM); ++ //SetEncode(KSCM,KSCM); + setenv("LC_ALL", "ko", 1); + mDefaultEncode = GBK; + } else { diff -ruN --exclude CVS /usr/ports/chinese/zhcon/pkg-plist zhcon/pkg-plist --- /usr/ports/chinese/zhcon/pkg-plist Wed Oct 17 05:26:08 2001 +++ zhcon/pkg-plist Sun Feb 24 12:55:12 2002 @@ -1,30 +1,52 @@ bin/zhcon -lib/zhcon/asc16 -lib/zhcon/big516 -%%BIG5IME%%lib/zhcon/big5-ary30.mb -%%BIG5IME%%lib/zhcon/big5-cj.mb -%%BIG5IME%%lib/zhcon/big5-liu5.mb -%%BIG5IME%%lib/zhcon/big5-phone-et.mb -%%BIG5IME%%lib/zhcon/big5-phone-gy.mb -%%BIG5IME%%lib/zhcon/big5-phone-ibm.mb -%%BIG5IME%%lib/zhcon/big5-phone.mb -lib/zhcon/cjf.mb -lib/zhcon/cjj.mb -lib/zhcon/dzm.mb -lib/zhcon/ed.mb -lib/zhcon/gb16 -lib/zhcon/gbk16 -lib/zhcon/jis16 -lib/zhcon/jp.mb -lib/zhcon/kscm16 -lib/zhcon/pt.mb -lib/zhcon/py.mb -lib/zhcon/sp.mb -lib/zhcon/wb.mb -lib/zhcon/wbew.mb -lib/zhcon/wbh.mb -lib/zhcon/winpy.mb -lib/zhcon/winsp.mb -lib/zhcon/winzm.mb -lib/zhcon/zhcon.cfg -@dirrm lib/zhcon/ +etc/zhcon.conf.sample +lib/zhcon/font/asc12.bpsf +lib/zhcon/font/asc12x.bpsf +lib/zhcon/font/asc14.bpsf +lib/zhcon/font/asc14b.bpsf +lib/zhcon/font/asc16.bpsf +lib/zhcon/font/asc24.bpsf +lib/zhcon/font/big5-12-ming.bpsf +lib/zhcon/font/big5-16-ming.bpsf +lib/zhcon/font/big5-16.bpsf +lib/zhcon/font/gb-16.bpsf +lib/zhcon/font/gb-24-kai.bpsf +lib/zhcon/font/gbk-16.bpsf +lib/zhcon/font/hzk12.bpsf +lib/zhcon/font/hzk14.bpsf +lib/zhcon/font/hzk16.bpsf +lib/zhcon/font/jis-16.bpsf +lib/zhcon/font/kscm-16.bpsf +lib/zhcon/input/big5-ary30.mb +lib/zhcon/input/big5-cj.mb +lib/zhcon/input/big5-liu5.mb +lib/zhcon/input/big5-phone.mb +lib/zhcon/input/cjf.mb +lib/zhcon/input/cjj.mb +lib/zhcon/input/dzm.mb +lib/zhcon/input/ed.mb +lib/zhcon/input/jp.mb +lib/zhcon/input/pt.mb +lib/zhcon/input/py.mb +lib/zhcon/input/sp.mb +lib/zhcon/input/wb.mb +lib/zhcon/input/wbew.mb +lib/zhcon/input/wbh.mb +lib/zhcon/input/winpy.mb +lib/zhcon/input/winsp.mb +lib/zhcon/input/winzm.mb +share/locale/ja/LC_MESSAGES/zhcon.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo +share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo +share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo +@dirrm share/locale/zh_TW.Big5/LC_MESSAGES +@dirrm share/locale/zh_TW.Big5 +@dirrm share/locale/zh_CN.GBK/LC_MESSAGES +@dirrm share/locale/zh_CN.GBK +@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES +@dirrm share/locale/zh_CN.GB2312 +@dirrm share/locale/kr/LC_MESSAGES +@dirrm share/locale/kr +@dirrm lib/zhcon/input +@dirrm lib/zhcon/font +@dirrm lib/zhcon >Release-Note: >Audit-Trail: >Unformatted: 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?20020224085017.EC5C53E9BCB>