4 files changed, 45 insertions, 44 deletions

diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile
index 84b448170576..ae55f86a8d60 100644
--- a/chinese/rxvt/Makefile
+++ b/chinese/rxvt/Makefile
@@ -1,23 +1,24 @@
 # New ports collection Makefile for: rxvt
-# Version required:     2.4.5
+# Version required:     2.4.8
 # Date created:         Nov 16 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.5 1998/01/05 17:30:59 vanilla Exp $
+# $Id: Makefile,v 1.6 1998/08/05 09:30:46 asami Exp $
 #
 
-DISTNAME=       rxvt-2.4.5
-PKGNAME=        zh-rxvt-2.4.5
-CATEGORIES=     chinese x11
-MASTER_SITES=   ftp://ftp.math.fu-berlin.de/pub/rxvt/
+DISTNAME=	rxvt-2.4.8
+PKGNAME=	zh-rxvt-2.4.8
+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
+MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
 RUN_DEPENDS=	${X11BASE}/bin/xcin:${PORTSDIR}/chinese/xcin
 
-USE_X_PREFIX=   yes
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --enable-big5=yes --enable-xcin=yes
-MAN1=           crxvt2.1
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-big5=yes --enable-xcin=yes
+MAN1=		crxvt2.1
 
 .include <bsd.port.mk>
diff --git a/chinese/rxvt/distinfo b/chinese/rxvt/distinfo
index b5c773ff380a..7ff3f0f627c4 100644
--- a/chinese/rxvt/distinfo
+++ b/chinese/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.5.tar.gz) = e8983c7382f1590e7fd86f1b2e14848a
+MD5 (rxvt-2.4.8.tar.gz) = 79f887255f1aa6683af765d9b165e1a2
diff --git a/chinese/rxvt/files/patch-aa b/chinese/rxvt/files/patch-aa
index 9995187e354f..a43e605f0a2d 100644
--- a/chinese/rxvt/files/patch-aa
+++ b/chinese/rxvt/files/patch-aa
@@ -1,29 +1,29 @@
---- Makefile.in.orig	Mon Nov  3 02:00:52 1997
-+++ Makefile.in	Sat Nov 29 00:58:47 1997
-@@ -7,7 +7,7 @@
+--- Makefile.in.orig	Fri Oct  9 16:38:10 1998
++++ Makefile.in	Fri Oct  9 16:38:45 1998
+@@ -8,7 +8,7 @@
  first_rule: all
  dummy:
  
 -subdirs = src doc rclock src/graphics
 +subdirs = src doc src/graphics
  
- DIST =	INSTALL configure Makefile Makefile.in
+ DIST =	INSTALL README.configure configure Makefile Makefile.in
  
---- configure.orig	Mon Nov  3 02:00:52 1997
-+++ configure	Sat Nov 29 00:58:47 1997
-@@ -26,6 +26,8 @@
+--- 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 Chinese XCIN input support"
++  --enable-xcin           enable XCIN Chinese input support"
 +ac_help="$ac_help
    --enable-greek          enable greek keyboard support"
  ac_help="$ac_help
-   --with-term=NAME        set the terminal to NAME (default "xterm")"
-@@ -651,6 +653,17 @@
+   --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 BIG5 1
+ #define ZH 1
 +EOF
 +
 +  fi
@@ -38,21 +38,21 @@
  EOF
  
    fi
---- doc/Makefile.in.orig	Mon Nov  3 02:00:52 1997
-+++ doc/Makefile.in	Sat Nov 29 01:02:43 1997
-@@ -53,7 +53,7 @@
+--- doc/Makefile.in.orig	Fri Oct  9 16:47:58 1998
++++ doc/Makefile.in	Fri Oct  9 16:48:35 1998
+@@ -55,7 +55,7 @@
  
  tags allbin:
  
--alldoc:	lsm rxvt.1
+-alldoc:	$(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
 +alldoc:	rxvt.1
  
- clean:
- 	$(RMF) $(VERNAME).lsm rxvt.1 *~
-@@ -66,7 +66,7 @@
- 	(cd $(srcdir); $(RMF) Makefile)
+ $(basedir)/$(VERNAME).lsm: LSM.in ../autoconf/Make.common.in
+ 	$(SED) $(SEDREPLACE) < LSM.in > $@
+@@ -84,7 +84,7 @@
+ distclean:
  
- install: alldoc
+ install: rxvt.1
 -	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
 +	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)crxvt2.$(manext)
  
diff --git a/chinese/rxvt/files/patch-ab b/chinese/rxvt/files/patch-ab
index 74d3ce3d5637..e24a55127d88 100644
--- a/chinese/rxvt/files/patch-ab
+++ b/chinese/rxvt/files/patch-ab
@@ -1,8 +1,8 @@
---- autoconf/acconfig.h.orig	Mon Nov  3 02:00:52 1997
-+++ autoconf/acconfig.h	Sat Nov 29 00:58:47 1997
-@@ -13,6 +13,9 @@
+--- 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 @@
  /* after compilation, rename executable as `crxvt' */
- #undef BIG5
+ #undef ZH
  
 +/* Define if you want XCIN Chinese Input support */
 +#undef XCIN
@@ -10,11 +10,11 @@
  /* Define if Xlocale support doesn't work */
  #undef NO_XLOCALE
  
---- autoconf/config.h.in.orig	Mon Nov  3 02:00:52 1997
-+++ autoconf/config.h.in	Sat Nov 29 00:58:47 1997
-@@ -58,6 +58,9 @@
+--- 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 @@
  /* after compilation, rename executable as `crxvt' */
- #undef BIG5
+ #undef ZH
  
 +/* Define if you want XCIN Chinese Input support */
 +#undef XCIN
@@ -22,10 +22,10 @@
  /* Define if Xlocale support doesn't work */
  #undef NO_XLOCALE
  
---- autoconf/configure.in.orig	Mon Nov  3 02:00:52 1997
-+++ autoconf/configure.in	Sat Nov 29 00:58:47 1997
-@@ -63,6 +63,12 @@
-     AC_DEFINE(BIG5)
+--- autoconf/configure.in.orig	Fri Oct  9 16:11:33 1998
++++ autoconf/configure.in	Fri Oct  9 16:12:13 1998
+@@ -82,6 +82,12 @@
+     AC_DEFINE(ZH)
    fi])
  
 +AC_ARG_ENABLE(xcin,