4 files changed, 195 insertions, 84 deletions

diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile
index 1cb3d4e2d832..0dec8b7223a9 100644
--- a/chinese/rxvt/Makefile
+++ b/chinese/rxvt/Makefile
@@ -1,24 +1,24 @@
 # New ports collection Makefile for: rxvt
-# Version required:     2.4.11
+# Version required:     2.6.PRE2
 # Date created:         Nov 16 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.8 1998/12/09 05:05:32 vanilla Exp $
+# $Id: Makefile,v 1.9 1999/01/17 07:34:26 vanilla Exp $
 #
 
-DISTNAME=	rxvt-2.4.11
-PKGNAME=	zh-rxvt-2.4.11
+DISTNAME=	rxvt-2.6.PRE2
+PKGNAME=	zh-rxvt-2.6.PRE2
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://mason.primenet.com.au/pub/rxvt/ \
 		ftp://ftp.math.fu-berlin.de/pub/rxvt/
 
 MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
-RUN_DEPENDS=	${X11BASE}/bin/xcin:${PORTSDIR}/chinese/xcin
+BUILD_DEPENDS=	yodl2man:${PORTSDIR}/textproc/yodl
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-big5=yes --enable-xcin=yes
+CONFIGURE_ARGS=	--enable-big5=yes --enable-xim=yes
 MAN1=		crxvt.1
 
 .include <bsd.port.mk>
diff --git a/chinese/rxvt/distinfo b/chinese/rxvt/distinfo
index 5e2805a3b2c6..ce75690e2010 100644
--- a/chinese/rxvt/distinfo
+++ b/chinese/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.11.tar.gz) = 806d163e3113d22b31535785088f37c2
+MD5 (rxvt-2.6.PRE2.tar.gz) = 094caf133557b61b2204f78cf314c7e2
diff --git a/chinese/rxvt/files/patch-aa b/chinese/rxvt/files/patch-aa
index 5eae98091d53..cbf7c33d5643 100644
--- a/chinese/rxvt/files/patch-aa
+++ b/chinese/rxvt/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Nov 18 15:21:15 1998
-+++ Makefile.in	Sun Jan 17 14:57:55 1999
-@@ -8,7 +8,7 @@
+--- Makefile.in.orig	Fri Mar  5 11:46:39 1999
++++ Makefile.in	Fri Mar  5 11:47:32 1999
+@@ -9,7 +9,7 @@
  first_rule: all
  dummy:
  
@@ -9,25 +9,34 @@
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in
  
---- doc/Makefile.in.orig	Wed Nov 18 15:20:14 1998
-+++ doc/Makefile.in	Sun Jan 17 15:09:17 1999
-@@ -55,7 +55,7 @@
+--- doc/Makefile.in.orig	Fri Mar  5 11:47:46 1999
++++ doc/Makefile.in	Fri Mar  5 11:56:55 1999
+@@ -54,7 +54,7 @@
  
  tags allbin:
  
 -alldoc:	$(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
 +alldoc:	
  
- $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)/../src/version.h
- 	$(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@
-@@ -83,8 +83,8 @@
- 
+ yodl/versioninfo.yo: yodl/versioninfo.yo.in ../autoconf/Make.common.in
+ 	$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
+@@ -86,7 +86,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)crxvt.$(manext)
++	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/crxvt.$(manext)
  
  uninstall:
  	-cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
