7 files changed, 66 insertions, 42 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 7a702b39390a..18b7f5b82b54 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rxvt-unicode
-PORTVERSION=	9.11
+PORTVERSION=	9.12
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	. Attic
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A clone of the terminal emulator rxvt modified to support Unicode
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	tic:${PORTSDIR}/devel/ncurses	\
 		${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig	\
@@ -190,8 +192,6 @@ post-patch:
 
 pre-configure:
 	${RM} ${WRKSRC}/src/perl/kuake.orig
-	${PERL} -pi -e 's|(PTYCHAR2\s+"[^"]+)"|\1ghijklmnopqrstuv"|' \
-		${WRKSRC}/src/ptytty.C
 
 post-install:
 	${CHMOD} 4711 ${PREFIX}/bin/urxvt ${PREFIX}/bin/urxvtd
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index b7a47e08f3ce..448d5750bebf 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rxvt-unicode-9.11.tar.bz2) = 0452c00066774ef6e32fcd0a1e6f09230392ea9f6f42e1c2ef7b91d6fcb82d85
-SIZE (rxvt-unicode-9.11.tar.bz2) = 882787
+SHA256 (rxvt-unicode-9.12.tar.bz2) = 1db334204bfb264b3134e01d9d3cf446c5ac7d47514909435f914f3906f37e7e
+SIZE (rxvt-unicode-9.12.tar.bz2) = 886255
diff --git a/x11/rxvt-unicode/files/extra-patch-imlocale b/x11/rxvt-unicode/files/extra-patch-imlocale
index 4cc39ce778c2..b075de9480d6 100644
--- a/x11/rxvt-unicode/files/extra-patch-imlocale
+++ b/x11/rxvt-unicode/files/extra-patch-imlocale
@@ -1,7 +1,6 @@
-diff -ur src/command.C.orig src/command.C
---- src/command.C.orig	Mon Feb 20 22:41:16 2006
-+++ src/command.C	Sun May 21 09:36:40 2006
-@@ -301,6 +301,26 @@
+--- src/command.C.orig	2011-06-22 14:44:37.000000000 +0400
++++ src/command.C	2011-09-30 01:31:30.000000000 +0400
+@@ -256,6 +256,26 @@
  }
  #endif
  
@@ -26,9 +25,9 @@ diff -ur src/command.C.orig src/command.C
 +}
 +
  void
