Date: Tue, 3 May 2011 23:48:38 +0300 From: Valentin Nechayev <netch@netch.kiev.ua> To: freebsd-ports@FreeBSD.org, Dmitry Marakasov <amdmi3@amdmi3.ru> Subject: Re: cvs commit: ports/sysutils/screen Makefile pkg-plist ports/sysutils/screen/ (fwd) Message-ID: <20110503204838.GA26819@netch.kiev.ua> In-Reply-To: <201105031949.p43JnStA065877@cwsys.cwsent.com> References: <20110503194409.GC65916@netch.kiev.ua> <201105031949.p43JnStA065877@cwsys.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Tue, May 03, 2011 at 12:49:28, Cy.Schubert wrote about "Re: cvs commit: ports/sysutils/screen Makefile pkg-plist ports/sysutils/screen/ (fwd)": > Unfortunately I will not commit any patched version of this patch without > having it fully tested. As I do not use UTF8 character sets, I cannot tell > if the patch will work or not. OK. Dmitry and other volunteers, please test the following. At least it correctly works on my system within the following modes: 1) utf-8 both outside and inside 2) koi8-u both outside and inside 3) koi8-r both outside and inside 4) koi8-u outside, utf-8 inside 5) utf-8 outside, koi8-u inside The factor I missed in previous patch is that coding number in ansi.h shall be equal to offset in encodings[]. diff -u -rNu 0/ports/sysutils/screen/Makefile 1/ports/sysutils/screen/Makefile --- 0/ports/sysutils/screen/Makefile 2011-01-04 05:28:30.000000000 +0200 +++ 1/ports/sysutils/screen/Makefile 2011-03-29 12:12:08.557420238 +0300 @@ -7,7 +7,7 @@ PORTNAME= screen PORTVERSION= 4.0.3 -PORTREVISION= 10 +PORTREVISION= 12 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ http://komquats.com/distfiles/ \ @@ -74,6 +74,7 @@ post-patch: @${RM} ${WRKSRC}/doc/screen.info* @${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure + uudecode -o ${WRKSRC}/utf8encodings/a3 ${FILESDIR}/uue-utf8encodings_a3 post-install: @${MKDIR} ${EXAMPLESDIR} diff -u -rNu 0/ports/sysutils/screen/files/patch-ansi.h 1/ports/sysutils/screen/files/patch-ansi.h --- 0/ports/sysutils/screen/files/patch-ansi.h 1970-01-01 03:00:00.000000000 +0300 +++ 1/ports/sysutils/screen/files/patch-ansi.h 2011-05-03 23:19:08.376097400 +0300 @@ -0,0 +1,10 @@ +--- ansi.h ++++ ansi.h +@@ -128,6 +128,7 @@ + #define KOI8R 6 + #define CP1251 7 + #define GBK 20 ++#define KOI8U 21 + + #define EUC EUC_JP + diff -u -rNu 0/ports/sysutils/screen/files/patch-doc_screen.1 1/ports/sysutils/screen/files/patch-doc_screen.1 --- 0/ports/sysutils/screen/files/patch-doc_screen.1 1970-01-01 03:00:00.000000000 +0300 +++ 1/ports/sysutils/screen/files/patch-doc_screen.1 2011-03-29 12:04:42.049544451 +0300 @@ -0,0 +1,15 @@ +diff -u -rNu doc/screen.1 doc/screen.1 +--- doc/screen.1 2003-12-05 15:51:57.000000000 +0200 ++++ doc/screen.1 2011-03-29 11:22:55.739089194 +0300 +@@ -1688,8 +1688,9 @@ + There is also a way to select a terminal encoding depending on + the terminal type by using the \*QKJ\*U termcap entry. + +-Supported encodings are eucJP, SJIS, eucKR, eucCN, Big5, GBK, KOI8-R, +-CP1251, UTF-8, ISO8859-2, ISO8859-3, ISO8859-4, ISO8859-5, ISO8859-6, ++Supported encodings are eucJP, SJIS, eucKR, eucCN, Big5, GBK, ++KOI8-R, KOI8-U, CP1251, UTF-8, ++ISO8859-2, ISO8859-3, ISO8859-4, ISO8859-5, ISO8859-6, + ISO8859-7, ISO8859-8, ISO8859-9, ISO8859-10, ISO8859-15, jis. + + See also \*Qdefencoding\*U, which changes the default setting of a new diff -u -rNu 0/ports/sysutils/screen/files/patch-doc_screen.texinfo 1/ports/sysutils/screen/files/patch-doc_screen.texinfo --- 0/ports/sysutils/screen/files/patch-doc_screen.texinfo 1970-01-01 03:00:00.000000000 +0300 +++ 1/ports/sysutils/screen/files/patch-doc_screen.texinfo 2011-03-29 12:05:34.814438254 +0300 @@ -0,0 +1,13 @@ +diff -u -rNu doc/screen.texinfo doc/screen.texinfo +--- doc/screen.texinfo 2003-12-05 15:51:46.000000000 +0200 ++++ doc/screen.texinfo 2011-03-29 11:22:30.536269863 +0300 +@@ -2726,7 +2726,8 @@ + + Supported encodings are + @code{eucJP}, @code{SJIS}, @code{eucKR}, +-@code{eucCN}, @code{Big5}, @code{GBK}, @code{KOI8-R}, @code{CP1251}, ++@code{eucCN}, @code{Big5}, @code{GBK}, ++@code{KOI8-R}, @code{KOI8-U}, @code{CP1251}, + @code{UTF-8}, @code{ISO8859-2}, @code{ISO8859-3}, + @code{ISO8859-4}, @code{ISO8859-5}, @code{ISO8859-6}, + @code{ISO8859-7}, @code{ISO8859-8}, @code{ISO8859-9}, diff -u -rNu 0/ports/sysutils/screen/files/patch-encoding.c 1/ports/sysutils/screen/files/patch-encoding.c --- 0/ports/sysutils/screen/files/patch-encoding.c 1970-01-01 03:00:00.000000000 +0300 +++ 1/ports/sysutils/screen/files/patch-encoding.c 2011-05-03 23:20:03.466558553 +0300 @@ -0,0 +1,20 @@ +--- encoding.c ++++ encoding.c +@@ -57,6 +57,7 @@ + + /* big5 font: ^X */ + /* KOI8-R font: 96 ! */ ++/* KOI8-U font: 96 # */ + /* CP1251 font: 96 ? */ + + struct encoding encodings[] = { +@@ -80,7 +81,8 @@ + { "ISO8859-10", 0, 0x80|'V', 0, 0, 0 }, + { "ISO8859-15", 0, 0x80|'b', 0, 0, 0 }, + { "jis", 0, 0, 0, 0, "\002\004I" }, +- { "GBK", "B\031BB01", 0x80|'b', 1, 1, "\031" } ++ { "GBK", "B\031BB01", 0x80|'b', 1, 1, "\031" }, ++ { "KOI8-U", 0, 0x80|'#', 0, 1, 0 } + }; + + #ifdef UTF8 diff -u -rNu 0/ports/sysutils/screen/files/uue-utf8encodings_a3 1/ports/sysutils/screen/files/uue-utf8encodings_a3 --- 0/ports/sysutils/screen/files/uue-utf8encodings_a3 1970-01-01 03:00:00.000000000 +0300 +++ 1/ports/sysutils/screen/files/uue-utf8encodings_a3 2011-03-29 12:08:22.530210526 +0300 @@ -0,0 +1,15 @@ +begin 644 a3 +M4V-R965N23)55$8X`*,`@$M/23@M50```(`E``"!)0(`@B4,`(,E$`"$)10` +MA248`(8E'`"')20`B"4L`(DE-`"*)3P`BR6``(PEA`"-)8@`CB6,`(\ED`"0 +M)9$`D262`)(EDP"3(R``E"6@`)4B&0"6(AH`ER)(`)@B9`"9(F4`F@"@`)LC +M(0"<`+``G0"R`)X`MP"?`/<`H"50`*$E40"B)5(`HP11`*0$5`"E)50`I@16 +M`*<$5P"H)5<`J258`*HE60"K)5H`K"5;`*T$D0"N)5T`KR5>`+`E7P"Q)6`` +MLB5A`+,$`0"T!`,`M25C`+8$!@"W!`<`N"5F`+DE9P"Z)6@`NR5I`+PE:@"] +M!)``OB5L`+\`J0#`!$X`P00P`,($,0##!$8`Q`0T`,4$-0#&!$0`QP0S`,@$ +M10#)!#@`R@0Y`,L$.@#,!#L`S00\`,X$/0#/!#X`T`0_`-$$3P#2!$``TP1! +M`-0$0@#5!$,`U@0V`-<$,@#8!$P`V01+`-H$-P#;!$@`W`1-`-T$20#>!$<` +MWP1*`.`$+@#A!!``X@01`.,$)@#D!!0`Y005`.8$)`#G!!,`Z`0E`.D$&`#J +M!!D`ZP0:`.P$&P#M!!P`[@0=`.\$'@#P!!\`\00O`/($(`#S!"$`]`0B`/4$ +I(P#V!!8`]P02`/@$+`#Y!"L`^@07`/L$*`#\!"T`_00I`/X$)P#_!"H` +` +end diff -u -rNu 0/ports/sysutils/screen/pkg-plist 1/ports/sysutils/screen/pkg-plist --- 0/ports/sysutils/screen/pkg-plist 2004-08-30 11:06:56.000000000 +0300 +++ 1/ports/sysutils/screen/pkg-plist 2011-04-30 07:28:39.702907985 +0300 @@ -6,6 +6,7 @@ %%DATADIR%%/utf8encodings/18 %%DATADIR%%/utf8encodings/19 %%DATADIR%%/utf8encodings/a1 +%%DATADIR%%/utf8encodings/a3 %%DATADIR%%/utf8encodings/bf %%DATADIR%%/utf8encodings/c2 %%DATADIR%%/utf8encodings/c3 -netch-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110503204838.GA26819>