3 files changed, 28 insertions, 33 deletions
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
+