+--- src/Makefile.in.orig	Tue Mar  9 18:09:06 1999
++++ src/Makefile.in	Tue Mar  9 18:09:24 1999
+@@ -97,7 +97,7 @@
+ 	(cd $(srcdir); $(RMF) Makefile)
+ 
+ install: allbin alldoc
+-	$(INSTALL_PROGRAM) rxvt $(DESTDIR)$(bindir)/$(binprefix)rxvt
++	$(INSTALL_PROGRAM) rxvt $(DESTDIR)$(bindir)/$(binprefix)crxvt
+ 
+ uninstall:
+ 	(cd $(bindir); $(RMF) $(binprefix)rxvt)
diff --git a/chinese/rxvt/files/patch-ab b/chinese/rxvt/files/patch-ab
index 5967729b4373..de4cd8c59a15 100644
--- a/chinese/rxvt/files/patch-ab
+++ b/chinese/rxvt/files/patch-ab
@@ -1,69 +1,171 @@
---- 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
+--- src/main.c.orig	Fri Mar  5 12:26:41 1999
++++ src/main.c	Fri Mar  5 12:30:58 1999
+@@ -453,6 +453,16 @@
+ 			       GCForeground | GCBackground |
+ 			       GCFont | GCGraphicsExposures,
+ 			       &gcvalue);
++#ifdef FIX_ALIGNMENT
++	TermWin.ngc = TermWin.gc;
++#ifdef MULTICHAR_SET
++	gcvalue.font = TermWin.mfont->fid;
++	TermWin.mgc = XCreateGC(Xdisplay, TermWin.vt,
++			GCForeground | GCBackground |
++			GCFont | GCGraphicsExposures,
++			&gcvalue);
++#endif
++#endif
+     }
+ }
+ /* window resizing - assuming the parent window is the correct size */
+@@ -976,7 +986,11 @@
  
-   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
+ /* alter existing GC */
+     if (!init) {
++#ifdef FIX_ALIGNMENT
++	XSetFont(Xdisplay, TermWin.ngc, TermWin.font->fid);
++#else
+ 	XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
++#endif
+ 	menubar_expose();
+     }
+ /* set the sizes */
+--- src/rxvt.h.orig	Fri Mar  5 12:31:15 1999
++++ src/rxvt.h	Fri Mar  5 12:42:25 1999
+@@ -8,6 +8,8 @@
+ #include "../config.h"
+ #include "feature.h"
  
-+/* Define if you want chinese input support */
-+#undef XCIN
++#define FIX_ALIGNMENT
 +
- /* Define if Xlocale support doesn't work */
- #undef NO_XLOCALE
+ /*
+  *****************************************************************************
+  * SYSTEM HACKS
+@@ -170,11 +172,18 @@
+ 		    vt;		/* vt100 window                             */
+     GC              gc;		/* GC for drawing text                      */
+     XFontStruct    *font;	/* main font structure                      */
++#ifdef FIX_ALIGNMENT
++    GC              ngc;
++    int             vascent;
++#endif
+ #ifndef NO_BOLDFONT
+     XFontStruct    *boldFont;	/* bold font                                */
+ #endif
+ #ifdef MULTICHAR_SET
+     XFontStruct    *mfont;	/* Multichar font structure                 */
++#endif
++#ifdef FIX_ALIGNMENT
++    GC              mgc;
+ #endif
+     XFontSet       fontset;
+ #ifdef XPM_BACKGROUND
+--- src/screen.c.orig	Fri Mar  5 12:32:53 1999
++++ src/screen.c	Fri Mar  5 12:40:43 1999
+@@ -2134,7 +2134,12 @@
+  * always go back to the base font - it's much safer
+  */
+     wbyte = 0;
++#ifdef FIX_ALIGNMENT
++    TermWin.gc = TermWin.ngc;
++    TermWin.vascent = TermWin.font->ascent;
++#else
+     XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
++#endif
+     draw_string = XDrawString;
+     draw_image_string = XDrawImageString;
+     boldlast = 0;
+@@ -2318,7 +2323,11 @@
  
---- 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
+ 	    len = 0;
+ 	    buffer[len++] = stp[col];
++#ifdef FIX_ALIGNMENT
++	    ypixel = TermWin.vascent + Row2Pixel(row);
++#else
+ 	    ypixel = TermWin.font->ascent + Row2Pixel(row);
++#endif
+ 	    xpixel = Col2Pixel(col);
+ 	    wlen = 1;
  
