Update to version 9.15.

List of changes is too big to be included here. You can look at
http://dist.schmorp.de/rxvt-unicode/Changes
to see changelog.

12 files changed, 15 insertions, 319 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index cb7387381a7..15112fc731b 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2012/01/04 11:04:04 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2012/02/29 18:49:40 morr Exp $
 
-DISTNAME=		rxvt-unicode-9.06
-PKGREVISION=		5
+DISTNAME=		rxvt-unicode-9.15
 CATEGORIES=		x11
 MASTER_SITES=		http://dist.schmorp.de/rxvt-unicode/ \
 			http://dist.schmorp.de/rxvt-unicode/Attic/
diff --git a/x11/rxvt-unicode/PLIST b/x11/rxvt-unicode/PLIST
index 8c685d14303..36ade74b127 100644
--- a/x11/rxvt-unicode/PLIST
+++ b/x11/rxvt-unicode/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:25:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/02/29 18:49:40 morr Exp $
 bin/urxvt
 bin/urxvtc
 bin/urxvtd
+${PLIST.perl}lib/urxvt/perl/bell-command
 ${PLIST.perl}lib/urxvt/perl/block-graphics-to-ascii
+${PLIST.perl}lib/urxvt/perl/clipboard-osc
+${PLIST.perl}lib/urxvt/perl/confirm-paste
 ${PLIST.perl}lib/urxvt/perl/digital-clock
 ${PLIST.perl}lib/urxvt/perl/example-refresh-hooks
+${PLIST.perl}lib/urxvt/perl/keysym-list
 ${PLIST.perl}lib/urxvt/perl/kuake
 ${PLIST.perl}lib/urxvt/perl/macosx-clipboard
+${PLIST.perl}lib/urxvt/perl/macosx-clipboard-native
 ${PLIST.perl}lib/urxvt/perl/matcher
 ${PLIST.perl}lib/urxvt/perl/option-popup
 ${PLIST.perl}lib/urxvt/perl/overlay-osc
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 8e4d0aee8ca..c4e86e82bf8 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.14 2009/09/03 19:29:26 roy Exp $
+$NetBSD: distinfo,v 1.15 2012/02/29 18:49:40 morr Exp $
 
-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 (rxvt-unicode-9.15.tar.bz2) = e6fdf091860ecb458730dc68b0176f67f207a2f7
+RMD160 (rxvt-unicode-9.15.tar.bz2) = 80b33c123edee498f267147b5c2361a81c42f160
+Size (rxvt-unicode-9.15.tar.bz2) = 894764 bytes
 SHA1 (patch-ac) = 22c2e28a5b0ece42fbdbbafa85a8cec80f1d8277
-SHA1 (patch-ad) = ac5e3b32b9668288a71c091f6b30fcfc4e3ef5ab
-SHA1 (patch-ba) = ef5beea8eb1052ffae6a1d8b78b85696148d0d76
-SHA1 (patch-bb) = 409b6966166513d00b850a528595ab74ba376208
-SHA1 (patch-bc) = 2ee71d3037de6cb3b371c35fb5ed3c1d0e386ad5
-SHA1 (patch-bd) = 1948d910cecde1f10c53c7e83fbae6c972a39811
-SHA1 (patch-be) = c271ecf0027b6338c1b2bb484e8960a1c73fe7be
+SHA1 (patch-configure) = 81480aec100fff239ca075f9e7dc45b1a34d0436
diff --git a/x11/rxvt-unicode/options.mk b/x11/rxvt-unicode/options.mk
index 11dcd135e67..2f5bea9e4ae 100644
--- a/x11/rxvt-unicode/options.mk
+++ b/x11/rxvt-unicode/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2012/01/04 11:04:04 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2012/02/29 18:49:40 morr Exp $
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.rxvt-unicode
 PKG_SUPPORTED_OPTIONS=  perl unicode3 xft2 rxvt-term
@@ -17,24 +17,7 @@ CONFIGURE_ARGS+=	--enable-perl
 PLIST.perl=		yes
 .include "../../lang/perl5/buildlink3.mk"
 USE_TOOLS+=		perl
