Upgrade to 4.2.

4 files changed, 10 insertions, 22 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 3ce2f582bd09..c5f43fb1c9ed 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rxvt-unicode
-PORTVERSION=	4.1
+PORTVERSION=	4.2
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 804a6b232c7a..aca59f9c93b5 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,2 +1,2 @@
-MD5 (rxvt-unicode-4.1.tar.bz2) = c3924ae12a8f9dbe1387ede052385e3c
-SIZE (rxvt-unicode-4.1.tar.bz2) = 797520
+MD5 (rxvt-unicode-4.2.tar.bz2) = 4fdaaf061a9990060715393e5c44a639
+SIZE (rxvt-unicode-4.2.tar.bz2) = 829353
diff --git a/x11/rxvt-unicode/files/patch-src::command.C b/x11/rxvt-unicode/files/patch-src::command.C
index d2d106c954a9..574168368631 100644
--- a/x11/rxvt-unicode/files/patch-src::command.C
+++ b/x11/rxvt-unicode/files/patch-src::command.C
@@ -1,16 +1,15 @@
---- src/command.C.orig	Sun Sep  5 11:25:22 2004
-+++ src/command.C	Wed Oct 13 22:55:27 2004
-@@ -51,6 +51,9 @@
+--- src/command.C.orig	Wed Dec  1 01:41:39 2004
++++ src/command.C	Wed Dec  1 21:25:37 2004
+@@ -51,6 +51,8 @@
  #include "command.h"
  
  #include <wchar.h>
 +#include <sys/param.h>
 +#include <sys/types.h>
-+#include <signal.h>
+ #include <signal.h>
  
  /*----------------------------------------------------------------------*/
- 
-@@ -2697,7 +2700,9 @@
+@@ -2698,7 +2700,9 @@
        if (len == (size_t)-2)
          {
            // the mbstate stores incomplete sequences. didn't know this :/
@@ -20,7 +19,7 @@
            break;
          }
  
-@@ -4295,7 +4300,7 @@
+@@ -4296,7 +4300,7 @@
      {
        if (v_buflen == 0)
          {
@@ -29,7 +28,7 @@
  
            if ((unsigned int)written == len)
              return;
-@@ -4313,7 +4318,7 @@
+@@ -4314,7 +4318,7 @@
  
    for (;;)
      {
diff --git a/x11/rxvt-unicode/files/patch-src::rxvtfont.C b/x11/rxvt-unicode/files/patch-src::rxvtfont.C
deleted file mode 100644
index 7bc04127d97a..000000000000
--- a/x11/rxvt-unicode/files/patch-src::rxvtfont.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rxvtfont.C.orig	Wed Sep  8 13:44:38 2004
-+++ src/rxvtfont.C	Sun Oct  3 03:07:41 2004
-@@ -345,7 +345,7 @@
-           uint32_t *a = linedraw_command + (offs >> 4);
-           uint32_t *b = a + (offs & 15);
- 
--          int W = r->TermWin.fwidth;
-+          int W = r->TermWin.fwidth * wcwidth(t);
-           int H = r->TermWin.fheight;
- 
-           int x_[16];