Mon Mar 31 20:28:28 2008 UTC ()
Bomb if $DISPLAY is unset. Prompted by an advisory for rxvt.


(tnn)
diff -r1.16 -r1.17 pkgsrc/x11/mrxvt/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/mrxvt/distinfo
diff -r0 -r1.1 pkgsrc/x11/mrxvt/patches/patch-ac
cvs diff -r1.16 -r1.17 pkgsrc/x11/mrxvt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/mrxvt/Makefile 2008/02/21 02:41:57 1.16
+++ pkgsrc/x11/mrxvt/Makefile 2008/03/31 20:28:28 1.17
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.16 2008/02/21 02:41:57 tnn Exp $ 1# $NetBSD: Makefile,v 1.17 2008/03/31 20:28:28 tnn Exp $
2# 2#
3 3
4DISTNAME= mrxvt-0.5.3 4DISTNAME= mrxvt-0.5.3
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=materm/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=materm/}
8PATCH_SITES= ${MASTER_SITES} 8PATCH_SITES= ${MASTER_SITES}
9PATCHFILES= no-scroll-with-buffer-mrxvt-0.5.3.patch 9PATCHFILES= no-scroll-with-buffer-mrxvt-0.5.3.patch
10 10
11MAINTAINER= tnn@NetBSD.org 11MAINTAINER= tnn@NetBSD.org
12HOMEPAGE= http://materm.sourceforge.net/ 12HOMEPAGE= http://materm.sourceforge.net/
13COMMENT= Multi-tabbed terminal emulator with Xft support 13COMMENT= Multi-tabbed terminal emulator with Xft support
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
cvs diff -r1.5 -r1.6 pkgsrc/x11/mrxvt/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/mrxvt/distinfo 2007/09/23 07:57:00 1.5
+++ pkgsrc/x11/mrxvt/distinfo 2008/03/31 20:28:28 1.6
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.5 2007/09/23 07:57:00 tnn Exp $ 1$NetBSD: distinfo,v 1.6 2008/03/31 20:28:28 tnn Exp $
2 2
3SHA1 (mrxvt-0.5.3.tar.gz) = 442006f1d797ea5464c5c49d26d0cdecf79160f4 3SHA1 (mrxvt-0.5.3.tar.gz) = 442006f1d797ea5464c5c49d26d0cdecf79160f4
4RMD160 (mrxvt-0.5.3.tar.gz) = 76fbbd5ba20215dd7785eafa07dae909029194ec 4RMD160 (mrxvt-0.5.3.tar.gz) = 76fbbd5ba20215dd7785eafa07dae909029194ec
5Size (mrxvt-0.5.3.tar.gz) = 592897 bytes 5Size (mrxvt-0.5.3.tar.gz) = 592897 bytes
6SHA1 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 303de6d33aa76892f24c6fac7b93ac21a945fda5 6SHA1 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 303de6d33aa76892f24c6fac7b93ac21a945fda5
7RMD160 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 0b05e382fe8736617961d8790786ba0341945caf 7RMD160 (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 0b05e382fe8736617961d8790786ba0341945caf
8Size (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 2182 bytes 8Size (no-scroll-with-buffer-mrxvt-0.5.3.patch) = 2182 bytes
9SHA1 (patch-aa) = 1be43fde59a351f6cb0af899f4b524ded320071c 9SHA1 (patch-aa) = 1be43fde59a351f6cb0af899f4b524ded320071c
10SHA1 (patch-ab) = 071b06c1a6fa3e894ed6fc5e13b67aa2ab0f2ee0 10SHA1 (patch-ab) = 071b06c1a6fa3e894ed6fc5e13b67aa2ab0f2ee0
 11SHA1 (patch-ac) = a6d3319cf901dc8a61500bc32d7af46d7ca5e94e
File Added: pkgsrc/x11/mrxvt/patches/Attic/patch-ac
$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? */