Date: Tue, 8 Dec 1998 23:49:03 +0800 (CST) From: frankch@waru.life.nthu.edu.tw To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9015: update ports/chinese/rxvt Message-ID: <199812081549.XAA04208@waru.life.nthu.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 9015 >Category: ports >Synopsis: Update ports/chinese/rxvt to 2.4.11 >Confidential: yes >Severity: critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 8 08:00:01 PST 1998 >Last-Modified: >Originator: Chen Hsiung Chan >Organization: Department of Life Science, National Tsing Hua University >Release: FreeBSD 2.2.7-STABLE i386 >Environment: >Description: Previous version of rxvt have vanished from that master site. We are forced to upgrade this port to the latest beta. Rxvt is now with version 2.4.11 >How-To-Repeat: >Fix: the diff against the original port is attached below. diff -ruN rxvt.orig/Makefile rxvt/Makefile --- rxvt.orig/Makefile Tue Dec 8 23:44:45 1998 +++ rxvt/Makefile Tue Dec 8 23:15:38 1998 @@ -1,13 +1,13 @@ # New ports collection Makefile for: rxvt -# Version required: 2.4.8 +# Version required: 2.4.11 # Date created: Nov 16 1997 # Whom: frankch@waru.life.nthu.edu.tw # # $Id: Makefile,v 1.7 1998/10/10 01:04:31 vanilla Exp $ # -DISTNAME= rxvt-2.4.8 -PKGNAME= zh-rxvt-2.4.8 +DISTNAME= rxvt-2.4.11 +PKGNAME= zh-rxvt-2.4.11 CATEGORIES= chinese x11 MASTER_SITES= ftp://mason.primenet.com.au/pub/rxvt/ \ ftp://ftp.math.fu-berlin.de/pub/rxvt/ @@ -21,4 +21,5 @@ CONFIGURE_ARGS= --enable-big5=yes --enable-xcin=yes MAN1= crxvt2.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.include <bsd.port.post.mk> diff -ruN rxvt.orig/files/md5 rxvt/files/md5 --- rxvt.orig/files/md5 Tue Dec 8 23:44:45 1998 +++ rxvt/files/md5 Tue Dec 8 17:25:26 1998 @@ -1 +1 @@ -MD5 (rxvt-2.4.8.tar.gz) = 79f887255f1aa6683af765d9b165e1a2 +MD5 (rxvt-2.4.11.tar.gz) = 806d163e3113d22b31535785088f37c2 diff -ruN rxvt.orig/patches/patch-aa rxvt/patches/patch-aa --- rxvt.orig/patches/patch-aa Tue Dec 8 23:44:45 1998 +++ rxvt/patches/patch-aa Tue Dec 8 23:42:45 1998 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Oct 9 16:38:10 1998 -+++ Makefile.in Fri Oct 9 16:38:45 1998 +--- Makefile.in.orig Tue Dec 8 21:23:23 1998 ++++ Makefile.in Tue Dec 8 21:23:37 1998 @@ -8,7 +8,7 @@ first_rule: all dummy: @@ -9,51 +9,24 @@ DIST = INSTALL README.configure configure Makefile Makefile.in ---- configure.orig Fri Oct 9 16:03:53 1998 -+++ configure Fri Oct 9 16:06:55 1998 -@@ -32,6 +32,8 @@ - ac_help="$ac_help - --enable-big5 enable big5 support" - ac_help="$ac_help -+ --enable-xcin enable XCIN Chinese input support" -+ac_help="$ac_help - --enable-greek enable greek keyboard support" - ac_help="$ac_help - --enable-ttygid enable tty setting to group \"tty\" - use only if -@@ -723,6 +725,17 @@ - if test x$enableval = xyes; then - cat >> confdefs.h <<\EOF - #define ZH 1 -+EOF -+ -+ fi -+fi -+ -+# Check whether --enable-xcin or --disable-xcin was given. -+if test "${enable_xcin+set}" = set; then -+ enableval="$enable_xcin" -+ if test x$enableval = xyes; then -+ cat >> confdefs.h <<\EOF -+#define XCIN 1 - EOF - - fi ---- doc/Makefile.in.orig Fri Oct 9 16:47:58 1998 -+++ doc/Makefile.in Fri Oct 9 16:48:35 1998 +--- doc/Makefile.in.orig Wed Nov 18 15:20:14 1998 ++++ doc/Makefile.in Tue Dec 8 23:42:24 1998 @@ -55,7 +55,7 @@ tags allbin: -alldoc: $(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt -+alldoc: rxvt.1 ++alldoc: + + $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)/../src/version.h + $(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@ +@@ -83,8 +83,8 @@ - $(basedir)/$(VERNAME).lsm: LSM.in ../autoconf/Make.common.in - $(SED) $(SEDREPLACE) < LSM.in > $@ -@@ -84,7 +84,7 @@ distclean: - install: rxvt.1 +-install: rxvt.1 - $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext) ++install: + $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)crxvt2.$(manext) uninstall: diff -ruN rxvt.orig/patches/patch-ab rxvt/patches/patch-ab --- rxvt.orig/patches/patch-ab Tue Dec 8 23:44:45 1998 +++ rxvt/patches/patch-ab Tue Dec 8 23:20:17 1998 @@ -1,38 +1,68 @@ ---- autoconf/acconfig.h.orig Fri Oct 9 16:09:57 1998 -+++ autoconf/acconfig.h Fri Oct 9 16:10:32 1998 -@@ -35,6 +35,9 @@ +--- configure.orig Tue Dec 8 23:17:30 1998 ++++ configure Tue Dec 8 23:18:24 1998 +@@ -32,6 +32,8 @@ + ac_help="$ac_help + --enable-big5 enable big5 support" + ac_help="$ac_help ++ --enable-xcin enable Chinese input support" ++ac_help="$ac_help + --enable-greek enable greek keyboard support" + ac_help="$ac_help + --enable-ttygid enable tty setting to group \"tty\" - use only if +@@ -722,6 +724,18 @@ + if test x$enableval = xyes; then + cat >> confdefs.h <<\EOF + #define ZH 1 ++EOF ++ ++ fi ++fi ++ ++ ++# Check whether --enable-xcin or --disable-xcin was given. ++if test "${enable_xcin+set}" = set; then ++ enableval="$enable_xcin" ++ if test x$enableval = xyes; then ++ cat >> confdefs.h <<\EOF ++#define XCIN 1 + EOF + + fi +--- autoconf/acconfig.h.orig Tue Dec 8 21:26:28 1998 ++++ autoconf/acconfig.h Tue Dec 8 21:27:20 1998 +@@ -34,6 +34,9 @@ /* after compilation, rename executable as `crxvt' */ #undef ZH -+/* Define if you want XCIN Chinese Input support */ ++/* Define if you want chinese input support */ +#undef XCIN + /* Define if Xlocale support doesn't work */ #undef NO_XLOCALE ---- autoconf/config.h.in.orig Fri Oct 9 16:10:46 1998 -+++ autoconf/config.h.in Fri Oct 9 16:11:23 1998 -@@ -80,6 +80,9 @@ +--- autoconf/config.h.in.orig Tue Dec 8 21:27:34 1998 ++++ autoconf/config.h.in Tue Dec 8 21:28:02 1998 +@@ -76,6 +76,9 @@ /* after compilation, rename executable as `crxvt' */ #undef ZH -+/* Define if you want XCIN Chinese Input support */ ++/* Define if you want chinese input support */ +#undef XCIN + /* Define if Xlocale support doesn't work */ #undef NO_XLOCALE ---- autoconf/configure.in.orig Fri Oct 9 16:11:33 1998 -+++ autoconf/configure.in Fri Oct 9 16:12:13 1998 +--- autoconf/configure.in.orig Tue Dec 8 21:28:18 1998 ++++ autoconf/configure.in Tue Dec 8 21:29:12 1998 @@ -82,6 +82,12 @@ AC_DEFINE(ZH) fi]) +AC_ARG_ENABLE(xcin, -+[ --enable-xcin enable XCIN support], -+[if test x$enableval = xyes; then -+ AC_DEFINE(XCIN) -+fi]) ++ [ --enable-xcin enable Chinese input support], ++ [if test x$enableval = xyes; then ++ AC_DEFINE(XCIN) ++ fi]) + AC_ARG_ENABLE(greek, [ --enable-greek enable greek keyboard support], diff -ruN rxvt.orig/patches/patch-ac rxvt/patches/patch-ac --- rxvt.orig/patches/patch-ac Tue Dec 8 23:44:45 1998 +++ rxvt/patches/patch-ac Tue Dec 8 23:10:50 1998 @@ -1,22 +1,15 @@ ---- src/feature.h.orig Fri Sep 25 02:02:13 1998 -+++ src/feature.h Thu Oct 15 20:37:07 1998 -@@ -32,6 +32,7 @@ - * your menu files - */ - #define PATH_ENV "RXVTPATH" -+#define FIX_ALIGNMENT - - /* - * Avoid enabling the colour cursor (-cr, cursorColor, cursorColor2) -@@ -304,9 +305,9 @@ +--- src/feature.h.orig Tue Dec 8 23:06:09 1998 ++++ src/feature.h Tue Dec 8 23:07:16 1998 +@@ -349,9 +349,9 @@ # ifdef ZH # define NFONTS 5 # define FONT0_IDX 1 -# define MFONT_LIST "taipei16", "taipeik20", "taipeik24", "taipeik20", \ -+# define MFONT_LIST "kc15f", "taipeik20", "kc24f", "kc24f", \ - "taipei16" +- "taipei16" -# define NFONT_LIST "8x16", "10x20", "12x24", "10x20", "8x16" -+# define NFONT_LIST "kc8x15", "10x20", "kc12x24", "kc12x24", "8x16" ++# define MFONT_LIST "kc15f", "kc15f", "kc24f", "kc24f", \ ++ "kc15f" ++# define NFONT_LIST "8x16", "8x16", "12x24", "12x24", "8x16" # else /* no Kanji or Big5 support */ # define NFONTS 5 # define FONT0_IDX 2 diff -ruN rxvt.orig/patches/patch-ad rxvt/patches/patch-ad --- rxvt.orig/patches/patch-ad Tue Dec 8 23:44:45 1998 +++ rxvt/patches/patch-ad Tue Dec 8 23:30:18 1998 @@ -1,24 +1,27 @@ ---- src/Makefile.in.orig Fri Oct 9 16:49:02 1998 -+++ src/Makefile.in Fri Oct 9 16:49:43 1998 -@@ -17,13 +17,14 @@ +--- src/Makefile.in.orig Tue Dec 8 21:19:37 1998 ++++ src/Makefile.in Tue Dec 8 21:32:41 1998 +@@ -17,16 +17,16 @@ first_rule: all dummy: --SRCS = command.c graphics.c grkelot.c main.c menubar.c misc.c \ -+SRCS = cli_xcin.c command.c graphics.c grkelot.c main.c menubar.c misc.c \ - netdisp.c rmemset.c screen.c scrollbar.c utmp.c xdefaults.c xpm.c - --OBJS = command.o graphics.o grkelot.o main.o menubar.o misc.o \ -+OBJS = cli_xcin.o command.o graphics.o grkelot.o main.o menubar.o misc.o \ - netdisp.o rmemset.o screen.o scrollbar.o utmp.o xdefaults.o xpm.o - --HDRS = feature.h protos.h grkelot.h rxvt.h rxvtgrx.h screen.h version.h -+HDRS = feature.h protocol.h protos.h grkelot.h rxvt.h rxvtgrx.h screen.h \ -+ state.h version.h - - PROS = command.pro graphics.pro grkelot.pro main.pro menubar.pro misc.pro \ - netdisp.pro rmemset.pro screen.pro scrollbar.pro utmp.pro xdefaults.pro xpm.pro -@@ -68,7 +69,7 @@ +-SRCS = command.c graphics.c grkelot.c logging.c main.c menubar.c misc.c \ +- netdisp.c rmemset.c screen.c scrollbar.c xdefaults.c xpm.c ++SRCS = cli_xcin.c command.c graphics.c grkelot.c logging.c main.c menubar.c \ ++ misc.c netdisp.c rmemset.c screen.c scrollbar.c xdefaults.c xpm.c + + HDRS = command.h grkelot.h menubar.h protos.h rxvtgrx.h version.h \ + feature.h logging.h netdisp.h rxvt.h screen.h xpm.h + + # it's ``be kind to gmake week'' + #OBJS = $(SRCS:S,.c,.o,) +-OBJS = command.o graphics.o grkelot.o logging.o main.o menubar.o misc.o \ +- netdisp.o rmemset.o screen.o scrollbar.o xdefaults.o xpm.o ++OBJS = cli_xcin.o command.o graphics.o grkelot.o logging.o main.o menubar.o \ ++ misc.o netdisp.o rmemset.o screen.o scrollbar.o xdefaults.o xpm.o + + # it's ``be kind to gmake week'' + #EXTPROS = $(SRCS:S,.c,.extpro,) +@@ -89,7 +89,7 @@ (cd $(srcdir); $(RMF) Makefile) install: allbin alldoc @@ -27,9 +30,9 @@ uninstall: (cd $(bindir); $(RMF) $(binprefix)rxvt) ---- src/cli_xcin.c.orig Fri Oct 9 16:26:07 1998 -+++ src/cli_xcin.c Fri Oct 9 16:26:07 1998 -@@ -0,0 +1,145 @@ +--- src/cli_xcin.c.orig Tue Dec 8 21:32:53 1998 ++++ src/cli_xcin.c Tue Dec 8 21:17:35 1998 +@@ -0,0 +1,173 @@ +/* + Copyright (C) 1994,1995 Edward Der-Hua Liu, Hsin-Chu, Taiwan +*/ @@ -39,8 +42,36 @@ +#include <sys/types.h> +#include <X11/Xlib.h> +#include <X11/Xatom.h> -+#include "state.h" -+#include "protocol.h" ++ ++typedef struct { ++ char kb_state; ++ char _CurInMethod; ++} InmdState; ++ ++#define EngChiMask (1) ++#define HalfFullMask (2) ++ ++typedef struct { ++ int len; ++ int status; ++ InmdState inmdstate; ++ char tkey[512]; ++} XCIN_RES; ++ ++#define EngChi ((inmdstate.kb_state & EngChiMask) ? 1:0) ++#define HalfFull ((inmdstate.kb_state & HalfFullMask) ? 1:0) ++#define CurInMethod (inmdstate._CurInMethod) ++/* extern InmdState inmdstate; */ ++ ++#define K_REJECT (0) ++#define K_ACCEPT (1) ++ ++#define CLI_FOCUS_IN (1) ++#define CLI_FOCUS_OUT (3) ++ ++#define LOAD_KEYWORD (2) ++ ++#define XCIN_ATOM "XCIN_A" + +static void p_err(char *fmt,...) +{ @@ -175,38 +206,36 @@ +XSync(display,False); +return (read_keys(display, buf)); +} ---- src/command.c.orig Fri Oct 9 16:19:21 1998 -+++ src/command.c Fri Oct 9 16:23:11 1998 -@@ -502,7 +502,7 @@ +--- src/command.c.orig Tue Dec 8 21:39:34 1998 ++++ src/command.c Tue Dec 8 23:05:48 1998 +@@ -291,7 +291,7 @@ ttydev = tty_name; # define PTYCHAR1 "pqrstuvwxyz" -# define PTYCHAR2 "0123456789abcdef" +# define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv" for (c1 = PTYCHAR1; *c1; c1++) { - ptydev[len - 2] = ttydev[len - 2] = *c1; + ptydev[len] = ttydev[len] = *c1; for (c2 = PTYCHAR2; *c2; c2++) { -@@ -1285,6 +1285,11 @@ +@@ -1081,6 +1081,10 @@ + #endif int ctrl, meta, shft, len; KeySym keysym; - +#ifdef XCIN + char chstr[256]; + int result; -+#endif /* XCIN */ -+ - /* - * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an - * escape sequence to toggle the Keypad. -@@ -1790,7 +1795,22 @@ ++#endif + static XComposeStatus compose = {NULL, 0}; + static unsigned char kbuf[KBUFSZ]; + +@@ -1586,7 +1590,21 @@ fprintf(stderr, "'\n"); } #endif /* DEBUG_CMD */ -+ -+#ifdef XCIN ++#ifdef XCIN + result = send_key(Xdisplay, TermWin.parent, ev, chstr); + if (!result) -+ { ++ { + tt_write (kbuf, len); + } + else @@ -221,58 +250,48 @@ } /*}}} */ -@@ -2127,6 +2147,9 @@ +@@ -1902,6 +1920,9 @@ if (Input_Context != NULL) XSetICFocus(Input_Context); #endif +#ifdef XCIN -+ send_FocusIn(Xdisplay, TermWin.parent); ++ send_FocusIn(Xdisplay, TermWin.parent); +#endif } break; -@@ -2136,6 +2159,9 @@ +@@ -1911,6 +1932,9 @@ #ifndef NO_XLOCALE if (Input_Context != NULL) XUnsetICFocus(Input_Context); +#endif +#ifdef XCIN -+ send_FocusOut(Xdisplay, TermWin.parent); ++ send_FocusOut(Xdisplay, TermWin.parent); #endif } break; ---- src/protocol.h.orig Fri Oct 9 16:26:07 1998 -+++ src/protocol.h Fri Oct 9 16:26:08 1998 -@@ -0,0 +1,13 @@ -+/* -+ Copyright (C) 1994 Edward Der-Hua Liu, Hsin-Chu, Taiwan -+*/ -+ -+#define K_REJECT (0) -+#define K_ACCEPT (1) -+ -+#define CLI_FOCUS_IN (1) -+#define CLI_FOCUS_OUT (3) -+ -+#define LOAD_KEYWORD (2) -+ -+#define XCIN_ATOM "XCIN_A" ---- src/rxvt.h.orig Fri Oct 9 16:23:21 1998 -+++ src/rxvt.h Fri Oct 9 16:25:56 1998 -@@ -379,6 +379,12 @@ +--- src/rxvt.h.orig Tue Dec 8 21:43:00 1998 ++++ src/rxvt.h Tue Dec 8 21:51:05 1998 +@@ -237,11 +237,18 @@ + + /* sort out conflicts in feature.h */ + #ifdef KANJI ++# undef XCIN /* remove Chinese input support */ + # undef ZH /* remove Chinese big5 support */ + # undef GREEK_SUPPORT /* Kanji/Greek together is too weird */ # undef DEFINE_XTERM_COLOR /* since kterm-color doesn't exist? */ #endif +#ifdef XCIN -+#ifndef ZH /* must be with BIG5 support */ -+# define ZH -+#endif ++# ifndef ZH ++# define ZH ++# endif +#endif + #ifdef ZH # undef KANJI /* can't put Chinese/Kanji together */ # undef GREEK_SUPPORT -@@ -390,8 +396,8 @@ +@@ -253,8 +260,8 @@ #endif #define APL_CLASS "XTerm" /* class name */ @@ -283,29 +302,3 @@ /* COLORTERM, TERM environment variables */ #define COLORTERMENV "rxvt" ---- src/state.h.orig Fri Oct 9 16:26:08 1998 -+++ src/state.h Fri Oct 9 16:26:08 1998 -@@ -0,0 +1,23 @@ -+/* -+ Copyright (C) 1994 Edward Der-Hua Liu, Hsin-Chu, Taiwan -+*/ -+ -+typedef struct { -+ char kb_state; -+ char _CurInMethod; -+} InmdState; -+ -+#define EngChiMask (1) -+#define HalfFullMask (2) -+ -+typedef struct { -+ int len; -+ int status; -+ InmdState inmdstate; -+ char tkey[512]; -+} XCIN_RES; -+ -+#define EngChi ((inmdstate.kb_state & EngChiMask) ? 1:0) -+#define HalfFull ((inmdstate.kb_state & HalfFullMask) ? 1:0) -+#define CurInMethod (inmdstate._CurInMethod) -+/* extern InmdState inmdstate; */ >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?199812081549.XAA04208>