Update to version 2.6.0. Also set USE_BZIP2 so that the other rxvt

port can share the distfile with this one.

PR:		12083
Submitted by:	maintainer

5 files changed, 45 insertions, 42 deletions

diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index a5f5886a41c5..0d08bd046e26 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -1,24 +1,27 @@
-# New ports collection Makefile for: rxvt
-# Version required:	2.6PRE4
+# New ports collection Makefile for: ja-rxvt
+# Version required:	2.6.0
 # Date created:         11 May 1999
 # Whom:                 HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
 #
-# $Id: Makefile,v 1.8 1999/05/01 02:08:00 steve Exp $
+# $Id: Makefile,v 1.9 1999/05/10 16:27:33 flathill Exp $
 #
 
-DISTNAME=	rxvt-2.6.PRE4
-PKGNAME=	ja-rxvt-2.6p4
+DISTNAME=	rxvt-2.6.0
+PKGNAME=	ja-rxvt-2.6.0
 CATEGORIES=	japanese x11
-MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/devel/
+MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
 
 MAINTAINER=	honda@kashio.info.mie-u.ac.jp
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 MAN1=		rxvt.1
-CONFIGURE_ARGS=	--enable-xpm-background --enable-transparency --enable-menubar --enable-graphics --enable-xim --enable-kanji --disable-backspace-key --disable-delete-key
+CONFIGURE_ARGS+=--enable-xpm-background --enable-transparency \
+		--enable-menubar --enable-graphics --enable-xim \
+		--enable-kanji --disable-backspace-key --disable-delete-key
 
 DOCDIR=		${PREFIX}/share/doc/ja/rxvt
 RXVTLIB=	${PREFIX}/lib/X11/rxvt
diff --git a/japanese/rxvt/distinfo b/japanese/rxvt/distinfo
index d9dc966ad457..f688af9ab4c0 100644
--- a/japanese/rxvt/distinfo
+++ b/japanese/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.6.PRE4.tar.gz) = 52f5902b6f4905442c087580c9261b80
+MD5 (rxvt-2.6.0.tar.bz2) = 8f6d86c2b76d7f2945d121191ef25158
diff --git a/japanese/rxvt/files/patch-ab b/japanese/rxvt/files/patch-ab
index 04db3777b050..83481d130f0e 100644
--- a/japanese/rxvt/files/patch-ab
+++ b/japanese/rxvt/files/patch-ab
@@ -1,7 +1,7 @@
-*** doc/Makefile.in.orig	Sun Jan 10 18:46:43 1999
---- doc/Makefile.in	Fri Jan 29 23:49:25 1999
+*** doc/Makefile.in.orig	Tue Jun  8 18:53:55 1999
+--- doc/Makefile.in	Tue Jun  8 21:57:59 1999
 ***************
-*** 38,44 ****
+*** 39,45 ****
   
   #-------------------------------------------------------------------------
   
@@ -9,7 +9,7 @@
   	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
   
   SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
---- 38,44 ----
+--- 39,45 ----
   
   #-------------------------------------------------------------------------
   
@@ -18,7 +18,7 @@
   
   SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
 ***************
-*** 54,60 ****
+*** 55,61 ****
   
   tags allbin:
   
@@ -26,7 +26,7 @@
   
   yodl/versioninfo.yo: yodl/versioninfo.yo.in ../autoconf/Make.common.in
   	$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
---- 54,60 ----
+--- 55,61 ----
   
   tags allbin:
   
