[pkgsrc/trunk]: pkgsrc/x11/mrxvt Bomb if $DISPLAY is unset. Prompted by an ad...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/73ecf418f541
branches:  trunk
changeset: 540177:73ecf418f541
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Mar 31 20:28:28 2008 +0000

description:
Bomb if $DISPLAY is unset. Prompted by an advisory for rxvt.

diffstat:

 x11/mrxvt/Makefile         |   4 ++--
 x11/mrxvt/distinfo         |   3 ++-
 x11/mrxvt/patches/patch-ac |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 46d5983575a2 -r 73ecf418f541 x11/mrxvt/Makefile
--- a/x11/mrxvt/Makefile        Mon Mar 31 16:52:13 2008 +0000
+++ b/x11/mrxvt/Makefile        Mon Mar 31 20:28:28 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/02/21 02:41:57 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/31 20:28:28 tnn Exp $
 #
 
 DISTNAME=      mrxvt-0.5.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=materm/}
 PATCH_SITES=   ${MASTER_SITES}
diff -r 46d5983575a2 -r 73ecf418f541 x11/mrxvt/distinfo
--- a/x11/mrxvt/distinfo        Mon Mar 31 16:52:13 2008 +0000
+++ b/x11/mrxvt/distinfo        Mon Mar 31 20:28:28 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/09/23 07:57:00 tnn Exp $
+$NetBSD: distinfo,v 1.6 2008/03/31 20:28:28 tnn Exp $
 
 SHA1 (mrxvt-0.5.3.tar.gz) = 442006f1d797ea5464c5c49d26d0cdecf79160f4
 RMD160 (mrxvt-0.5.3.tar.gz) = 76fbbd5ba20215dd7785eafa07dae909029194ec
@@ -8,3 +8,4 @@
 Size (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 2182 bytes
 SHA1 (patch-aa) = 1be43fde59a351f6cb0af899f4b524ded320071c
 SHA1 (patch-ab) = 071b06c1a6fa3e894ed6fc5e13b67aa2ab0f2ee0
+SHA1 (patch-ac) = a6d3319cf901dc8a61500bc32d7af46d7ca5e94e
diff -r 46d5983575a2 -r 73ecf418f541 x11/mrxvt/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mrxvt/patches/patch-ac        Mon Mar 31 20:28:28 2008 +0000
@@ -0,0 +1,13 @@
+$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? */