*** empty log message ***

10 files changed, 62 insertions, 54 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 17a2c257261a..65de6fbcbd8e 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -63,6 +63,7 @@
     SUBDIR += ruby-kde
     SUBDIR += ruby-kde-i18n
     SUBDIR += rxvt
+    SUBDIR += rxvt-devel
     SUBDIR += stockticker_applet
     SUBDIR += sxpc
     SUBDIR += tkgoodstuff
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 483d92ade470..bfa04428abfe 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -8,15 +8,16 @@
 # (and maybe ports/chinese/rxvt) when you upgrade rxvt.  These ports all use
 # the same distfile.
 
-PORTNAME=	rxvt
+PORTNAME=	rxvt-devel
 PORTVERSION= 	2.7.3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://mason.primenet.com.au/pub/rxvt/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/terms
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \
+		ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt/
+DISTNAME=	rxvt-${PORTVERSION}
 
-PATCH_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
+PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	rxvt-2.7.3.patch1.gz
 PATCH_DIST_STRIP+=      -p1
 
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 483d92ade470..ce4caaaa9081 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -9,16 +9,12 @@
 # the same distfile.
 
 PORTNAME=	rxvt
-PORTVERSION= 	2.7.3
+PORTVERSION= 	2.6.3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://mason.primenet.com.au/pub/rxvt/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/terms
-
-PATCH_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
-PATCHFILES=	rxvt-2.7.3.patch1.gz
-PATCH_DIST_STRIP+=      -p1
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \
+		ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt/
 
 MAINTAINER=	lioux@linf.unb.br
 
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index efc13796de38..faef4dd5f891 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,2 +1 @@
-MD5 (rxvt-2.7.3.tar.bz2) = 4f22d749152ba717c5b716df43801800
-MD5 (rxvt-2.7.3.patch1.gz) = 348fca4eb5e7bc41d070745e3655d184
+MD5 (rxvt-2.6.3.tar.bz2) = 4aae8a7e478cd09d3701faf35c6300c9
diff --git a/x11/rxvt-unicode/files/patch-aa b/x11/rxvt-unicode/files/patch-aa
index 6474271cd903..e90f485112ef 100644
--- a/x11/rxvt-unicode/files/patch-aa
+++ b/x11/rxvt-unicode/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Dec 24 20:05:41 1999
-+++ Makefile.in	Fri Dec 24 20:05:48 1999
+--- Makefile.in.orig	Mon Aug 21 23:31:36 2000
++++ Makefile.in	Mon Aug 21 23:31:51 2000
 @@ -9,7 +9,7 @@
  first_rule: all
  dummy:
  
--subdirs = src doc rclock src/graphics src/test
-+subdirs = src doc # rclock src/graphics src/test
+-subdirs = src doc rclock src/graphics
++subdirs = src doc
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff --git a/x11/rxvt-unicode/files/patch-ac b/x11/rxvt-unicode/files/patch-ac
index 6dc0d7630cb4..5e70c833507b 100644
--- a/x11/rxvt-unicode/files/patch-ac
+++ b/x11/rxvt-unicode/files/patch-ac
@@ -1,12 +1,20 @@
---- doc/Makefile.in	Sun Mar 12 00:26:26 2000
-+++ doc/Makefile.in.new	Mon Mar 27 01:39:53 2000
-@@ -40,9 +40,6 @@
- 
- all:	rxvt.1
- 
--rxvt.1: rxvt.tbl Makefile
--	@if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
--
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- 	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
- 	     -e 's%@RXVT_DATE@%$(DATE)%g;'\
+--- autoconf/config.h.in.orig	Mon Aug 21 23:33:43 2000
++++ autoconf/config.h.in	Mon Aug 21 23:34:39 2000
+@@ -161,7 +161,7 @@
+ #undef HAVE_UTMP_HOST
+ 
+ /* Define location of utmp */
+-#undef RXVT_UTMP_FILE
++#define RXVT_UTMP_FILE "/var/run/utmp"
+ 
+ /* Define in utmpx.h has struct utmpx */
+ #undef HAVE_STRUCT_UTMPX
+@@ -173,7 +173,7 @@
+ #undef RXVT_UTMPX_FILE
+ 
+ /* Define location of wtmp */
+-#undef RXVT_WTMP_FILE
++#define RXVT_WTMP_FILE "/var/log/wtmp"
+ 
+ /* Define location of wtmpx */
+ #undef RXVT_WTMPX_FILE
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 483d92ade470..ce4caaaa9081 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -9,16 +9,12 @@
 # the same distfile.
 
 PORTNAME=	rxvt