- rxvt_term::key_press (XKeyEvent &ev)
+ rxvt_term::commit_iso14755 ()
  {
-@@ -361,6 +381,9 @@
+@@ -451,6 +471,9 @@
            if (rs[Rs_imLocale])
              SET_LOCALE (locale);
  
@@ -38,10 +37,9 @@ diff -ur src/command.C.orig src/command.C
            if (status_return == XLookupChars
                || status_return == XLookupBoth)
              {
-diff -ur src/encoding.C.orig src/encoding.C
---- src/encoding.C.orig	Mon Feb 20 22:41:16 2006
-+++ src/encoding.C	Sun May 21 09:36:40 2006
-@@ -151,6 +151,7 @@
+--- src/encoding.C.orig	2011-06-22 14:44:37.000000000 +0400
++++ src/encoding.C	2011-09-30 01:31:30.000000000 +0400
+@@ -152,6 +152,7 @@
  static uint32_t cs_us_ascii_from_unicode (unicode_t unicode)   { return unicode <= 127 ? unicode : NOCHAR; }
  
  #define cs_us_ascii_to_unicode_16 cs_unicode_to_unicode
@@ -49,9 +47,8 @@ diff -ur src/encoding.C.orig src/encoding.C
  static uint32_t cs_unicode_16_from_unicode (unicode_t unicode) { return unicode <= 65535 ? unicode : NOCHAR; }
  
  #define ENCODING_DEFAULT
-diff -ur src/encoding.h.orig src/encoding.h
---- src/encoding.h.orig	Sun May 21 08:14:15 2006
-+++ src/encoding.h	Sun May 21 08:16:54 2006
+--- src/encoding.h.orig	2011-02-21 10:39:50.000000000 +0300
++++ src/encoding.h	2011-09-30 01:31:30.000000000 +0400
 @@ -2,6 +2,7 @@
  #define ENCODING_H
  
@@ -60,9 +57,8 @@ diff -ur src/encoding.h.orig src/encoding.h
  
  typedef uint32_t unicode_t;
  
-diff -ur src/gentables.orig src/gentables
---- src/gentables	Sun May 21 08:14:15 2006
-+++ src/gentables.orig	Sun May 21 08:15:08 2006
+--- src/gentables.orig	2011-02-21 10:39:50.000000000 +0300
++++ src/gentables	2011-09-30 01:31:30.000000000 +0400
 @@ -13,7 +13,7 @@
  
  my $gen;
diff --git a/x11/rxvt-unicode/files/patch-libptytty-src-logging.C b/x11/rxvt-unicode/files/patch-libptytty-src-logging.C
new file mode 100644
index 000000000000..2be69d13a618
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-libptytty-src-logging.C
@@ -0,0 +1,42 @@
+--- libptytty/src/logging.C.orig	2011-05-31 00:59:42.000000000 +0400
++++ libptytty/src/logging.C	2011-09-21 16:19:44.000000000 +0400
+@@ -284,11 +284,19 @@
+ #endif
+ 
+ #ifdef HAVE_STRUCT_UTMP
++# ifdef HAVE_UTMP_PID
+   fill_utmp (ut, true, cmd_pid, ut_id, pty, user, hostname);
++# else
++  fill_utmp (ut, true, cmd_pid, 0, pty, user, hostname);
++# endif
+ #endif
+ 
+ #ifdef HAVE_STRUCT_UTMPX
++# ifdef HAVE_UTMP_PID
+   fill_utmpx (utx, true, cmd_pid, ut_id, pty, user, hostname);
++# else
++  fill_utmpx (utx, true, cmd_pid, 0, pty, user, hostname);
++# endif
+ #endif
+ 
+ #ifdef HAVE_STRUCT_UTMP
+@@ -363,11 +371,19 @@
+ #endif
+ 
+ #ifdef HAVE_STRUCT_UTMP
++# ifdef HAVE_UTMP_PID
+   fill_utmp (ut, false, cmd_pid, ut_id, pty, 0, 0);
++# else
++  fill_utmp (ut, false, cmd_pid, 0, pty, 0, 0);
++# endif
+ #endif
+ 
+ #ifdef HAVE_STRUCT_UTMPX
++# ifdef HAVE_UTMP_PID
+   fill_utmpx (utx, false, cmd_pid, ut_id, pty, 0, 0);
++# else
++  fill_utmpx (utx, false, cmd_pid, 0, pty, 0, 0);
++# endif
+ #endif
+ 
+   /*
diff --git a/x11/rxvt-unicode/files/patch-src-urxvtcd b/x11/rxvt-unicode/files/patch-src-urxvtcd
index cff0fecebde1..200cb823aa58 100644
--- a/x11/rxvt-unicode/files/patch-src-urxvtcd
+++ b/x11/rxvt-unicode/files/patch-src-urxvtcd
@@ -5,6 +5,6 @@
 +
 +urxvtc "$@"
 +if [ $? -eq 2 ]; then
-+    urxvtd -q -f
++    urxvtd -q -o -f
 +    exec urxvtc "$@"
 +fi
diff --git a/x11/rxvt-unicode/files/patch-src::command.C b/x11/rxvt-unicode/files/patch-src::command.C
index b1ffc5d1d76f..f6fa8658b88d 100644
--- a/x11/rxvt-unicode/files/patch-src::command.C
+++ b/x11/rxvt-unicode/files/patch-src::command.C
@@ -1,14 +1,14 @@
---- src/command.C.orig	Tue Jul 12 22:11:42 2005
-+++ src/command.C	Mon Aug 15 00:40:13 2005
-@@ -55,6 +55,7 @@
+--- src/command.C.orig	2011-06-22 14:44:37.000000000 +0400
++++ src/command.C	2011-09-21 15:39:21.000000000 +0400
+@@ -57,6 +57,7 @@
  #endif
  
  #include <csignal>
 +#include <sys/param.h>
  
- /*----------------------------------------------------------------------*/
- 
-@@ -2716,7 +2717,9 @@
+ #if LINUX_YIELD_HACK
+ # include <ctime>
+@@ -2357,7 +2358,9 @@
        if (len == (size_t)-2)
          {
            // the mbstate stores incomplete sequences. didn't know this :/
diff --git a/x11/rxvt-unicode/files/patch-src::ptytty.C b/x11/rxvt-unicode/files/patch-src::ptytty.C
deleted file mode 100644
index 20d723c4434d..000000000000
--- a/x11/rxvt-unicode/files/patch-src::ptytty.C
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/ptytty.C.orig	Sat Jul 31 17:05:04 2004
-+++ src/ptytty.C	Tue Aug 10 18:16:01 2004
-@@ -33,6 +33,11 @@
- #endif
- #endif
- 
-+#if defined( __FreeBSD__)
-+#include <sys/types.h>
-+# include <libutil.h>
-+#endif
-+
- #include <cstdio>
- #ifdef HAVE_STDLIB_H
- # include <cstdlib>