Update to newest version 9.18.

While there, make it compatible with perl 5.18.

Changes:

9.18 Sun Mar 24 15:33:35 CET 2013
	- fix regression that caused artifacts on resize.

9.17 Fri Mar  1 13:46:08 CET 2013
	- add shade operator in background perl extension.
        - avoid starting or ending the selection in the middle of wide
          characters to avoid artifacts (reproted by Tiago Resende).
	- fix artifacts that may occur if the character in the cursor
	  cell has width > 1 (reported by Tiago Resende).
	- fix regression that causes artifacts on scrolling if
	  saveLines is 0 and the window is resized (reported by Bert
	  Münnich).
	- fix build when perl is enabled and pixbuf and transparency
	  are disabled.

4 files changed, 31 insertions, 10 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index e00c9394659..19b021700e8 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2013/06/06 12:55:22 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2013/07/22 17:55:21 morr Exp $
 
-DISTNAME=	rxvt-unicode-9.16
-PKGREVISION=	4
+DISTNAME=	rxvt-unicode-9.18
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/ \
 		http://dist.schmorp.de/rxvt-unicode/Attic/
@@ -23,6 +22,9 @@ CONFIGURE_ARGS+=	--enable-256-color
 
 INSTALLATION_DIRS+=	share/doc/rxvt-unicode share/examples/rxvt-unicode
 
+post-patch:
+	${RM} ${WRKSRC}/src/perl/tabbed.orig
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.FAQ \
 		${DESTDIR}${PREFIX}/share/doc/rxvt-unicode
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 6cd524f4508..1400a1b76a0 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2013/01/21 09:16:54 morr Exp $
+$NetBSD: distinfo,v 1.20 2013/07/22 17:55:21 morr Exp $
 
-SHA1 (rxvt-unicode-9.16.tar.bz2) = 1b721969d6a6ed0f84529a29cfff0a05aee015ab
-RMD160 (rxvt-unicode-9.16.tar.bz2) = d316e1ba06e9609417e472f74a0541ca8674424c
-Size (rxvt-unicode-9.16.tar.bz2) = 898089 bytes
+SHA1 (rxvt-unicode-9.18.tar.bz2) = 5d12639c4b17019357ee62c08916b826e5d03259
+RMD160 (rxvt-unicode-9.18.tar.bz2) = 0429b78d85bdedbfa7a33dd749fb5e72582bb75f
+Size (rxvt-unicode-9.18.tar.bz2) = 897170 bytes
 SHA1 (patch-Makefile.in) = 1c2890e2057d062f823f944fc2ecd2258f14b61e
-SHA1 (patch-configure) = 67b631d3b3cb2f3b501dd08fd5c7d2151072017d
+SHA1 (patch-configure) = bd8a6fb21a02f7df6c29a932de10fdc2213ae8b0
 SHA1 (patch-doc_Makefile.in) = 8465193e21878a18ae467dc50a336a65f1bd4de7
+SHA1 (patch-src_perl_tabbed) = 158768ec1fb39fe0c7db3a2b5b0e6690e1fadd6e
diff --git a/x11/rxvt-unicode/patches/patch-configure b/x11/rxvt-unicode/patches/patch-configure
index df7a62429e1..a9d21d91914 100644
--- a/x11/rxvt-unicode/patches/patch-configure
+++ b/x11/rxvt-unicode/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2013/01/20 13:38:20 morr Exp $
+$NetBSD: patch-configure,v 1.3 2013/07/22 17:55:21 morr Exp $
 
 Don't use predefined CXXFLAGS.
 
---- configure.orig	2012-12-27 10:57:25.000000000 +0000
+--- configure.orig	2013-03-23 15:39:59.000000000 +0000
 +++ configure
 @@ -4474,32 +4474,6 @@ fi
  LINKER=$LINKER
diff --git a/x11/rxvt-unicode/patches/patch-src_perl_tabbed b/x11/rxvt-unicode/patches/patch-src_perl_tabbed
new file mode 100644
index 00000000000..ddc681382bc
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-src_perl_tabbed
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_perl_tabbed,v 1.1 2013/07/22 17:55:21 morr Exp $
+
+Fix to make it compatibible with perl 5.18 
+(https://metacpan.org/module/RJBS/perl-5.18.0/pod/perldelta.pod#qw-...-can-no-longer-be-used-as-parentheses)
+
+Patch taken from http://lists.schmorp.de/pipermail/rxvt-unicode/2013q2/001793.html
+
+--- src/perl/tabbed.orig	2013-02-17 00:41:38.000000000 +0000
++++ src/perl/tabbed
+@@ -402,7 +402,7 @@ package urxvt::ext::tabbed::tab;
+ # simply proxies all interesting calls back to the tabbed class.
+ 
+ {
+-   for my $hook qw(start destroy key_press property_notify) {
++   for my $hook (qw(start destroy key_press property_notify)) {
+       eval qq{
+          sub on_$hook {
+             my \$parent = \$_[0]{term}{parent}