Upgrade to 2.20.

11 files changed, 24 insertions, 131 deletions

diff --git a/x11/rxvt-devel/distinfo b/x11/rxvt-devel/distinfo
index f78eaebd0643..5b1c00e929a5 100644
--- a/x11/rxvt-devel/distinfo
+++ b/x11/rxvt-devel/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.16.tar.gz) = b7e468ba8b7dd335f5462e62aa2a566a
+MD5 (rxvt-2.20.tar.gz) = 860432f0d146d0cdf4630967f6c94ae3
diff --git a/x11/rxvt-devel/files/patch-aa b/x11/rxvt-devel/files/patch-aa
index db6bfb619da0..023eb0f45fff 100644
--- a/x11/rxvt-devel/files/patch-aa
+++ b/x11/rxvt-devel/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Apr  2 09:00:00 1996
-+++ Makefile.in	Sat Dec  7 16:38:15 1996
-@@ -9,7 +9,7 @@
+--- Makefile.in.orig	Fri Sep 27 10:48:20 1996
++++ Makefile.in	Mon Feb 24 01:09:28 1997
+@@ -7,7 +7,7 @@
  first_rule: all
  dummy:
  
--subdirs=src doc rclock test/graphics test/vttest
-+subdirs=src doc #rclock test/graphics test/vttest
+-subdirs = src doc rclock src/graphics
++subdirs = src doc #rclock src/graphics
+ 
+ DIST_ETC = etc/XTerm.ad etc/color etc/termcap etc/terminfo etc/xmkdir
  
- DIST_ETC = etc/xmkdir etc/XTerm.ad etc/termcap etc/terminfo
- DIST_OLD = etc/old/Imakefile etc/old/Makefile etc/old/config.h
diff --git a/x11/rxvt-devel/files/patch-ac b/x11/rxvt-devel/files/patch-ac
deleted file mode 100644
index b1c6fd150e1f..000000000000
--- a/x11/rxvt-devel/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Tue Apr  2 09:00:00 1996
-+++ src/Makefile.in	Sat Dec  7 17:29:38 1996
-@@ -6,7 +6,7 @@
- first_rule: all
- dummy:
- 
--CFLAGS = $(XCFLAGS)
-+CFLAGS = $(XCFLAGS) -DFREEBSD
- CPPFLAGS = $(XCPPFLAGS)
- LDFLAGS = $(XLDFLAGS)
- DEFS = $(XDEFS)
-@@ -34,7 +34,7 @@
- all: rxvt
- 
- rxvt: VERSION depend $(OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lX11
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -L$(prefix)/lib -lX11
- 
- VERSION:
- 	@echo "#define VERSION \""$(VERSION)"\""
-@@ -72,7 +72,7 @@
- depend dep: .depend
- 
- .depend:
--	$(DEPEND) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
-+	$(DEPEND) -I$(XINC) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
- 	@touch .depend
- 
- # ------------------------------------------------------------------------
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index f78eaebd0643..5b1c00e929a5 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.16.tar.gz) = b7e468ba8b7dd335f5462e62aa2a566a
+MD5 (rxvt-2.20.tar.gz) = 860432f0d146d0cdf4630967f6c94ae3
diff --git a/x11/rxvt-unicode/files/patch-aa b/x11/rxvt-unicode/files/patch-aa
index db6bfb619da0..023eb0f45fff 100644
--- a/x11/rxvt-unicode/files/patch-aa
+++ b/x11/rxvt-unicode/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Apr  2 09:00:00 1996
-+++ Makefile.in	Sat Dec  7 16:38:15 1996
-@@ -9,7 +9,7 @@
+--- Makefile.in.orig	Fri Sep 27 10:48:20 1996
++++ Makefile.in	Mon Feb 24 01:09:28 1997
+@@ -7,7 +7,7 @@
  first_rule: all
  dummy:
  
--subdirs=src doc rclock test/graphics test/vttest
-+subdirs=src doc #rclock test/graphics test/vttest
+-subdirs = src doc rclock src/graphics
++subdirs = src doc #rclock src/graphics
+ 
+ DIST_ETC = etc/XTerm.ad etc/color etc/termcap etc/terminfo etc/xmkdir
  
