Upgrade to 2.4.7.

11 files changed, 48 insertions, 75 deletions

diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 5a52331ae3f..beee85bc3bb 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -3,12 +3,15 @@
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1998/03/16 07:13:53 steve Exp $
+# $Id: Makefile,v 1.16 1998/08/05 09:31:47 asami Exp $
 #
 
-DISTNAME=	rxvt-2.4.5
+DISTNAME=	rxvt-2.4.7
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/
+MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/  \
+		${MASTER_SITE_SUNSITE}  \
+		ftp://ftp.math.fu-berlin.de/pub/rxvt/devel/
+MASTER_SITE_SUBDIR= X11/terms
 
 MAINTAINER=	ports@FreeBSD.ORG
 
diff --git a/x11/rxvt-devel/distinfo b/x11/rxvt-devel/distinfo
index b5c773ff380..78b8da973bf 100644
--- a/x11/rxvt-devel/distinfo
+++ b/x11/rxvt-devel/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.5.tar.gz) = e8983c7382f1590e7fd86f1b2e14848a
+MD5 (rxvt-2.4.7.tar.gz) = 2dcadd25f224410201c28316b02f4ee9
diff --git a/x11/rxvt-devel/files/patch-aa b/x11/rxvt-devel/files/patch-aa
index e795ba20b73..4bff8943c4a 100644
--- a/x11/rxvt-devel/files/patch-aa
+++ b/x11/rxvt-devel/files/patch-aa
@@ -1,22 +1,10 @@
---- Makefile.in.orig	Sun Mar  8 09:47:15 1998
-+++ Makefile.in	Sun Mar  8 09:48:22 1998
-@@ -7,7 +7,7 @@
- first_rule: all
+--- Makefile.in.orig	Mon Apr 20 00:24:12 1998
++++ Makefile.in	Sun Oct  4 22:13:09 1998
+@@ -9,6 +9,7 @@
  dummy:
  
--subdirs = src doc rclock src/graphics
-+subdirs = src doc #rclock src/graphics
+ subdirs = src doc rclock src/graphics
++subdirs = src doc # rclock src/graphics
  
  DIST =	INSTALL configure Makefile Makefile.in
  
---- doc/Makefile.in.orig	Sun Mar  8 09:51:09 1998
-+++ doc/Makefile.in	Sun Mar  8 09:51:27 1998
-@@ -53,7 +53,7 @@
- 
- tags allbin:
- 
--alldoc:	lsm rxvt.1
-+alldoc:	rxvt.1
- 
- clean:
- 	$(RMF) $(VERNAME).lsm rxvt.1 *~
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 5a52331ae3f..beee85bc3bb 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -3,12 +3,15 @@
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1998/03/16 07:13:53 steve Exp $
+# $Id: Makefile,v 1.16 1998/08/05 09:31:47 asami Exp $
 #
 
-DISTNAME=	rxvt-2.4.5
+DISTNAME=	rxvt-2.4.7
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/
+MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/  \
+		${MASTER_SITE_SUNSITE}  \
+		ftp://ftp.math.fu-berlin.de/pub/rxvt/devel/
+MASTER_SITE_SUBDIR= X11/terms
 
 MAINTAINER=	ports@FreeBSD.ORG
 
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index b5c773ff380..78b8da973bf 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.5.tar.gz) = e8983c7382f1590e7fd86f1b2e14848a
+MD5 (rxvt-2.4.7.tar.gz) = 2dcadd25f224410201c28316b02f4ee9
diff --git a/x11/rxvt-unicode/files/patch-aa b/x11/rxvt-unicode/files/patch-aa
index e795ba20b73..4bff8943c4a 100644
--- a/x11/rxvt-unicode/files/patch-aa
+++ b/x11/rxvt-unicode/files/patch-aa
@@ -1,22 +1,10 @@
---- Makefile.in.orig	Sun Mar  8 09:47:15 1998
-+++ Makefile.in	Sun Mar  8 09:48:22 1998
-@@ -7,7 +7,7 @@
- first_rule: all
+--- Makefile.in.orig	Mon Apr 20 00:24:12 1998
++++ Makefile.in	Sun Oct  4 22:13:09 1998
+@@ -9,6 +9,7 @@
  dummy:
  