-PORTVERSION= 	2.7.3
+PORTVERSION= 	2.6.3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://mason.primenet.com.au/pub/rxvt/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/terms
-
-PATCH_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
-PATCHFILES=	rxvt-2.7.3.patch1.gz
-PATCH_DIST_STRIP+=      -p1
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \
+		ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt/
 
 MAINTAINER=	lioux@linf.unb.br
 
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index efc13796de38..faef4dd5f891 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1,2 +1 @@
-MD5 (rxvt-2.7.3.tar.bz2) = 4f22d749152ba717c5b716df43801800
-MD5 (rxvt-2.7.3.patch1.gz) = 348fca4eb5e7bc41d070745e3655d184
+MD5 (rxvt-2.6.3.tar.bz2) = 4aae8a7e478cd09d3701faf35c6300c9
diff --git a/x11/rxvt/files/patch-aa b/x11/rxvt/files/patch-aa
index 6474271cd903..e90f485112ef 100644
--- a/x11/rxvt/files/patch-aa
+++ b/x11/rxvt/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Dec 24 20:05:41 1999
-+++ Makefile.in	Fri Dec 24 20:05:48 1999
+--- Makefile.in.orig	Mon Aug 21 23:31:36 2000
++++ Makefile.in	Mon Aug 21 23:31:51 2000
 @@ -9,7 +9,7 @@
  first_rule: all
  dummy:
  
--subdirs = src doc rclock src/graphics src/test
-+subdirs = src doc # rclock src/graphics src/test
+-subdirs = src doc rclock src/graphics
++subdirs = src doc
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff --git a/x11/rxvt/files/patch-ac b/x11/rxvt/files/patch-ac
index 6dc0d7630cb4..5e70c833507b 100644
--- a/x11/rxvt/files/patch-ac
+++ b/x11/rxvt/files/patch-ac
@@ -1,12 +1,20 @@
---- doc/Makefile.in	Sun Mar 12 00:26:26 2000
-+++ doc/Makefile.in.new	Mon Mar 27 01:39:53 2000
-@@ -40,9 +40,6 @@
- 
- all:	rxvt.1
- 
--rxvt.1: rxvt.tbl Makefile
--	@if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
--
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- 	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
- 	     -e 's%@RXVT_DATE@%$(DATE)%g;'\
+--- autoconf/config.h.in.orig	Mon Aug 21 23:33:43 2000
++++ autoconf/config.h.in	Mon Aug 21 23:34:39 2000
+@@ -161,7 +161,7 @@
+ #undef HAVE_UTMP_HOST
+ 
+ /* Define location of utmp */
+-#undef RXVT_UTMP_FILE
++#define RXVT_UTMP_FILE "/var/run/utmp"
+ 
+ /* Define in utmpx.h has struct utmpx */
+ #undef HAVE_STRUCT_UTMPX
+@@ -173,7 +173,7 @@
+ #undef RXVT_UTMPX_FILE
+ 
+ /* Define location of wtmp */
+-#undef RXVT_WTMP_FILE
++#define RXVT_WTMP_FILE "/var/log/wtmp"
+ 
+ /* Define location of wtmpx */
+ #undef RXVT_WTMPX_FILE