14 files changed, 67 insertions, 67 deletions

diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index dc6293450231..619411b3da14 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -1,18 +1,18 @@
 # New ports collection Makefile for: rxvt
-# Version required:	2.4.11
+# Version required:	2.6.0
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.20 1999/03/15 04:23:51 steve Exp $
+# $Id: Makefile,v 1.21 1999/04/13 06:33:08 mharo Exp $
 #
 
-DISTNAME=	rxvt-2.4.11
+DISTNAME=	rxvt-2.6.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://mason.primenet.com.au/pub/rxvt/old/ \
+MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
+		ftp://mason.primenet.com.au/pub/rxvt/ \
 		http://wm.current.nu/files/ \
 		ftp://ftp.nstu.ru/pub/sources/x/
 
-
 MAINTAINER=	ports@FreeBSD.ORG
 
 USE_X_PREFIX=	yes
diff --git a/x11/rxvt-devel/distinfo b/x11/rxvt-devel/distinfo
index 300985ab8983..f688af9ab4c0 100644
--- a/x11/rxvt-devel/distinfo
+++ b/x11/rxvt-devel/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.11.tar.bz2) = 628bf6fd56f5bec2c9373eded4ba971b
+MD5 (rxvt-2.6.0.tar.bz2) = 8f6d86c2b76d7f2945d121191ef25158
diff --git a/x11/rxvt-devel/files/patch-aa b/x11/rxvt-devel/files/patch-aa
index 4bff8943c4a6..eb613fa36fe3 100644
--- a/x11/rxvt-devel/files/patch-aa
+++ b/x11/rxvt-devel/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Mon Apr 20 00:24:12 1998
-+++ Makefile.in	Sun Oct  4 22:13:09 1998
-@@ -9,6 +9,7 @@
+--- Makefile.in.orig	Sun Mar 28 21:31:37 1999
++++ Makefile.in	Tue Jun  8 11:07:52 1999
+@@ -10,6 +10,7 @@
  dummy:
  
  subdirs = src doc rclock src/graphics
 +subdirs = src doc # rclock src/graphics
  
- DIST =	INSTALL configure Makefile Makefile.in
+ DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff --git a/x11/rxvt-devel/files/patch-ac b/x11/rxvt-devel/files/patch-ac
index f62f9a27bbad..f8d932d23e78 100644
--- a/x11/rxvt-devel/files/patch-ac
+++ b/x11/rxvt-devel/files/patch-ac
@@ -1,13 +1,13 @@
---- doc/Makefile.in.orig	Wed Nov 18 01:20:14 1998
-+++ doc/Makefile.in	Sun Jan 10 18:54:05 1999
-@@ -63,8 +63,8 @@
+--- doc/Makefile.in.orig	Tue Jun  8 02:53:55 1999
++++ doc/Makefile.in	Tue Jun  8 11:12:40 1999
+@@ -66,8 +66,8 @@
  rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
  	yodl2man -orxvt.tbl yodl/rxvt.yo
  
--rxvt.1: rxvt.tbl
--	tbl rxvt.tbl > $@
-+#rxvt.1: rxvt.tbl
-+#	tbl rxvt.tbl > $@
+-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.tbl Makefile
++#	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
  
  rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
  	yodl2html -o$@ yodl/rxvt.yo
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index dc6293450231..619411b3da14 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,18 +1,18 @@
 # New ports collection Makefile for: rxvt
-# Version required:	2.4.11
+# Version required:	2.6.0
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.20 1999/03/15 04:23:51 steve Exp $
+# $Id: Makefile,v 1.21 1999/04/13 06:33:08 mharo Exp $
 #
 
-DISTNAME=	rxvt-2.4.11
+DISTNAME=	rxvt-2.6.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://mason.primenet.com.au/pub/rxvt/old/ \
+MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
+		ftp://mason.primenet.com.au/pub/rxvt/ \
 		http://wm.current.nu/files/ \
 		ftp://ftp.nstu.ru/pub/sources/x/
 
-
 MAINTAINER=	ports@FreeBSD.ORG
 
 USE_X_PREFIX=	yes
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 300985ab8983..f688af9ab4c0 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.11.tar.bz2) = 628bf6fd56f5bec2c9373eded4ba971b
+MD5 (rxvt-2.6.0.tar.bz2) = 8f6d86c2b76d7f2945d121191ef25158
diff --git a/x11/rxvt-unicode/files/patch-aa b/x11/rxvt-unicode/files/patch-aa
index 4bff8943c4a6..eb613fa36fe3 100644
--- a/x11/rxvt-unicode/files/patch-aa
+++ b/x11/rxvt-unicode/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Mon Apr 20 00:24:12 1998
-+++ Makefile.in	Sun Oct  4 22:13:09 1998
-@@ -9,6 +9,7 @@
+--- Makefile.in.orig	Sun Mar 28 21:31:37 1999
++++ Makefile.in	Tue Jun  8 11:07:52 1999
+@@ -10,6 +10,7 @@
  dummy:
  
  subdirs = src doc rclock src/graphics
 +subdirs = src doc # rclock src/graphics
  