--subdirs = src doc rclock src/graphics
-+subdirs = src doc #rclock src/graphics
+ subdirs = src doc rclock src/graphics
++subdirs = src doc # rclock src/graphics
  
  DIST =	INSTALL configure Makefile Makefile.in
  
---- doc/Makefile.in.orig	Sun Mar  8 09:51:09 1998
-+++ doc/Makefile.in	Sun Mar  8 09:51:27 1998
-@@ -53,7 +53,7 @@
- 
- tags allbin:
- 
--alldoc:	lsm rxvt.1
-+alldoc:	rxvt.1
- 
- clean:
- 	$(RMF) $(VERNAME).lsm rxvt.1 *~
diff --git a/x11/rxvt-unicode/files/patch-ab b/x11/rxvt-unicode/files/patch-ab
index 1c5e36dd904..423b27ce8cf 100644
--- a/x11/rxvt-unicode/files/patch-ab
+++ b/x11/rxvt-unicode/files/patch-ab
@@ -1,11 +1,11 @@
---- src/command.c.orig	Sun Mar  8 09:48:42 1998
-+++ src/command.c	Sun Mar  8 09:49:08 1998
-@@ -505,7 +505,7 @@
+--- 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;
  
- #define	PTYCHAR1	"pqrstuvwxyz"
--#define	PTYCHAR2	"0123456789abcdef"
-+#define	PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
+ # 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++) {
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 5a52331ae3f..beee85bc3bb 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -3,12 +3,15 @@
 # Date created:         5th December 1994
 # Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1998/03/16 07:13:53 steve Exp $
+# $Id: Makefile,v 1.16 1998/08/05 09:31:47 asami Exp $
 #
 
-DISTNAME=	rxvt-2.4.5
+DISTNAME=	rxvt-2.4.7
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/
+MASTER_SITES=	ftp://ftp.math.fu-berlin.de/pub/rxvt/  \
+		${MASTER_SITE_SUNSITE}  \
+		ftp://ftp.math.fu-berlin.de/pub/rxvt/devel/
+MASTER_SITE_SUBDIR= X11/terms
 
 MAINTAINER=	ports@FreeBSD.ORG
 
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index b5c773ff380..78b8da973bf 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.5.tar.gz) = e8983c7382f1590e7fd86f1b2e14848a
+MD5 (rxvt-2.4.7.tar.gz) = 2dcadd25f224410201c28316b02f4ee9
diff --git a/x11/rxvt/files/patch-aa b/x11/rxvt/files/patch-aa
index e795ba20b73..4bff8943c4a 100644
--- a/x11/rxvt/files/patch-aa
+++ b/x11/rxvt/files/patch-aa
@@ -1,22 +1,10 @@
---- Makefile.in.orig	Sun Mar  8 09:47:15 1998
-+++ Makefile.in	Sun Mar  8 09:48:22 1998
-@@ -7,7 +7,7 @@
- first_rule: all
+--- Makefile.in.orig	Mon Apr 20 00:24:12 1998
++++ Makefile.in	Sun Oct  4 22:13:09 1998
+@@ -9,6 +9,7 @@
  dummy:
  
--subdirs = src doc rclock src/graphics
-+subdirs = src doc #rclock src/graphics
+ subdirs = src doc rclock src/graphics
++subdirs = src doc # rclock src/graphics
  
  DIST =	INSTALL configure Makefile Makefile.in
  
---- doc/Makefile.in.orig	Sun Mar  8 09:51:09 1998
-+++ doc/Makefile.in	Sun Mar  8 09:51:27 1998
-@@ -53,7 +53,7 @@
- 
- tags allbin:
- 
--alldoc:	lsm rxvt.1
-+alldoc:	rxvt.1
- 
- clean:
- 	$(RMF) $(VERNAME).lsm rxvt.1 *~
diff --git a/x11/rxvt/files/patch-ab b/x11/rxvt/files/patch-ab
index 1c5e36dd904..423b27ce8cf 100644
--- a/x11/rxvt/files/patch-ab
+++ b/x11/rxvt/files/patch-ab
@@ -1,11 +1,11 @@
---- src/command.c.orig	Sun Mar  8 09:48:42 1998
-+++ src/command.c	Sun Mar  8 09:49:08 1998
-@@ -505,7 +505,7 @@
+--- 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;
  
- #define	PTYCHAR1	"pqrstuvwxyz"
--#define	PTYCHAR2	"0123456789abcdef"
-+#define	PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
+ # 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++) {