Update rxvt-unicode to 9.06. Changes are many various bugfixes. See the

bundled changlelog for details.

6 files changed, 39 insertions, 50 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 45f24f47ce0..57834de9c69 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2008/10/19 19:19:25 he Exp $
-#
+# $NetBSD: Makefile,v 1.24 2009/03/06 00:20:27 snj Exp $
 
-DISTNAME=		rxvt-unicode-8.3
-PKGREVISION=		4
+DISTNAME=		rxvt-unicode-9.06
 CATEGORIES=		x11
 MASTER_SITES=		http://dist.schmorp.de/rxvt-unicode/ \
 			http://dist.schmorp.de/rxvt-unicode/Attic/
@@ -17,11 +15,6 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 USE_FEATURES+=		snprintf
 
-CONFIGURE_ARGS+=	--enable-transparency	\
-			--enable-menubar	\
-			--enable-xpm-background	\
-			--enable-xgetdefault	\
-			--enable-24bit
 CONFIGURE_ENV+=		ac_cv_path_TIC=no
 
 post-install:
diff --git a/x11/rxvt-unicode/PLIST b/x11/rxvt-unicode/PLIST
index f812a4e172d..f567d22aa4e 100644
--- a/x11/rxvt-unicode/PLIST
+++ b/x11/rxvt-unicode/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/03/06 00:20:27 snj Exp $
 bin/urxvt
 bin/urxvtc
 bin/urxvtd
-${PLIST.perl}lib/urxvt/perl/automove-background
 ${PLIST.perl}lib/urxvt/perl/block-graphics-to-ascii
 ${PLIST.perl}lib/urxvt/perl/digital-clock
 ${PLIST.perl}lib/urxvt/perl/example-refresh-hooks
@@ -10,6 +9,7 @@ ${PLIST.perl}lib/urxvt/perl/kuake
 ${PLIST.perl}lib/urxvt/perl/macosx-clipboard
 ${PLIST.perl}lib/urxvt/perl/matcher
 ${PLIST.perl}lib/urxvt/perl/option-popup
+${PLIST.perl}lib/urxvt/perl/overlay-osc
 ${PLIST.perl}lib/urxvt/perl/readline
 ${PLIST.perl}lib/urxvt/perl/remote-clipboard
 ${PLIST.perl}lib/urxvt/perl/searchable-scrollback
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 72388dd1ed6..a52f2ec86d2 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2008/04/03 22:36:52 tonnerre Exp $
+$NetBSD: distinfo,v 1.12 2009/03/06 00:20:27 snj Exp $
 
-SHA1 (rxvt-unicode-8.3.tar.bz2) = cd335c47543ba086585a296ca0fe7445c07120dd
-RMD160 (rxvt-unicode-8.3.tar.bz2) = 000dbcb1ff297edbff0a8b21dbbba3db30854579
-Size (rxvt-unicode-8.3.tar.bz2) = 885212 bytes
-SHA1 (patch-aa) = e5760c57a6b47780ee851efe09dda5f2f02fca40
-SHA1 (patch-ab) = 2bfbffea8d63ebd65bfa9b0dc43a1901f844137e
+SHA1 (rxvt-unicode-9.06.tar.bz2) = df623ebdad001de534781721f8298ba1add0df2c
+RMD160 (rxvt-unicode-9.06.tar.bz2) = ae737ed07e943303318bd81b566146d5426f36bd
+Size (rxvt-unicode-9.06.tar.bz2) = 869076 bytes
+SHA1 (patch-aa) = 2d93a4717f7f3a0e833a5b13a8b6c4f9301b7680
+SHA1 (patch-ab) = f711bd5046fd9523b88b7a73ab9981a3bb7172fb
+SHA1 (patch-ac) = 22c2e28a5b0ece42fbdbbafa85a8cec80f1d8277
diff --git a/x11/rxvt-unicode/patches/patch-aa b/x11/rxvt-unicode/patches/patch-aa
index 2dbad38e125..4ecd91c5ebf 100644
--- a/x11/rxvt-unicode/patches/patch-aa
+++ b/x11/rxvt-unicode/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.5 2007/08/06 10:02:27 ghen Exp $
+$NetBSD: patch-aa,v 1.6 2009/03/06 00:20:27 snj Exp $
 