- DIST =	INSTALL configure Makefile Makefile.in
+ DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff --git a/x11/rxvt-unicode/files/patch-ab b/x11/rxvt-unicode/files/patch-ab
index 423b27ce8cf4..1d27c78043f4 100644
--- a/x11/rxvt-unicode/files/patch-ab
+++ b/x11/rxvt-unicode/files/patch-ab
@@ -1,11 +1,11 @@
---- src/command.c.orig	Thu Aug 27 18:29:11 1998
-+++ src/command.c	Sun Oct  4 22:21:52 1998
-@@ -516,7 +516,7 @@
-     ttydev = tty_name;
+--- src/command.c.orig	Thu Jun  3 06:17:09 1999
++++ src/command.c	Tue Jun  8 11:11:25 1999
+@@ -316,7 +316,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;
- 	for (c2 = PTYCHAR2; *c2; c2++) {
++# define PTYCHAR2	"0123456789abcdefhijklmnopqrstuv"
+ 	for (c1 = PTYCHAR1; *c1; c1++) {
+ 	    ptydev[len] = ttydev[len] = *c1;
+ 	    for (c2 = PTYCHAR2; *c2; c2++) {
diff --git a/x11/rxvt-unicode/files/patch-ac b/x11/rxvt-unicode/files/patch-ac
index f62f9a27bbad..f8d932d23e78 100644
--- a/x11/rxvt-unicode/files/patch-ac
+++ b/x11/rxvt-unicode/files/patch-ac
@@ -1,13 +1,13 @@
---- doc/Makefile.in.orig	Wed Nov 18 01:20:14 1998
-+++ doc/Makefile.in	Sun Jan 10 18:54:05 1999
-@@ -63,8 +63,8 @@
+--- doc/Makefile.in.orig	Tue Jun  8 02:53:55 1999
++++ doc/Makefile.in	Tue Jun  8 11:12:40 1999
+@@ -66,8 +66,8 @@
  rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
  	yodl2man -orxvt.tbl yodl/rxvt.yo
  
--rxvt.1: rxvt.tbl
--	tbl rxvt.tbl > $@
-+#rxvt.1: rxvt.tbl
-+#	tbl rxvt.tbl > $@
+-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.tbl Makefile
++#	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
  
  rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
  	yodl2html -o$@ yodl/rxvt.yo
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index dc6293450231..619411b3da14 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,18 +1,18 @@
 # New ports collection Makefile for: rxvt
-# Version required:	2.4.11
+# Version required:	2.6.0
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.20 1999/03/15 04:23:51 steve Exp $
+# $Id: Makefile,v 1.21 1999/04/13 06:33:08 mharo Exp $
 #
 
-DISTNAME=	rxvt-2.4.11
+DISTNAME=	rxvt-2.6.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://mason.primenet.com.au/pub/rxvt/old/ \
+MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
+		ftp://mason.primenet.com.au/pub/rxvt/ \
 		http://wm.current.nu/files/ \
 		ftp://ftp.nstu.ru/pub/sources/x/
 
-
 MAINTAINER=	ports@FreeBSD.ORG
 
 USE_X_PREFIX=	yes
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index 300985ab8983..f688af9ab4c0 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.11.tar.bz2) = 628bf6fd56f5bec2c9373eded4ba971b
+MD5 (rxvt-2.6.0.tar.bz2) = 8f6d86c2b76d7f2945d121191ef25158
diff --git a/x11/rxvt/files/patch-aa b/x11/rxvt/files/patch-aa
index 4bff8943c4a6..eb613fa36fe3 100644
--- a/x11/rxvt/files/patch-aa
+++ b/x11/rxvt/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Mon Apr 20 00:24:12 1998
-+++ Makefile.in	Sun Oct  4 22:13:09 1998
-@@ -9,6 +9,7 @@
+--- Makefile.in.orig	Sun Mar 28 21:31:37 1999
++++ Makefile.in	Tue Jun  8 11:07:52 1999
+@@ -10,6 +10,7 @@
  dummy:
  
  subdirs = src doc rclock src/graphics
 +subdirs = src doc # rclock src/graphics
  
- DIST =	INSTALL configure Makefile Makefile.in
+ DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff --git a/x11/rxvt/files/patch-ab b/x11/rxvt/files/patch-ab
index 423b27ce8cf4..1d27c78043f4 100644
--- a/x11/rxvt/files/patch-ab
+++ b/x11/rxvt/files/patch-ab
@@ -1,11 +1,11 @@
---- src/command.c.orig	Thu Aug 27 18:29:11 1998
-+++ src/command.c	Sun Oct  4 22:21:52 1998
-@@ -516,7 +516,7 @@
-     ttydev = tty_name;
+--- src/command.c.orig	Thu Jun  3 06:17:09 1999
++++ src/command.c	Tue Jun  8 11:11:25 1999
+@@ -316,7 +316,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;
- 	for (c2 = PTYCHAR2; *c2; c2++) {
++# define PTYCHAR2	"0123456789abcdefhijklmnopqrstuv"
+ 	for (c1 = PTYCHAR1; *c1; c1++) {
+ 	    ptydev[len] = ttydev[len] = *c1;
+ 	    for (c2 = PTYCHAR2; *c2; c2++) {
diff --git a/x11/rxvt/files/patch-ac b/x11/rxvt/files/patch-ac
index f62f9a27bbad..f8d932d23e78 100644
--- a/x11/rxvt/files/patch-ac
+++ b/x11/rxvt/files/patch-ac
@@ -1,13 +1,13 @@
---- doc/Makefile.in.orig	Wed Nov 18 01:20:14 1998
-+++ doc/Makefile.in	Sun Jan 10 18:54:05 1999
-@@ -63,8 +63,8 @@
+--- doc/Makefile.in.orig	Tue Jun  8 02:53:55 1999
++++ doc/Makefile.in	Tue Jun  8 11:12:40 1999
+@@ -66,8 +66,8 @@
  rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
  	yodl2man -orxvt.tbl yodl/rxvt.yo
  
--rxvt.1: rxvt.tbl
--	tbl rxvt.tbl > $@
-+#rxvt.1: rxvt.tbl
-+#	tbl rxvt.tbl > $@
+-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.tbl Makefile
++#	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
  
  rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
  	yodl2html -o$@ yodl/rxvt.yo