- DIST_ETC = etc/xmkdir etc/XTerm.ad etc/termcap etc/terminfo
- DIST_OLD = etc/old/Imakefile etc/old/Makefile etc/old/config.h
diff --git a/x11/rxvt-unicode/files/patch-ab b/x11/rxvt-unicode/files/patch-ab
deleted file mode 100644
index 0c8209f7823f..000000000000
--- a/x11/rxvt-unicode/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Make.common.in.orig	Tue Apr  2 09:00:00 1996
-+++ Make.common.in	Sat Dec  7 17:08:14 1996
-@@ -42,6 +42,7 @@
- 
- # Flags & libs
- # cannot use := to append (except GNU make), so do it this way.
-+XINC = $(prefix)/include -I..
- XCFLAGS = @CFLAGS@
- XCPPFLAGS = @CPPFLAGS@ $(XINC)
- XLDFLAGS = @LDFLAGS@
diff --git a/x11/rxvt-unicode/files/patch-ac b/x11/rxvt-unicode/files/patch-ac
deleted file mode 100644
index b1c6fd150e1f..000000000000
--- a/x11/rxvt-unicode/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Tue Apr  2 09:00:00 1996
-+++ src/Makefile.in	Sat Dec  7 17:29:38 1996
-@@ -6,7 +6,7 @@
- first_rule: all
- dummy:
- 
--CFLAGS = $(XCFLAGS)
-+CFLAGS = $(XCFLAGS) -DFREEBSD
- CPPFLAGS = $(XCPPFLAGS)
- LDFLAGS = $(XLDFLAGS)
- DEFS = $(XDEFS)
-@@ -34,7 +34,7 @@
- all: rxvt
- 
- rxvt: VERSION depend $(OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lX11
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -L$(prefix)/lib -lX11
- 
- VERSION:
- 	@echo "#define VERSION \""$(VERSION)"\""
-@@ -72,7 +72,7 @@
- depend dep: .depend
- 
- .depend:
--	$(DEPEND) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
-+	$(DEPEND) -I$(XINC) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
- 	@touch .depend
- 
- # ------------------------------------------------------------------------
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index f78eaebd0643..5b1c00e929a5 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.16.tar.gz) = b7e468ba8b7dd335f5462e62aa2a566a
+MD5 (rxvt-2.20.tar.gz) = 860432f0d146d0cdf4630967f6c94ae3
diff --git a/x11/rxvt/files/patch-aa b/x11/rxvt/files/patch-aa
index db6bfb619da0..023eb0f45fff 100644
--- a/x11/rxvt/files/patch-aa
+++ b/x11/rxvt/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Apr  2 09:00:00 1996
-+++ Makefile.in	Sat Dec  7 16:38:15 1996
-@@ -9,7 +9,7 @@
+--- Makefile.in.orig	Fri Sep 27 10:48:20 1996
++++ Makefile.in	Mon Feb 24 01:09:28 1997
+@@ -7,7 +7,7 @@
  first_rule: all
  dummy:
  
--subdirs=src doc rclock test/graphics test/vttest
-+subdirs=src doc #rclock test/graphics test/vttest
+-subdirs = src doc rclock src/graphics
++subdirs = src doc #rclock src/graphics
+ 
+ DIST_ETC = etc/XTerm.ad etc/color etc/termcap etc/terminfo etc/xmkdir
  
- DIST_ETC = etc/xmkdir etc/XTerm.ad etc/termcap etc/terminfo
- DIST_OLD = etc/old/Imakefile etc/old/Makefile etc/old/config.h
diff --git a/x11/rxvt/files/patch-ab b/x11/rxvt/files/patch-ab
deleted file mode 100644
index 0c8209f7823f..000000000000
--- a/x11/rxvt/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Make.common.in.orig	Tue Apr  2 09:00:00 1996
-+++ Make.common.in	Sat Dec  7 17:08:14 1996
-@@ -42,6 +42,7 @@
- 
- # Flags & libs
- # cannot use := to append (except GNU make), so do it this way.
-+XINC = $(prefix)/include -I..
- XCFLAGS = @CFLAGS@
- XCPPFLAGS = @CPPFLAGS@ $(XINC)
- XLDFLAGS = @LDFLAGS@
diff --git a/x11/rxvt/files/patch-ac b/x11/rxvt/files/patch-ac
deleted file mode 100644
index b1c6fd150e1f..000000000000
--- a/x11/rxvt/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Tue Apr  2 09:00:00 1996
-+++ src/Makefile.in	Sat Dec  7 17:29:38 1996
-@@ -6,7 +6,7 @@
- first_rule: all
- dummy:
- 
--CFLAGS = $(XCFLAGS)
-+CFLAGS = $(XCFLAGS) -DFREEBSD
- CPPFLAGS = $(XCPPFLAGS)
- LDFLAGS = $(XLDFLAGS)
- DEFS = $(XDEFS)
-@@ -34,7 +34,7 @@
- all: rxvt
- 
- rxvt: VERSION depend $(OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lX11
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -L$(prefix)/lib -lX11
- 
- VERSION:
- 	@echo "#define VERSION \""$(VERSION)"\""
-@@ -72,7 +72,7 @@
- depend dep: .depend
- 
- .depend:
--	$(DEPEND) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
-+	$(DEPEND) -I$(XINC) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
- 	@touch .depend
- 
- # ------------------------------------------------------------------------