- rxvt-unicode 4.0 change language name "cn" to "zh";

- provide mbrtowc() workaround for old FreeBSD systems without mbstate fix;
- extra patch for box drawing characters, which respected locale width data;
- bump PORTREVISION.

PR:		ports/72628
Submitted by:	Kuang-che Wu

3 files changed, 31 insertions, 8 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 8900e6ede4aa..f2025e8065f5 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rxvt-unicode
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -123,7 +124,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/locale/fr_FR.UTF-8/LC_TIME:${PORTSDIR}/misc/utf
 
 # compile in support for additional codeset groups
 .if defined(WITH_ENCODING)
-AVAIL_ENC=	jp jp_ext kr cn cn_ext all
+AVAIL_ENC=	jp jp_ext kr zh zh_ext all
 . for ENC in ${AVAIL_ENC}
 .  if (${WITH_ENCODING} == ${ENC})
 _ENC=		${ENC}
@@ -163,8 +164,8 @@ pre-everything::
 	@${ECHO_MSG} '==> Options are: "jp"     common japanese encodings;'
 	@${ECHO_MSG} '                 "jp_ext" rarely used but big japanese encodings;'
 	@${ECHO_MSG} '                 "kr"     korean encodings;'
-	@${ECHO_MSG} '                 "cn"     common chinese encodings;'
-	@${ECHO_MSG} '                 "cn_ext" rarely used but very big chinese encodigs;'
+	@${ECHO_MSG} '                 "zh"     common chinese encodings;'
+	@${ECHO_MSG} '                 "zh_ext" rarely used but very big chinese encodigs;'
 	@${ECHO_MSG} '                 "all"    all of the above;'
 	@${ECHO_MSG} '==> For example, "WITH_ENCODING=kr" for korean encodings.'
 	@${ECHO_MSG}
diff --git a/x11/rxvt-unicode/files/patch-src::command.C b/x11/rxvt-unicode/files/patch-src::command.C
index 2e8a0e73712c..d2d106c954a9 100644
--- a/x11/rxvt-unicode/files/patch-src::command.C
+++ b/x11/rxvt-unicode/files/patch-src::command.C
@@ -1,15 +1,26 @@
---- src/command.C.orig	Wed Aug 25 05:45:20 2004
-+++ src/command.C	Wed Aug 25 19:28:03 2004
-@@ -51,6 +51,8 @@
+--- src/command.C.orig	Sun Sep  5 11:25:22 2004
++++ src/command.C	Wed Oct 13 22:55:27 2004
+@@ -51,6 +51,9 @@
  #include "command.h"
  
  #include <wchar.h>
++#include <sys/param.h>
 +#include <sys/types.h>
 +#include <signal.h>
  
  /*----------------------------------------------------------------------*/
  
-@@ -4287,7 +4289,7 @@
+@@ -2697,7 +2700,9 @@
+       if (len == (size_t)-2)
+         {
+           // the mbstate stores incomplete sequences. didn't know this :/
++#if __FreeBSD_version>502110
+           cmdbuf_ptr = cmdbuf_endp;
++#endif
+           break;
+         }
+ 
+@@ -4295,7 +4300,7 @@
      {
        if (v_buflen == 0)
          {
@@ -18,7 +29,7 @@
  
            if ((unsigned int)written == len)
              return;
-@@ -4305,7 +4307,7 @@
+@@ -4313,7 +4318,7 @@
  
    for (;;)
      {
diff --git a/x11/rxvt-unicode/files/patch-src::rxvtfont.C b/x11/rxvt-unicode/files/patch-src::rxvtfont.C
new file mode 100644
index 000000000000..7bc04127d97a
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-src::rxvtfont.C
@@ -0,0 +1,11 @@
+--- src/rxvtfont.C.orig	Wed Sep  8 13:44:38 2004
++++ src/rxvtfont.C	Sun Oct  3 03:07:41 2004
+@@ -345,7 +345,7 @@
+           uint32_t *a = linedraw_command + (offs >> 4);
+           uint32_t *b = a + (offs & 15);
+ 
+-          int W = r->TermWin.fwidth;
++          int W = r->TermWin.fwidth * wcwidth(t);
+           int H = r->TermWin.fheight;
+ 
+           int x_[16];