Update to mrxvt-0.5.4.

Changes: bugfixes

5 files changed, 10 insertions, 68 deletions

diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index f5873ef4329..a58a60dc5fd 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2008/03/31 20:28:28 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/15 20:53:21 tnn Exp $
 #
 
-DISTNAME=	mrxvt-0.5.3
-PKGREVISION=	3
+DISTNAME=	mrxvt-0.5.4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=materm/}
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	no-scroll-with-buffer-mrxvt-0.5.3.patch
+PATCHFILES=	mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
 
 MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://materm.sourceforge.net/
diff --git a/x11/mrxvt/distinfo b/x11/mrxvt/distinfo
index 16774b90859..898290f4522 100644
--- a/x11/mrxvt/distinfo
+++ b/x11/mrxvt/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/03/31 20:28:28 tnn Exp $
+$NetBSD: distinfo,v 1.7 2009/07/15 20:53:21 tnn Exp $
 
-SHA1 (mrxvt-0.5.3.tar.gz) = 442006f1d797ea5464c5c49d26d0cdecf79160f4
-RMD160 (mrxvt-0.5.3.tar.gz) = 76fbbd5ba20215dd7785eafa07dae909029194ec
-Size (mrxvt-0.5.3.tar.gz) = 592897 bytes
-SHA1 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 303de6d33aa76892f24c6fac7b93ac21a945fda5
-RMD160 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 0b05e382fe8736617961d8790786ba0341945caf
-Size (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 2182 bytes
-SHA1 (patch-aa) = 1be43fde59a351f6cb0af899f4b524ded320071c
-SHA1 (patch-ab) = 071b06c1a6fa3e894ed6fc5e13b67aa2ab0f2ee0
-SHA1 (patch-ac) = a6d3319cf901dc8a61500bc32d7af46d7ca5e94e
+SHA1 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 62b1d128f71e463dd38239efa4d5bc0daa77e9cf
+RMD160 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 039929a83065055abfe29e239d7760390bb54a6b
+Size (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 380 bytes
+SHA1 (mrxvt-0.5.4.tar.gz) = f50e9ad2f652d4212b0ac5241b919372d9e43744
+RMD160 (mrxvt-0.5.4.tar.gz) = 175ce5c554c267ada4efde18e22704ff1b688dac
+Size (mrxvt-0.5.4.tar.gz) = 603978 bytes
diff --git a/x11/mrxvt/patches/patch-aa b/x11/mrxvt/patches/patch-aa
deleted file mode 100644
index d861ab2d03b..00000000000
--- a/x11/mrxvt/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/08/28 14:57:16 tnn Exp $
-
---- configure.orig	2007-03-08 02:13:18.000000000 +0100
-+++ configure
-@@ -3351,7 +3351,7 @@ if test "${enable_use_fifo+set}" = set; 
- 
- fi
- 
--if test "x$use_fifo" == "xyes"; then
-+if test "x$use_fifo" = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_FIFO
diff --git a/x11/mrxvt/patches/patch-ab b/x11/mrxvt/patches/patch-ab
deleted file mode 100644
index 2ea611729c2..00000000000
--- a/x11/mrxvt/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/05/10 00:44:38 tnn Exp $
-
---- src/macros.c.orig	2007-05-10 02:39:14.000000000 +0200
-+++ src/macros.c
-@@ -354,7 +354,10 @@ rxvt_parse_macros( rxvt_t *r, const char
-      * Always store the keysym as lower case. That way we can treat shift
-      * correctly even when Caps Lock is pressed.
-      */
--    keysym = tolower( XStringToKeysym( keyname_nomods ) );
-+    {
-+        KeySym upper;
-+        XConvertCase(XStringToKeysym(keyname_nomods), &keysym, &upper);
-+    }
- 
-     if (NOT_KEYSYM(keysym))
-     {
-@@ -746,7 +749,10 @@ rxvt_process_macros( rxvt_t *r, KeySym k
-     if (ev->state & r->h->ModMetaMask)	    ck.modFlags |= MACRO_META;
- 
-     /* Use lowercase version so we can ignore caps lock */
--    ck.keysym = tolower( keysym );
-+    {
-+        KeySym upper;
-+        XConvertCase(keysym, &ck.keysym, &upper);
-+    }
- 
-     /* Check if macro ck is in our list of macros. */
-     macro = bsearch( &ck, r->macros, r->nmacros, sizeof( macros_t ),
diff --git a/x11/mrxvt/patches/patch-ac b/x11/mrxvt/patches/patch-ac
deleted file mode 100644
index ee1a11322e8..00000000000
--- a/x11/mrxvt/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/03/31 20:28:28 tnn Exp $
-
---- src/init.c.orig	2007-08-04 23:47:58.000000000 +0200
-+++ src/init.c
-@@ -1031,7 +1031,7 @@ rxvt_init_resources(rxvt_t* r, int argc,
-      * Open display, get options/resources and create the window
-      */
-     if (IS_NULL(rs[Rs_display_name] = getenv("DISPLAY")))
--	rs[Rs_display_name] = ":0";
-+	rs[Rs_display_name] = "Please set $DISPLAY";
- 
-     rxvt_get_options( r, r_argc, r_argv );
-     rxvt_free( r_argv ); /* XXX memory leak? */