---- configure.orig	2007-08-06 10:26:41.000000000 +0200
-+++ configure		2007-08-06 10:29:20.000000000 +0200
-@@ -3877,57 +3877,6 @@
+--- configure.orig	2009-02-27 11:58:51.000000000 -0800
++++ configure	2009-02-27 11:58:47.000000000 -0800
+@@ -3852,56 +3852,6 @@ fi
  LINKER=$LINKER
  
  
 -if test -z "$orig_CXXFLAGS"; then
 -  if test x$GCC = xyes && test "x$GXX" = xyes; then
--     CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
+-    CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -56,26 +56,6 @@ $NetBSD: patch-aa,v 1.5 2007/08/06 10:02:27 ghen Exp $
 -  CFLAGS="$CXXFLAGS"
 -fi
 -
--
- cat >>confdefs.h <<\_ACEOF
- #define _GNU_SOURCE 1
- _ACEOF
-@@ -6691,11 +6640,16 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+ case $host in
+    *-*-solaris* )
  
-+extern "C" {
-+#include <X11/xpm.h>
-+#include <stddef.h>
-+}
-+
- int
- main ()
- {
--XpmReadFileToPixmap()
--  ;
-+  Drawable d;
-+  XpmReadFileToPixmap(NULL, d, NULL, NULL, NULL, NULL);
-   return 0;
- }
- _ACEOF
diff --git a/x11/rxvt-unicode/patches/patch-ab b/x11/rxvt-unicode/patches/patch-ab
index f821379065c..bb3f651ffc9 100644
--- a/x11/rxvt-unicode/patches/patch-ab
+++ b/x11/rxvt-unicode/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2008/04/03 22:36:52 tonnerre Exp $
+$NetBSD: patch-ab,v 1.5 2009/03/06 00:20:27 snj Exp $
 
 Fix default display vulnerability (CVE-2008-1142).
 
---- src/init.C.orig	2007-08-01 19:35:02.000000000 +0200
-+++ src/init.C
-@@ -299,11 +299,13 @@ rxvt_term::init_resources (int argc, con
+--- src/init.C.orig	2009-02-23 15:19:50.000000000 -0800
++++ src/init.C	2009-02-23 15:20:33.000000000 -0800
+@@ -372,11 +372,13 @@ rxvt_term::init_resources (int argc, con
     * Open display, get options/resources and create the window
     */
  
@@ -18,5 +18,5 @@ Fix default display vulnerability (CVE-2008-1142).
 +    rxvt_fatal ("no display given and DISPLAY not set, aborting.\n");
 +
    if (!(display = displays.get (rs[Rs_display_name])))
-     rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
- 
+     {
+       free (r_argv);
diff --git a/x11/rxvt-unicode/patches/patch-ac b/x11/rxvt-unicode/patches/patch-ac
new file mode 100644
index 00000000000..7cf9cb66598
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2009/03/06 00:20:27 snj Exp $
+
+Undo upstream revision 1.45, which was done in the name of simplification.
+
+--- doc/Makefile.in.orig	2009-02-24 13:22:58.000000000 -0800
++++ doc/Makefile.in	2009-02-24 13:23:28.000000000 -0800
+@@ -98,7 +98,7 @@ install: all
+ 	$(INSTALL_DATA) rxvt.7.man  $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
+ @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(man3dir)
+ @IF_PERL@	$(INSTALL_DATA) rxvtperl.3.man $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext)
+-	@TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
++	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo; fi; fi
+ 
+ distdepend: alldoc
+