-REPLACE_PERL+=		src/perl/block-graphics-to-ascii
-REPLACE_PERL+=		src/perl/digital-clock
-REPLACE_PERL+=		src/perl/example-refresh-hooks
-REPLACE_PERL+=		src/perl/kuake
-REPLACE_PERL+=		src/perl/macosx-clipboard
-REPLACE_PERL+=		src/perl/matcher
-REPLACE_PERL+=		src/perl/option-popup
-REPLACE_PERL+=		src/perl/overlay-osc
-REPLACE_PERL+=		src/perl/readline
-REPLACE_PERL+=		src/perl/remote-clipboard
-REPLACE_PERL+=		src/perl/searchable-scrollback
-REPLACE_PERL+=		src/perl/selection
-REPLACE_PERL+=		src/perl/selection-autotransform
-REPLACE_PERL+=		src/perl/selection-pastebin
-REPLACE_PERL+=		src/perl/selection-popup
-REPLACE_PERL+=		src/perl/tabbed
-REPLACE_PERL+=		src/perl/urxvt-popup
-REPLACE_PERL+=		src/perl/xim-onthespot
+REPLACE_PERL+=          src/perl/*
 .else
 CONFIGURE_ARGS+=	--disable-perl
 .endif
diff --git a/x11/rxvt-unicode/patches/patch-aa b/x11/rxvt-unicode/patches/patch-aa
deleted file mode 100644
index 4ecd91c5ebf..00000000000
--- a/x11/rxvt-unicode/patches/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/03/06 00:20:27 snj Exp $
-
---- 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-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CXXFLAGS="-g -O3"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  else
--    CXXFLAGS="-O"
--  fi
--  CFLAGS="$CXXFLAGS"
--fi
--
- case $host in
-    *-*-solaris* )
- 
diff --git a/x11/rxvt-unicode/patches/patch-ab b/x11/rxvt-unicode/patches/patch-ab
deleted file mode 100644
index bb3f651ffc9..00000000000
--- a/x11/rxvt-unicode/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$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	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
-    */
- 
--  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
--    rs[Rs_display_name] = ":0";
-+  rs[Rs_display_name] = getenv ("DISPLAY");
- 
-   get_options (r_argc, r_argv);
- 
-+  if (!rs[Rs_display_name])
-+    rxvt_fatal ("no display given and DISPLAY not set, aborting.\n");
-+
-   if (!(display = displays.get (rs[Rs_display_name])))
-     {
-       free (r_argv);
diff --git a/x11/rxvt-unicode/patches/patch-ad b/x11/rxvt-unicode/patches/patch-ad
deleted file mode 100644
index 8fb20b65da9..00000000000
--- a/x11/rxvt-unicode/patches/patch-ad
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/05/19 19:41:19 snj Exp $
-
---- src/fdpass.C.orig	2008-05-05 09:51:47.000000000 -0700
-+++ src/fdpass.C	2009-05-19 12:28:03.000000000 -0700
-@@ -26,6 +26,7 @@
- #include "../config.h"
- 
- #include <cstddef> // needed by broken bsds for NULL used in sys/uio.h
-+#include <cstdlib>
- 
- #include <sys/types.h>
- #include <sys/uio.h>
-@@ -33,16 +34,26 @@
- 
- #include "libptytty.h"
- 
--#ifndef CMSG_LEN // CMSG_SPACE && CMSG_LEN are rfc2292 extensions to unix
-+// CMSG_SPACE & CMSG_LEN are rfc2292 extensions to unix
-+#ifndef CMSG_SPACE
-+# define CMSG_SPACE(len) (sizeof (cmsghdr) + len)
-+#endif
-+
-+#ifndef CMSG_LEN
- # define CMSG_LEN(len) (sizeof (cmsghdr) + len)
- #endif
- 
- bool
- ptytty::send_fd (int socket, int fd)
- {
-+  void *buf = malloc (CMSG_SPACE (sizeof (int)));
-+
-+  if (!buf)
-+    return 0;
-+
-   msghdr msg;
-   iovec iov;
--  char buf [CMSG_LEN (sizeof (int))];
-+  cmsghdr *cmsg;
-   char data = 0;
- 
-   iov.iov_base = &data;
-@@ -52,27 +63,33 @@ ptytty::send_fd (int socket, int fd)
-   msg.msg_namelen    = 0;
-   msg.msg_iov        = &iov;
-   msg.msg_iovlen     = 1;
--  msg.msg_control    = (void *)buf;
--  msg.msg_controllen = sizeof buf;
-+  msg.msg_control    = buf;
-+  msg.msg_controllen = CMSG_SPACE (sizeof (int));
- 
--  cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
-+  cmsg = CMSG_FIRSTHDR (&msg);
-   cmsg->cmsg_level = SOL_SOCKET;
-   cmsg->cmsg_type  = SCM_RIGHTS;
-   cmsg->cmsg_len   = CMSG_LEN (sizeof (int));
- 
-   *(int *)CMSG_DATA (cmsg) = fd;
- 
--  msg.msg_controllen = cmsg->cmsg_len;
-+  ssize_t result = sendmsg (socket, &msg, 0);
-+
-+  free (buf);
- 
--  return sendmsg (socket, &msg, 0) >= 0;
-+  return result >= 0;
- }
- 
- int
- ptytty::recv_fd (int socket)
- {
-+  void *buf = malloc (CMSG_SPACE (sizeof (int)));
-+
-+  if (!buf)
-+    return -1;
-+
-   msghdr msg;
-   iovec iov;
--  char buf [CMSG_LEN (sizeof (int))];  /* ancillary data buffer */
-   char data = 1;
- 
-   iov.iov_base = &data;
-@@ -83,23 +100,24 @@ ptytty::recv_fd (int socket)
-   msg.msg_iov        = &iov;
-   msg.msg_iovlen     = 1;
-   msg.msg_control    = buf;
--  msg.msg_controllen = sizeof buf;
-+  msg.msg_controllen = CMSG_SPACE (sizeof (int));
- 
--  cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
--  cmsg->cmsg_level = SOL_SOCKET;
--  cmsg->cmsg_type  = SCM_RIGHTS;
--  cmsg->cmsg_len   = CMSG_LEN (sizeof (int));
-+  int fd = -1;
- 
--  msg.msg_controllen = cmsg->cmsg_len;
-+  if (recvmsg (socket, &msg, 0) >  0
-+      && data                   == 0
-+      && msg.msg_controllen     >= CMSG_SPACE (sizeof (int)))
-+    {
-+      cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
- 
--  if (recvmsg (socket, &msg, 0) <= 0
--      || data               != 0
--      || msg.msg_controllen < CMSG_LEN (sizeof (int))
--      || cmsg->cmsg_level   != SOL_SOCKET
--      || cmsg->cmsg_type    != SCM_RIGHTS
--      || cmsg->cmsg_len     < CMSG_LEN (sizeof (int)))
--    return -1;
-+      if (cmsg->cmsg_level   == SOL_SOCKET
-+          && cmsg->cmsg_type == SCM_RIGHTS
-+          && cmsg->cmsg_len  >= CMSG_LEN (sizeof (int)))
-+        fd = *(int *)CMSG_DATA (cmsg);
-+    }
-+
-+  free (buf);
- 
--  return *(int *)CMSG_DATA (cmsg);
-+  return fd;
- }
- 
diff --git a/x11/rxvt-unicode/patches/patch-ba b/x11/rxvt-unicode/patches/patch-ba
deleted file mode 100644
index 22ba51e1339..00000000000
--- a/x11/rxvt-unicode/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2009/09/03 19:29:26 roy Exp $
-
-Check for popcount in libc
-
---- configure	2009-09-03 20:08:10.000000000 +0100
-+++ configure	2009-09-03 20:08:24.000000000 +0100
-@@ -10617,6 +10617,7 @@
-   revoke \
-   _getpty \
-   getpt \
-+  popcount \
-   posix_openpt \
-   isastream \
-   setuid \
diff --git a/x11/rxvt-unicode/patches/patch-bb b/x11/rxvt-unicode/patches/patch-bb
deleted file mode 100644
index 21e90cffe7e..00000000000
--- a/x11/rxvt-unicode/patches/patch-bb
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2009/09/03 19:29:26 roy Exp $
-
-Check for popcount in libc
-
---- src/rxvtutil.h	2008-11-05 14:43:24.000000000 +0000
-+++ src/rxvtutil.h	2009-09-03 20:19:38.000000000 +0100
-@@ -94,12 +94,16 @@
- // some bit functions, xft fuck me plenty
- #if HAVE_GCC_BUILTINS
- static inline int ctz      (unsigned int x) { return __builtin_ctz      (x); }
-+#if !HAVE_POPCOUNT
- static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
-+#endif
- #else
- // count trailing zero bits and count # of one bits
- int ctz      (unsigned int x) CONST;
-+#if !HAVE_POPCOUNT
- int popcount (unsigned int x) CONST;
- #endif
-+#endif
- 
- // in range including end
- #define IN_RANGE_INC(val,beg,end) \
diff --git a/x11/rxvt-unicode/patches/patch-bc b/x11/rxvt-unicode/patches/patch-bc
deleted file mode 100644
index 9a387681fe7..00000000000
--- a/x11/rxvt-unicode/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2009/09/03 19:29:26 roy Exp $
-
-Check for popcount in libc
-
---- src/rxvtdaemon.C	2008-02-19 12:17:46.000000000 +0000
-+++ src/rxvtdaemon.C	2009-09-03 17:57:27.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <sys/utsname.h>
- #include <limits.h>
- 
-+#include "../config.h"
- #include "rxvtdaemon.h"
- 
- char *rxvt_connection::unix_sockname ()
diff --git a/x11/rxvt-unicode/patches/patch-bd b/x11/rxvt-unicode/patches/patch-bd
deleted file mode 100644
index 2a1af2cd6f7..00000000000
--- a/x11/rxvt-unicode/patches/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2009/09/03 19:29:26 roy Exp $
-
-Check for popcount in libc
-
---- src/rxvtutil.C	2008-02-19 12:17:46.000000000 +0000
-+++ src/rxvtutil.C	2009-09-03 17:57:27.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <cstring>
- #include <inttypes.h>
- 
-+#include "../config.h"
- #include "rxvtutil.h"
- 
- class byteorder byteorder;
diff --git a/x11/rxvt-unicode/patches/patch-be b/x11/rxvt-unicode/patches/patch-be
deleted file mode 100644
index 51a9804da39..00000000000
--- a/x11/rxvt-unicode/patches/patch-be
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-be,v 1.1 2009/09/03 19:29:26 roy Exp $
-
-Check for popcount in libc
-
---- config.h.in	2009-09-03 20:14:02.000000000 +0100
-+++ config.h.in	2009-09-03 20:13:30.000000000 +0100
-@@ -269,6 +269,9 @@
- /* Define to 1 if you have the `_getpty' function. */
- #undef HAVE__GETPTY
- 
-+/* Define to 1 if you have the `popcount' function. */
-+#undef HAVE_POPCOUNT
-+
- /* Define if you want ISO 14755 extended support */
- #undef ISO_14755
-