-+/* Define if you want chinese input support */
-+#undef XCIN
-+
- /* Define if Xlocale support doesn't work */
- #undef NO_XLOCALE
- 
---- 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 Chinese input support],
-+  [if test x$enableval = xyes; then
-+    AC_DEFINE(XCIN)
-+  fi])
-+
- AC_ARG_ENABLE(greek,
-   [  --enable-greek          enable greek keyboard support],
-   [if test x$enableval = xyes; then
+@@ -2332,7 +2341,13 @@
+ 		    && ((srp[col + 1]) & RS_multiMask) == RS_multi2) {
+ 		    if (!wbyte) {
+ 			wbyte = 1;
++#ifdef FIX_ALIGNMENT
++			TermWin.gc = TermWin.mgc;
++			ypixel += TermWin.mfont->ascent - TermWin.vascent;
++			TermWin.vascent = TermWin.mfont->ascent;
++#else
+ 			XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid);
++#endif
+ 			draw_string = XDrawString16;
+ 			draw_image_string = XDrawImageString16;
+ 		    }
+@@ -2370,7 +2385,13 @@
+ 		    }
+ 		    if (wbyte) {
+ 			wbyte = 0;
++#ifdef FIX_ALIGNMENT
++			TermWin.gc = TermWin.ngc;
++			ypixel += TermWin.font->ascent - TermWin.vascent;
++			TermWin.vascent = TermWin.font->ascent;
++#else
+ 			XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
++#endif
+ 			draw_string = XDrawString;
+ 			draw_image_string = XDrawImageString;
+ 		    }
+@@ -2466,7 +2487,11 @@
+ 		rend &= ~RS_Bold;	/* we've taken care of it */
+ 	    } else if (bfont) {
+ 		bfont = 0;
++#ifdef FIX_ALIGNMENT
++		XSetFont(Xdisplay, TermWin.ngc, TermWin.font->fid);
++#else
+ 		XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
++#endif
+ 	    }
+ #endif
+ /*
+@@ -2478,12 +2503,20 @@
+ 		    gcmask |= (GCForeground | GCBackground);
+ 		    XChangeGC(Xdisplay, TermWin.gc, gcmask, &gcvalue);
+ 		    XFillRectangle(Xdisplay, drawBuffer, TermWin.gc,
++#ifdef FIX_ALIGNMENT
++				   xpixel, ypixel - TermWin.vascent,
++#else
+ 				   xpixel, ypixel - TermWin.font->ascent,
++#endif
+ 				   Width2Pixel(1), Height2Pixel(1));
+ 		    SWAP_IT(gcvalue.foreground, gcvalue.background, ltmp);
+ 		    XChangeGC(Xdisplay, TermWin.gc, gcmask, &gcvalue);
+ 		} else
++#ifdef FIX_ALIGNMENT
++		    CLEAR_CHARS(xpixel, ypixel - TermWin.vascent, 1);
++#else
+ 		    CLEAR_CHARS(xpixel, ypixel - TermWin.font->ascent, 1);
++#endif
+ 		DRAW_STRING(draw_string, xpixel, ypixel, buffer, 1);
+ #ifndef NO_BOLDOVERSTRIKE
+ 		if (MONO_BOLD(rend))
+@@ -2498,7 +2531,11 @@
+ #endif
+ #ifdef XPM_BACKGROUND
+ 	    if (TermWin.pixmap != None && back == Color_bg) {
++#ifdef FIX_ALIGNMENT
++		CLEAR_CHARS(xpixel, ypixel - TermWin.vascent, len);
++#else
+ 		CLEAR_CHARS(xpixel, ypixel - TermWin.font->ascent, len);
++#endif
+ 		DRAW_STRING(draw_string, xpixel, ypixel, buffer, wlen);
+ 	    } else
+ #endif
+@@ -2612,6 +2649,9 @@
+     end_row = TermWin.saveLines - TermWin.view_start;
+     if (selection.op && current_screen == selection.screen) {
+ 	i = selection.beg.row + TermWin.saveLines;
++#ifdef FIX_ALIGNMENT
++	TermWin.gc = TermWin.ngc;
++#endif
+ 	row = selection.end.row + TermWin.saveLines;
+ 	if (i >= end_row)
+ 	    col = selection.beg.col;