Date: Wed, 27 Nov 2002 20:38:55 +0800 (CST) From: Statue <statue@freebsd.sinica.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45797: Update port: chinese/zhcon Message-ID: <20021127123855.5FECB28F@freebsd.sinica.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 45797 >Category: ports >Synopsis: Update port: chinese/zhcon >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 27 04:40:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Statue >Release: FreeBSD 4.7-PRERELEASE i386 >Organization: [MAINTAINER] >Environment: System: FreeBSD freebsd.sinica.edu.tw 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #2: Mon Sep 9 10:45:46 CST 2002 ycheng@freebsd.sinica.edu.tw:/usr/src/sys/compile/GENERIC i386 >Description: - update from 0.2.0 to 0.2.1 for some bugs fix - delete pr ports/45708 Update port: chinese/zhcon >How-To-Repeat: >Fix: diff -ruN zhcon.orig/Makefile zhcon/Makefile --- zhcon.orig/Makefile Mon Nov 25 22:21:14 2002 +++ zhcon/Makefile Wed Nov 27 20:02:39 2002 @@ -6,8 +6,7 @@ # PORTNAME= zhcon -PORTVERSION= 0.2 -PORTREVISION= 4 +PORTVERSION= 0.2.1 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,6 +19,7 @@ CONFIGURE_ARGS= --with-included-gettext=${LOCALBASE} USE_GMAKE= yes USE_REINPLACE= yes +REINPLACE_ARGS= # empty MAN1= zhcon.1 @@ -27,7 +27,11 @@ post-patch: .if ${OSVERSION} > 500012 - @${FIND} ${WRKSRC}/src/ -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,' +.for i in src/main.cpp src/zhcon.cpp src/inputmanager.cpp src/display/fbdev.cpp src/mouse.h + ${REINPLACE_CMD} 's,machine/console.h>,sys/consio.h>@#include <sys/fbio.h>@#include <sys/kbio.h>,' ${WRKSRC}/${i} | tr '@' '\n' > ${WRKSRC}/${i}.bak && \ + ${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} +.endfor + ${REINPLACE_CMD} -i.bak -e 's,machine/mouse.h>,sys/mouse.h>,' ${WRKSRC}/src/mouse.h .endif .include <bsd.port.post.mk> diff -ruN zhcon.orig/distinfo zhcon/distinfo --- zhcon.orig/distinfo Mon Nov 25 22:21:14 2002 +++ zhcon/distinfo Mon Nov 25 22:20:32 2002 @@ -1 +1 @@ -MD5 (zhcon-0.2.tar.gz) = 67ea99f487c9c2d878238213e5162560 +MD5 (zhcon-0.2.1.tar.gz) = 3171b538b8bb5c5eb70a8229e52bd28d diff -ruN zhcon.orig/files/patch-configure zhcon/files/patch-configure --- zhcon.orig/files/patch-configure Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-configure Wed Nov 27 20:03:41 2002 @@ -1,21 +1,11 @@ ---- 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 " +--- configure.orig Mon Jun 10 10:29:34 2002 ++++ configure Wed Nov 27 20:03:03 2002 +@@ -1671,7 +1671,7 @@ 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" +-ZHCON_LOCALE_DIR="/usr/share/locale" ++ZHCON_LOCALE_DIR="/usr/local/share/locale" -@@ -2780,6 +2781,7 @@ - - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - INTLLIBS="-lintl $LIBICONV" -+ LIBS="-lintl $LIBS" - fi - - gt_save_LIBS="$LIBS" + if test "$ZHCON_ARCH" = "freebsd";then + echo $ac_n "checking for main in -lintl""... $ac_c" 1>&6 diff -ruN zhcon.orig/files/patch-intl::dcigettext.c zhcon/files/patch-intl::dcigettext.c --- zhcon.orig/files/patch-intl::dcigettext.c Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-intl::dcigettext.c Tue Nov 26 00:20:00 2002 @@ -0,0 +1,15 @@ +--- intl/dcigettext.c.orig Mon Nov 25 23:59:34 2002 ++++ intl/dcigettext.c Tue Nov 26 00:19:20 2002 +@@ -57,10 +57,12 @@ + #include <stdlib.h> + + #include <string.h> ++#if 0 + #if !HAVE_STRCHR && !defined _LIBC + # ifndef strchr + # define strchr index + # endif ++#endif + #endif + + #if defined HAVE_UNISTD_H || defined _LIBC diff -ruN zhcon.orig/files/patch-po::Makefile.in.in zhcon/files/patch-po::Makefile.in.in --- zhcon.orig/files/patch-po::Makefile.in.in Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-po::Makefile.in.in Thu Jan 1 08:00:00 1970 @@ -1,16 +0,0 @@ ---- 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 zhcon.orig/files/patch-po::zh_TW.Big5.po zhcon/files/patch-po::zh_TW.Big5.po --- zhcon.orig/files/patch-po::zh_TW.Big5.po Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-po::zh_TW.Big5.po Thu Jan 1 08:00:00 1970 @@ -1,285 +0,0 @@ ---- 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 zhcon.orig/files/patch-src::Makefile.am zhcon/files/patch-src::Makefile.am --- zhcon.orig/files/patch-src::Makefile.am Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-src::Makefile.am Thu Jan 1 08:00:00 1970 @@ -1,15 +0,0 @@ ---- 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 - - uninstall-local: -- -rm -f /etc/zhcon.conf -+ -rm -f $(PREFIX)/etc/zhcon.conf - - bin_PROGRAMS = zhcon - AM_INSTALL_PROGRAM_FLAGS= -m 4775 diff -ruN zhcon.orig/files/patch-src::Makefile.in zhcon/files/patch-src::Makefile.in --- zhcon.orig/files/patch-src::Makefile.in Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-src::Makefile.in Tue Nov 26 01:38:32 2002 @@ -1,15 +1,29 @@ ---- 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 @@ +--- src/Makefile.in.orig Tue Jun 11 10:25:52 2002 ++++ src/Makefile.in Tue Nov 26 01:37:47 2002 +@@ -81,7 +81,7 @@ + LIB = @LIB@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ +-LIBS = @LIBS@ ++LIBS = -lintl -lcurses @LIBS@ -I/usr/lib + LN_S = @LN_S@ + LTLIB = @LTLIB@ + LTLIBICONV = @LTLIBICONV@ +@@ -117,7 +117,7 @@ + PROGRAMS = $(bin_PROGRAMS) + + +-DEFS = @DEFS@ -I. -I$(srcdir) -I.. ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/include + CPPFLAGS = @CPPFLAGS@ + zhcon_OBJECTS = basefont.o big52gbdecoder.o big5decoder.o configfile.o \ + console.o gb2big5decoder.o gbdecoder.o gbkdecoder.o graphdev.o \ +@@ -395,7 +395,7 @@ install-data-local: - $(mkinstalldirs) $(libdir)/zhcon/ -- $(INSTALL_DATA) $(srcdir)/zhcon.conf /etc/zhcon.conf + $(mkinstalldirs) $(DESTDIR)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf + $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/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 - - # 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 zhcon.orig/files/patch-src::display::fbdev.cpp zhcon/files/patch-src::display::fbdev.cpp --- zhcon.orig/files/patch-src::display::fbdev.cpp Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-src::display::fbdev.cpp Thu Jan 1 08:00:00 1970 @@ -1,29 +0,0 @@ ---- 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 zhcon.orig/files/patch-src::graphdev.cpp zhcon/files/patch-src::graphdev.cpp --- zhcon.orig/files/patch-src::graphdev.cpp Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-src::graphdev.cpp Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- src/graphdev.cpp.ori Tue Apr 9 14:54:28 2002 -+++ src/graphdev.cpp Tue Apr 9 15:27:14 2002 -@@ -29,7 +29,7 @@ - - #include "display/fbdev.h" - #include "display/vgadev.h" --#if defined(linux) -+#if defined(linux) || defined(__FreeBSD__) - #ifdef HAVE_GGI_LIB - #include "display/libggi.h" - #endif diff -ruN zhcon.orig/files/patch-src::nativeinputserver.cpp zhcon/files/patch-src::nativeinputserver.cpp --- zhcon.orig/files/patch-src::nativeinputserver.cpp Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-src::nativeinputserver.cpp Thu Jan 1 08:00:00 1970 @@ -1,45 +0,0 @@ ---- 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 zhcon.orig/files/patch-src::zhcon.conf zhcon/files/patch-src::zhcon.conf --- zhcon.orig/files/patch-src::zhcon.conf Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-src::zhcon.conf Tue Nov 26 02:04:19 2002 @@ -0,0 +1,16 @@ +--- src/zhcon.conf.orig Tue Nov 26 02:03:39 2002 ++++ src/zhcon.conf Tue Nov 26 02:03:50 2002 +@@ -34,10 +34,10 @@ + # FreeBSD wizard and ask him to compile a new kernel with VESA support + # for you and ... emmmm ... explain all these stuff to you ... + # +-x_resolution = 800 +-y_resolution = 600 ++x_resolution = 640 ++y_resolution = 480 + # 4 bits = 16 colors, 8 bits = 256 colors, 16 bits = 64K colors, and so on.. +-color_depth = 8 ++color_depth = 4 + + #blanklineheight must >= 0 + blanklineheight = 1 diff -ruN zhcon.orig/files/patch-src::zhcon.cpp zhcon/files/patch-src::zhcon.cpp --- zhcon.orig/files/patch-src::zhcon.cpp Mon Nov 25 22:21:14 2002 +++ zhcon/files/patch-src::zhcon.cpp Wed Nov 27 20:31:54 2002 @@ -1,55 +1,11 @@ ---- 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 @@ +--- src/zhcon.cpp.orig Tue Nov 26 01:35:04 2002 ++++ src/zhcon.cpp Tue Nov 26 01:35:25 2002 +@@ -131,7 +131,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,29 +490,30 @@ - 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 { - throw runtime_error("unable to set default encode!"); - } - -+ setenv("LC_CTYPE", getenv("LC_ALL"), 1); - s = f.GetOption(string("autoencode"), string("manual")); - if (s == "auto") - mAutoEncode = AUTO; + //for debug,a pause enable us to attach zhcon's pid in gdb + //char c;cin>>c; diff -ruN zhcon.orig/files/patch-tools::Makefile.in zhcon/files/patch-tools::Makefile.in --- zhcon.orig/files/patch-tools::Makefile.in Thu Jan 1 08:00:00 1970 +++ zhcon/files/patch-tools::Makefile.in Mon Nov 25 23:49:45 2002 @@ -0,0 +1,20 @@ +--- tools/Makefile.in.orig Mon Nov 25 23:45:33 2002 ++++ tools/Makefile.in Mon Nov 25 23:49:43 2002 +@@ -107,7 +107,7 @@ + LDFLAGS = + CXXFLAGS = + CCFLAGS = +-LIBS = ++LIBS = -lX11 -L/usr/X11R6/lib + + EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff gpm-1.19.6-patched.tar.gz + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,7 +116,7 @@ + PROGRAMS = $(bin_PROGRAMS) + + +-DEFS = @DEFS@ -I. -I$(srcdir) -I.. ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/X11R6/include + CPPFLAGS = @CPPFLAGS@ + uc2win_OBJECTS = uc2win.o + uc2win_LDADD = $(LDADD) diff -ruN zhcon.orig/pkg-plist zhcon/pkg-plist --- zhcon.orig/pkg-plist Mon Nov 25 22:21:14 2002 +++ zhcon/pkg-plist Wed Nov 27 20:23:22 2002 @@ -1,5 +1,9 @@ +bin/getbpsf +bin/uc2win +bin/win2mb bin/zhcon etc/zhcon.conf +etc/zhcon.conf.sample lib/zhcon/font/asc12.bpsf lib/zhcon/font/asc12x.bpsf lib/zhcon/font/asc14.bpsf @@ -7,7 +11,6 @@ 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 @@ -16,7 +19,7 @@ lib/zhcon/font/hzk14.bpsf lib/zhcon/font/hzk16.bpsf lib/zhcon/font/jis-16.bpsf -lib/zhcon/font/kscm-16.bpsf +lib/zhcon/font/ksc-16.bpsf lib/zhcon/input/big5-ary30.mb lib/zhcon/input/big5-cj.mb lib/zhcon/input/big5-liu5.mb @@ -36,7 +39,7 @@ lib/zhcon/input/winsp.mb lib/zhcon/input/winzm.mb share/locale/ja/LC_MESSAGES/zhcon.mo -share/locale/kr/LC_MESSAGES/zhcon.mo +share/locale/ko/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 @@ -46,8 +49,8 @@ @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 share/locale/ko/LC_MESSAGES +@dirrm share/locale/ko @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?20021127123855.5FECB28F>