summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-03-31 20:28:28 +0000
committertnn <tnn@pkgsrc.org>2008-03-31 20:28:28 +0000
commitc9363f70f3322d338377083f50dab57a5b00cf25 (patch)
tree4715c67afa5cb66340aed38e7e09d3fa8115ee26
parent93f9a70abf3b8ded5d1b36418c14ebf4bb280cc3 (diff)
downloadpkgsrc-c9363f70f3322d338377083f50dab57a5b00cf25.tar.gz
Bomb if $DISPLAY is unset. Prompted by an advisory for rxvt.
-rw-r--r--x11/mrxvt/Makefile4
-rw-r--r--x11/mrxvt/distinfo3
-rw-r--r--x11/mrxvt/patches/patch-ac13
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index da34a1f06fc..f5873ef4329 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -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 --git a/x11/mrxvt/distinfo b/x11/mrxvt/distinfo
index 06520ac916d..16774b90859 100644
--- a/x11/mrxvt/distinfo
+++ b/x11/mrxvt/distinfo
@@ -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 @@ RMD160 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 0b05e382fe8736617961d8790786b
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 --git a/x11/mrxvt/patches/patch-ac b/x11/mrxvt/patches/patch-ac
new file mode 100644
index 00000000000..ee1a11322e8
--- /dev/null
+++ b/x11/mrxvt/patches/patch-ac
@@ -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? */