@@ -35,7 +35,7 @@
   yodl/versioninfo.yo: yodl/versioninfo.yo.in ../autoconf/Make.common.in
   	$(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
 ***************
-*** 65,81 ****
+*** 66,82 ****
   rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
   	yodl2man -orxvt.tbl yodl/rxvt.yo
   
@@ -53,7 +53,7 @@
   
   clean:
   	$(RMF) rxvt.man *~ yodl/*~
---- 65,77 ----
+--- 66,78 ----
   rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
   	yodl2man -orxvt.tbl yodl/rxvt.yo
   
@@ -68,7 +68,7 @@
   clean:
   	$(RMF) rxvt.man *~ yodl/*~
 ***************
-*** 85,92 ****
+*** 86,93 ****
   
   distclean:
   
@@ -77,7 +77,7 @@
   
   uninstall:
   	-cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
---- 81,91 ----
+--- 82,92 ----
   
   distclean:
   
diff --git a/japanese/rxvt/files/patch-ad b/japanese/rxvt/files/patch-ad
index 211048793a30..e9fa7c4aeef0 100644
--- a/japanese/rxvt/files/patch-ad
+++ b/japanese/rxvt/files/patch-ad
@@ -1,19 +1,19 @@
-*** src/command.c.orig	Mon May 10 09:32:21 1999
---- src/command.c	Mon May 10 17:55:44 1999
+*** src/command.c.orig	Thu Jun  3 22:17:09 1999
+--- src/command.c	Tue Jun  8 22:01:47 1999
 ***************
-*** 303,309 ****
-      ttydev = tty_name;
+*** 316,322 ****
+  	ttydev = tty_name;
   
   # define PTYCHAR1	"pqrstuvwxyz"
 ! # define PTYCHAR2	"0123456789abcdef"
-      for (c1 = PTYCHAR1; *c1; c1++) {
-  	ptydev[len] = ttydev[len] = *c1;
-  	for (c2 = PTYCHAR2; *c2; c2++) {
---- 303,309 ----
-      ttydev = tty_name;
+  	for (c1 = PTYCHAR1; *c1; c1++) {
+  	    ptydev[len] = ttydev[len] = *c1;
+  	    for (c2 = PTYCHAR2; *c2; c2++) {
+--- 316,322 ----
+  	ttydev = tty_name;
   
   # define PTYCHAR1	"pqrstuvwxyz"
 ! # define PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
-      for (c1 = PTYCHAR1; *c1; c1++) {
-  	ptydev[len] = ttydev[len] = *c1;
-  	for (c2 = PTYCHAR2; *c2; c2++) {
+  	for (c1 = PTYCHAR1; *c1; c1++) {
+  	    ptydev[len] = ttydev[len] = *c1;
+  	    for (c2 = PTYCHAR2; *c2; c2++) {
diff --git a/japanese/rxvt/files/patch-aj b/japanese/rxvt/files/patch-aj
index 99a4d87226c4..5e54ab2cb519 100644
--- a/japanese/rxvt/files/patch-aj
+++ b/japanese/rxvt/files/patch-aj
@@ -1,5 +1,5 @@
-*** src/feature.h.orig	Sun Mar 28 16:36:48 1999
---- src/feature.h	Mon May 10 17:56:35 1999
+*** src/feature.h.orig	Fri Jun  4 00:01:38 1999
+--- src/feature.h	Tue Jun  8 22:09:08 1999
 ***************
 *** 153,159 ****
    * This has been superceded and is only for you older users
@@ -18,21 +18,21 @@
   /*
    * To use
 ***************
-*** 359,366 ****
+*** 365,372 ****
   #ifdef KANJI
   # define NFONTS		5
   # define FONT0_IDX	2
 ! # define MFONT_LIST	"k14", "jiskan16", "jiskan18", "jiskan24", "jiskan26"
 ! # define NFONT_LIST	"7x14", "8x16", "9x18", "12x24", "13x26"
-  #else
-  # ifdef ZH
-  #  define NFONTS	5
---- 359,366 ----
+  #endif
+  #ifdef ZH
+  # define NFONTS		5
+--- 365,372 ----
   #ifdef KANJI
   # define NFONTS		5
   # define FONT0_IDX	2
 ! # define MFONT_LIST	"k14", "k10", "k12", "kanji16", "kanji24"
 ! # define NFONT_LIST	"7x14", "a10", "r12", "8x16", "12x24"
-  #else
-  # ifdef ZH
-  #  define NFONTS	5
+  #endif
+  #ifdef ZH
+  # define NFONTS		5