Update to rxvt 2.6.0.

PR:	12356
Submitted by:	maintainer

3 files changed, 33 insertions, 19 deletions

diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile
index bc14905a98d8..0184c5cac5e9 100644
--- a/chinese/rxvt/Makefile
+++ b/chinese/rxvt/Makefile
@@ -1,24 +1,28 @@
 # New ports collection Makefile for: rxvt
-# Version required:     2.6.PRE3
+# Version required:     2.6.0
 # Date created:         Nov 16 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.11 1999/03/19 22:17:49 asami Exp $
+# $Id: Makefile,v 1.12 1999/04/13 15:11:32 taoka Exp $
 #
 
-DISTNAME=	rxvt-2.6.PRE3
-PKGNAME=	zh-rxvt-2.6.p3
+DISTNAME=	rxvt-2.6.0
+PKGNAME=	zh-rxvt-2.6.0
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://mason.primenet.com.au/pub/rxvt/ \
 		ftp://ftp.rxvt.org/pub/rxvt/devel/
 
 MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
-BUILD_DEPENDS=	yodl2man:${PORTSDIR}/textproc/yodl
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-big5=yes --enable-xim=yes
+USE_BZIP2=	yes
 MAN1=		crxvt.1
 
+CONFIGURE_ARGS+=--enable-xpm-background --enable-transparency \
+		--enable-menubar --enable-graphics --enable-xim \
+		--enable-big5 --disable-backspace-key --disable-delete-key
+
 .include <bsd.port.mk>
diff --git a/chinese/rxvt/distinfo b/chinese/rxvt/distinfo
index bc9f8eb3babe..f688af9ab4c0 100644
--- a/chinese/rxvt/distinfo
+++ b/chinese/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.6.PRE3.tar.gz) = 63094f1ee4338941f65f66b069b3240b
+MD5 (rxvt-2.6.0.tar.bz2) = 8f6d86c2b76d7f2945d121191ef25158
diff --git a/chinese/rxvt/files/patch-aa b/chinese/rxvt/files/patch-aa
index cbf7c33d5643..f5645676a50d 100644
--- a/chinese/rxvt/files/patch-aa
+++ b/chinese/rxvt/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Mar  5 11:46:39 1999
-+++ Makefile.in	Fri Mar  5 11:47:32 1999
+--- Makefile.in.orig	Mon Mar 29 13:31:37 1999
++++ Makefile.in	Tue Jun 22 11:20:32 1999
 @@ -9,7 +9,7 @@
  first_rule: all
  dummy:
@@ -7,31 +7,41 @@
 -subdirs = src doc rclock src/graphics
 +subdirs = src doc src/graphics
  
- DIST =	INSTALL README.configure configure Makefile Makefile.in
+ DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
---- 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 @@
+--- doc/Makefile.in.orig	Tue Jun  8 17:53:55 1999
++++ doc/Makefile.in	Tue Jun 22 11:23:47 1999
+@@ -55,7 +55,7 @@
  
  tags allbin:
  
 -alldoc:	$(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-+alldoc:	
++alldoc:	rxvt.1
  
  yodl/versioninfo.yo: yodl/versioninfo.yo.in ../autoconf/Make.common.in
  	$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
-@@ -86,7 +86,7 @@
+@@ -66,8 +66,7 @@
+ rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
+ 	yodl2man -orxvt.tbl yodl/rxvt.yo
+ 
+-rxvt.1: rxvt.tbl Makefile
+-	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
++rxvt.1: 
+ 
+ rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
+ 	yodl2html -o$@ yodl/rxvt.yo
+@@ -87,7 +86,7 @@
  distclean:
  
  install: rxvt.1
 -	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
-+	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/crxvt.$(manext)
++	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)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 @@
+--- src/Makefile.in.orig	Tue Jun 22 11:21:05 1999
++++ src/Makefile.in	Tue Jun 22 11:21:17 1999
+@@ -98,7 +98,7 @@
  	(cd $(srcdir); $(RMF) Makefile)
  
  install: allbin alldoc