Upgrade to 3.6.

PR:		30375
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net>
MAINTAINER timeout.
Assign maintainership to myself.

8 files changed, 172 insertions, 167 deletions

diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index b67477031655..158e37a9ec4e 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -6,25 +6,47 @@
 #
 
 PORTNAME=	recode
-PORTVERSION=	3.5
-PORTREVISION=	1
+PORTVERSION=	3.6
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	recode
 
-MAINTAINER=	torstenb@FreeBSD.org
+MAINTAINER=	demon@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib \
+		LIBS=-lintl
 
 MAN1=		recode.1
 
-pre-patch:
-	@${CP} ${FILESDIR}/ru.po ${WRKSRC}/po/
-	@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+post-extract: copy-po-files remove-info-files
+
+copy-po-files:
+	@${CP} ${FILESDIR}/ru.po ${WRKSRC}/i18n
+
+remove-info-files:
+	@${RM} -f ${WRKSRC}/doc/${PORTNAME}.info*
+
+post-patch: patch-po-files patch-configure patch-makeinfo
+
+patch-po-files:
+	@${PERL} -pi -e '\
+		if (/Project-Id-Version/) { \
+			s/3\.[45](r|\.[0-9])?/3.6/; \
+			s/: (Free )?recode/: GNU recode/; \
+		} \
+	' ${WRKSRC}/i18n/*.po
+
+patch-configure:
+	@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
+		${WRKSRC}/configure
+
+patch-makeinfo:
+	@${PERL} -pi.fbsd -e 's|\@MAKEINFO\@|\@MAKEINFO\@ --no-split|g' \
+		${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/converters/recode/distinfo b/converters/recode/distinfo
index b093d129243a..fa9b2e98988f 100644
--- a/converters/recode/distinfo
+++ b/converters/recode/distinfo
@@ -1 +1 @@
-MD5 (recode-3.5.tar.gz) = 5f2c54592e9f7af31a11e62c7babc81c
+MD5 (recode-3.6.tar.gz) = be3f40ad2e93dae5cd5f628264bf1877
diff --git a/converters/recode/files/patch-aa b/converters/recode/files/patch-aa
index 0eca3ffa6238..f8e7784ba6a7 100644
--- a/converters/recode/files/patch-aa
+++ b/converters/recode/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Fri Jul 30 22:43:08 1999
-+++ src/Makefile.in	Fri Jul 30 22:43:21 1999
-@@ -149,7 +149,7 @@
+--- src/Makefile.in.orig	Mon Jan 22 19:14:16 2001
++++ src/Makefile.in	Thu Sep  6 11:21:43 2001
+@@ -131,7 +131,7 @@
  
- librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c merged.c names.c outer.c recode.c request.c strip-pool.c task.c $(C_STEPS)
+ librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
  
 -librecode_la_LDFLAGS = -version-info 0:0:0
-+librecode_la_LDFLAGS = -version-info 3:5:0
- 
- INCLUDES = -I.. -I../intl -I$(srcdir) -I$(top_srcdir)/lib
++librecode_la_LDFLAGS = -version-info 3:6:0
  
+ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
+ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
diff --git a/converters/recode/files/patch-ab b/converters/recode/files/patch-ab
deleted file mode 100644
index 272e93c72fa2..000000000000
--- a/converters/recode/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/recode.texi.orig	Fri Jul 30 23:10:58 1999
-+++ doc/recode.texi	Fri Jul 30 23:11:14 1999
-@@ -2,6 +2,7 @@
- @c %**start of header
- @setfilename recode.info
- @settitle The @code{recode} reference manual
-+@dircategory GNU Recode
- @finalout
- @c %**end of header
- 
diff --git a/converters/recode/files/patch-configure b/converters/recode/files/patch-configure
index ba973694cf28..702bb48256bf 100644
--- a/converters/recode/files/patch-configure
+++ b/converters/recode/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Mon May 21 14:57:16 2001
-+++ configure	Mon May 21 14:57:24 2001
+--- configure.orig	Wed Jan  3 17:40:32 2001
++++ configure	Thu Sep  6 11:22:53 2001
 @@ -825,7 +825,7 @@
  esac
  
  
--ALL_LINGUAS="da de es fr nl pl pt sl sv"
-+ALL_LINGUAS="da de es fr nl pl pt ru sl sv"
+-ALL_LINGUAS="da de el es fr gl it nl pl pt sl sv"
++ALL_LINGUAS="da de el es fr gl it nl pl pt ru sl sv"
  
- for ac_prog in mawk gawk nawk awk
- do
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/converters/recode/files/ru.po b/converters/recode/files/ru.po
index 9096bbba529d..0e51735542cd 100644
--- a/converters/recode/files/ru.po
+++ b/converters/recode/files/ru.po
@@ -4,62 +4,57 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: recode 3.5\n"
-"POT-Creation-Date: 1999-05-18 08:46-0400\n"
-"PO-Revision-Date: 2000-10-16 19:18+04:00\n"
+"Project-Id-Version: recode 3.6\n"
+"POT-Creation-Date: 2001-01-02 22:35+0100\n"
+"PO-Revision-Date: 2001-06-11 23:05+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Dump all characters.
-#: src/debug.c:287
-msgid "UCS2   Mne   Description\n\n"
-msgstr "UCS2   Mne   Описание\n\n"
-
 # src/main.c:157
-#: src/main.c:140
+#: src/main.c:142
 msgid "No error"
 msgstr "Ошибки нет"
 
 # src/main.c:160
-#: src/main.c:143
+#: src/main.c:145
 msgid "Non canonical input"
 msgstr "Неканонический ввод"
 
 # src/main.c:163
-#: src/main.c:146
+#: src/main.c:148
 msgid "Ambiguous output"
 msgstr "Неоднозначный вывод"
 
 # src/main.c:166
-#: src/main.c:149
+#: src/main.c:151
 msgid "Untranslatable input"
 msgstr "Нетранслируемый ввод"
 
 # src/main.c:169
-#: src/main.c:152
+#: src/main.c:154
 msgid "Invalid input"
 msgstr "Неверный ввод"
 
 # src/main.c:172
-#: src/main.c:155
+#: src/main.c:157
 msgid "System detected problem"
 msgstr "Системно обнаруженная ошибка"
 
 # src/main.c:175
-#: src/main.c:158
+#: src/main.c:160
 msgid "Misuse of recoding library"
 msgstr "Неправильное использование библиотеки перекодировки"
 
 # src/main.c:178
-#: src/main.c:161
+#: src/main.c:163
 msgid "Internal recoding bug"
 msgstr "Внутренняя ошибка перекодировки"
 
 # src/main.c:454
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -90,26 +85,26 @@ msgstr ""
 "Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 # src/main.c:479
-#: src/main.c:231
+#: src/main.c:233
 #, c-format
 msgid "Try `%s %s' for more information.\n"
 msgstr "Попробуйте `%s %s' для более подробной информации.\n"
 
 # src/main.c:483
-#: src/main.c:235
+#: src/main.c:237
 msgid "Free `recode' converts files between various character sets and surfaces.\n"
 msgstr ""
 "Free `recode' преобразует файлы между различными наборами символов\n"
 "и представлениями.\n"
 
 # src/main.c:486
-#: src/main.c:239
+#: src/main.c:241
 #, c-format
 msgid "\nUsage: %s [OPTION]... [ [CHARSET] | REQUEST [FILE]... ]\n"
 msgstr "\nИспользование: %s [КЛЮЧ]... [ [НАБОР-СИМВОЛОВ] | ЗАПРОС [ФАЙЛ]... ]\n"
 
 # src/main.c:489
-#: src/main.c:242
+#: src/main.c:244
 msgid ""
 "\n"
 "If a long option shows an argument as mandatory, then it is mandatory\n"
@@ -121,11 +116,11 @@ msgstr ""
 "необязательных ключей.\n"
 
 # src/main.c:494
-#: src/main.c:248
+#: src/main.c:250
 msgid ""
 "\n"
 "Listings:\n"
-"  -l, --list[=FORMAT]        list one or all known charsets\n"
+"  -l, --list[=FORMAT]        list one or all known charsets and aliases\n"
 "  -k, --known=PAIRS          restrict charsets according to known PAIRS list\n"
 "  -h, --header[=[LN/]NAME]   write table NAME on stdout using LN, then exit\n"
 "  -F, --freeze-tables        write out a C module holding all tables\n"
@@ -137,6 +132,7 @@ msgstr ""
 "\n"
 "Вывод:\n"
 "  -l, --list[=ФОРМАТ]        вывести один или все известные наборы символов\n"
+"                             и синонимы\n"
 "  -k, --known=ПАРЫ           ограничить наборы символов в соответствии с\n"
 "                             известными ПАРАМИ\n"
 "  -h, --header[=[ЯЗЫК/]ИМЯ]  записать таблицу ИМЯ в стандартный вывод,\n"
@@ -150,7 +146,7 @@ msgstr ""
 "      --version              вывести информацию о версии и выйти\n"
 
 # src/main.c:506
-#: src/main.c:261
+#: src/main.c:263
 msgid ""
 "\n"
 "Operation modes:\n"
@@ -174,19 +170,19 @@ msgstr ""
 "                          последовательных проходов\n"
 
 # src/main.c:517
-#: src/main.c:273
+#: src/main.c:275
 msgid "  -p, --sequence=pipe     use pipe machinery for sequencing passes\n"
 msgstr ""
 "  -p, --sequence=pipe     использовать механизм каналов для\n"
 "                          последовательных проходов\n"
 
 # src/main.c:521
-#: src/main.c:278
+#: src/main.c:280
 msgid "  -p, --sequence=pipe     same as -i (on this system)\n"
 msgstr "  -p, --sequence=pipe     то же, что  -i (на этой системе)\n"
 
 # src/main.c:525
-#: src/main.c:283
+#: src/main.c:285
 msgid ""
 "\n"
 "Fine tuning:\n"
@@ -212,7 +208,7 @@ msgstr ""
 "                         способа перекодировки\n"
 
 # src/main.c:535
-#: src/main.c:294
+#: src/main.c:296
 msgid ""
 "\n"
 "Option -l with no FORMAT nor CHARSET list available charsets and surfaces.\n"
@@ -224,16 +220,16 @@ msgstr ""
 "`full' (или одно из `dohf').\n"
 
 #: src/main.c:302
-#, c-format
-msgid "Unless DEFAULT_CHARSET is set in environment, CHARSET defaults to `%s'.\n"
-msgstr "Если в среде отсутствует переменная DEFAULT_CHARSET, НАБОР-СИМВОЛОВ устанавливается в `%s'.\n"
-
-#: src/main.c:308
-msgid "CHARSET has no default, define DEFAULT_CHARSET in the environment.\n"
-msgstr "НАБОР-СИМВОЛОВ не имеет значения по умолчанию, определите DEFAULT_CHARSET в среде.\n"
+msgid ""
+"Unless DEFAULT_CHARSET is set in environment, CHARSET defaults to the locale\n"
+"dependent encoding, determined by LC_ALL, LC_CTYPE, LANG.\n"
+msgstr ""
+"Если в среде отсутствует переменная DEFAULT_CHARSET, НАБОР-СИМВОЛОВ\n"
+"устанавливается в соответствии с локалью, что определяется переменными LC_ALL,\n"
+"LC_CTYPE, LANG.\n"
 
 # src/main.c:540
-#: src/main.c:313
+#: src/main.c:307
 msgid ""
 "With -k, possible before charsets are listed for the given after CHARSET,\n"
 "both being tabular charsets, with PAIRS of the form `BEF1:AFT1,BEF2:AFT2,...'\n"
@@ -245,14 +241,14 @@ msgstr ""
 "причем ДОn и ПОСЛЕn являются кодами, заданными в виде десятичных чисел.\n"
 
 # src/main.c:545
-#: src/main.c:318
+#: src/main.c:312
 msgid "LN is some language, it may be `c', `perl' or `po'; `c' is the default.\n"
 msgstr ""
 "ЯЗЫК представляет язык программирования; это может быть `c', `perl' или `po'.\n"
 "По умолчанию используется `c'.\n"
 
 # src/main.c:548
-#: src/main.c:321
+#: src/main.c:315
 msgid ""
 "\n"
 "REQUEST is SUBREQUEST[,SUBREQUEST]...; SUBREQUEST is ENCODING[..ENCODING]...\n"
@@ -272,7 +268,7 @@ msgstr ""
 "Смотрите руководство.\n"
 
 # src/main.c:556
-#: src/main.c:329
+#: src/main.c:323
 msgid ""
 "\n"
 "If none of -i and -p are given, presume -p if no FILE, else -i.\n"
@@ -286,54 +282,53 @@ msgstr ""
 "на стандартный выход.\n"
 
 # src/main.c:562
-#: src/main.c:335
+#: src/main.c:329
 msgid "\nReport bugs to <recode-bugs@iro.umontreal.ca>.\n"
 msgstr "\nО замеченных ошибках сообщайте по адресу <recode-bugs@iro.umontreal.ca>.\n"
 
-# src/main.c:659
-#: src/main.c:431
+#: src/main.c:430
 #, c-format
-msgid "Ambiguous sequence `%s'"
+msgid "Sequence `%s' is ambiguous"
 msgstr "Неоднозначная последовательность `%s'"
 
-# src/main.c:663
-#: src/main.c:435
+#: src/main.c:434
 #, c-format
-msgid "Unknown sequence `%s'"
+msgid "Sequence `%s' is unknown"
 msgstr "Неизвестная последовательность `%s'"
 
-# src/main.c:693 src/main.c:747
-#: src/main.c:465 src/main.c:523
+#: src/main.c:464 src/main.c:522
 #, c-format
-msgid "Ambiguous language `%s'"
+msgid "Language `%s' is ambiguous"
 msgstr "Неоднозначный язык `%s'"
 
-# src/main.c:697 src/main.c:751
 #. -1
-#: src/main.c:469 src/main.c:527
+#: src/main.c:468 src/main.c:526
 #, c-format
-msgid "Unknown language `%s'"
+msgid "Language `%s' is unknown"
 msgstr "Неизвестный язык `%s'"
 
-# src/main.c:785
-#: src/main.c:561
+#: src/main.c:560
 #, c-format
-msgid "Ambiguous format `%s'"
+msgid "Format `%s' is ambiguous"
 msgstr "Неоднозначный формат `%s'"
 
-# src/main.c:789
-#: src/main.c:565
+#: src/main.c:564
 #, c-format
-msgid "Unknown format `%s'"
+msgid "Format `%s' is unknown"
 msgstr "Неизвестный формат `%s'"
 
+# src/main.c:854
+#: src/main.c:621
+msgid "Written by Franc,ois Pinard <pinard@iro.umontreal.ca>.\n"
+msgstr "Программа написана Франсуа Пинардом <pinard@iro.umontreal.ca>.\n"
+
 # src/main.c:846
-#: src/main.c:622
+#: src/main.c:624
 msgid "\nCopyright (C) 1990, 92, 93, 94, 96, 97, 99 Free Software Foundation, Inc.\n"
 msgstr "\nCopyright (C) 1990, 92, 93, 94, 96, 97, 99 Free Software Foundation, Inc.\n"
 
 # src/main.c:850
-#: src/main.c:626
+#: src/main.c:628
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -342,60 +337,68 @@ msgstr ""
 "исходном тексте.  Не предоставляется НИКАКИХ гарантий, даже гарантии ПОЛЕЗНОСТИ\n"
 "или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ.\n"
 
-# src/main.c:854
-#: src/main.c:630
-msgid "\nWritten by Franc,ois Pinard <pinard@iro.umontreal.ca>.\n"
-msgstr "\nПрограмма написана Франсуа Пинардом <pinard@iro.umontreal.ca>.\n"
+#: src/main.c:669
+#, c-format
+msgid "Symbol `%s' is unknown"
+msgstr "Неизвестный символ `%s'"
+
+#: src/main.c:709 src/main.c:723
+#, c-format
+msgid "Charset `%s' is unknown or ambiguous"
+msgstr "Неизвестный или неоднозначный набор символов `%s'"
+
+#: src/main.c:754
+msgid "Required argument is missing"
+msgstr "Пропущен обязательный аргумент"
 
 # src/main.c:999
-#: src/main.c:775
+#: src/main.c:797
 #, c-format
-msgid "Deprecated syntax, please prefer `%s'"
+msgid "Syntax is deprecated, please prefer `%s'"
 msgstr "Нерекомендованный синтаксис, используйте, пожалуйста, `%s'"
 
-# src/main.c:1005
-#: src/main.c:781
+#: src/main.c:803
 #, c-format
-msgid "Erroneous request `%s'"
+msgid "Request `%s' is erroneous"
 msgstr "Ошибочный запрос `%s'"
 
 # src/main.c:1098
-#: src/main.c:878
+#: src/main.c:903
 #, c-format
 msgid "Recoding %s..."
 msgstr "Перекодировка %s..."
 
 # src/main.c:1108
-#: src/main.c:888
+#: src/main.c:913
 msgid " done\n"
 msgstr " готово\n"
 
 # src/main.c:1142
-#: src/main.c:924
+#: src/main.c:954
 #, c-format
-msgid " failed: %s in %s..%s\n"
-msgstr " ошибка: %s в %s..%s\n"
+msgid " failed: %s in step `%s..%s'\n"
+msgstr " ошибка: %s в `%s..%s'\n"
 
 # src/main.c:1149
-#: src/main.c:931
+#: src/main.c:961
 #, c-format
-msgid "%s failed: %s in %s..%s"
-msgstr "%s закончилось неудачей: %s в %s..%s"
+msgid "%s failed: %s in step `%s..%s'"
+msgstr "%s закончилось неудачей: %s в `%s..%s'"
 
 # src/main.c:1172
-#: src/main.c:954
+#: src/main.c:984
 #, c-format
-msgid "%s in %s..%s"
-msgstr "%s в %s..%s"
+msgid "%s in step `%s..%s'"
+msgstr "%s в `%s..%s'"
 
 # src/names.c:259
-#: src/names.c:317
+#: src/names.c:335
 #, c-format
 msgid "Charset %s already exists and is not %s"
 msgstr "Набор символов %s уже существует и не является %s"
 
 # src/names.c:754
-#: src/names.c:819
+#: src/names.c:831
 #, c-format
 msgid "Cannot list `%s', no names available for this charset"
 msgstr "Невозможно вывести `%s', для этой набора символов нет доступных имен"
@@ -403,26 +406,25 @@ msgstr "Невозможно вывести `%s', для этой набора символов нет доступных имен"
 # src/names.c:854
 #. code counter
 #. expected value for code counter
-#. UCS-2 translation
 #. insert a while line before printing
 #. Print the long table according to explode data.
-#: src/names.c:974 src/names.c:1020
+#: src/names.c:984 src/names.c:1030
 #, c-format
 msgid "Dec  Oct Hex   UCS2  Mne  %s\n"
 msgstr "Dec  Oct Hex   UCS2  Mne  %s\n"
 
 # src/names.c:847
-#: src/names.c:1039
+#: src/names.c:1049
 #, c-format
 msgid "Sorry, no names available for `%s'"
 msgstr "Извините, для `%s' нет доступного имени"
 
-#: src/outer.c:95
+#: src/outer.c:125
 #, c-format
 msgid "Resurfacer set more than once for `%s'"
 msgstr "Изменение представления для `%s' установлено более одного раза"
 
-#: src/outer.c:102
+#: src/outer.c:133
 #, c-format
 msgid "Unsurfacer set more than once for `%s'"
 msgstr ""
@@ -467,100 +469,104 @@ msgid "Cannot complete table from set of known pairs"
 msgstr "Не удается закончить таблицу из набора известных пар"
 
 # src/recode.c:504
-#: src/recode.c:492
+#: src/recode.c:497
 msgid "Identity recoding, not worth a table"
 msgstr "Тождественная перекодировка, нет необходимости в таблице"
 
 # src/recode.c:512
-#: src/recode.c:499
+#: src/recode.c:504
 msgid "Recoding is too complex for a mere table"
 msgstr "Перекодировка слишком сложна для простой таблицы"
 
 # src/recode.c:544
 #. Print the header of the header file.
-#: src/recode.c:531
+#: src/recode.c:536
 #, c-format
 msgid "%sConversion table generated mechanically by Free `%s' %s"
 msgstr "%sТаблица перекодировки создана автоматически с помощью Free `%s' %s"
 
 # src/recode.c:546
-#: src/recode.c:533
+#: src/recode.c:538
 #, c-format
 msgid "%sfor sequence %s.%s"
 msgstr "%sдля последовательности %s.%s"
 
 # src/recode.c:736
-#: src/recode.c:724
+#: src/recode.c:744
 msgid "No table to print"
 msgstr "Нет таблицы для печати"
 
-#: src/request.c:35
+#: src/request.c:34
 msgid "reversible"
 msgstr "обратимый"
 
-#: src/request.c:37
+#: src/request.c:36
 #, c-format
 msgid "%s to %s"
 msgstr "%s в %s"
 
-#: src/request.c:38 src/request.c:40
+#: src/request.c:37 src/request.c:39
 msgid "byte"
 msgstr "байт"
 
-#: src/request.c:39 src/request.c:41
+#: src/request.c:38 src/request.c:40
 msgid "ucs2"
 msgstr "ucs2"
 
-#: src/request.c:39 src/request.c:41
+#: src/request.c:38 src/request.c:40
 msgid "variable"
 msgstr "переменная"
 
-#: src/request.c:112
+#: src/request.c:111
 msgid "*Unachievable*"
 msgstr "*Недоступный*"
 
-#: src/request.c:114
+#: src/request.c:113
 msgid "*mere copy*"
 msgstr "*просто копия*"
 
 # src/recode.c:117 src/recode.c:129
-#: src/request.c:244
+#: src/request.c:246
 msgid "Virtual memory exhausted!"
 msgstr "Виртуальная память исчерпана!"
 
-#: src/request.c:263
+#: src/request.c:265
 msgid "Step initialisation failed"
 msgstr "Ошибка шага инициализации"
 
-#: src/request.c:270
+#: src/request.c:272
 msgid "Step initialisation failed (unprocessed options)"
 msgstr "Ошибка шага инициализации (необработанный ключ)"
 
-#: src/request.c:566
+#: src/request.c:568
 #, c-format
 msgid "Request: %s\n"
 msgstr "Запрос: %s\n"
 
-#: src/request.c:702
+#: src/request.c:720
 #, c-format
 msgid "Shrunk to: %s\n"
 msgstr "Сжать до: %s\n"
 
-#: src/request.c:806 src/request.c:912
+#: src/request.c:823 src/request.c:932
 #, c-format
 msgid "Unrecognised surface name `%s'"
 msgstr "Нераспознанное имя представления `%s'"
 
-#: src/request.c:884
+#: src/request.c:903
 #, c-format
 msgid "No way to recode from `%s' to `%s'"
 msgstr "Нет возможности перекодировать из `%s' в `%s'"
 
-#: src/request.c:992
+#: src/request.c:1013
 msgid "Expecting `..' in request"
 msgstr "В запросе ожидается `..'"
 
-#: src/task.c:751 src/task.c:915
+#: src/task.c:826 src/task.c:1002
 #, c-format
 msgid "Child process wait status is 0x%0.2x"
 msgstr "Статус ожидания дочернего процесса равен 0x%0.2x"
+
+#: src/testdump.c:298
+msgid "UCS2   Mne   Description\n\n"
+msgstr "UCS2   Mne   Описание\n\n"
diff --git a/converters/recode/pkg-descr b/converters/recode/pkg-descr
index f6c2b11d8037..7b15960b02ec 100644
--- a/converters/recode/pkg-descr
+++ b/converters/recode/pkg-descr
@@ -1,21 +1,11 @@
-GNU `recode' converts files between character sets and usages.  When
-exact transliterations are not possible, it may get rid of the
-offending characters or fall back on approximations.  This program
-recognizes or produces nearly 150 different character sets and is able
-to transliterate files between almost any pair.  Most RFC 1345
-character sets are supported.
+GNU `recode' has the purpose of converting files between various
+character sets and usages. When exact transliterations are not
+possible, as it is often the case, the program may get rid of the
+offending characters or fall back on approximations.
 
-----------------------------------------------------------------
-There is also a patch avaliable for the bibliographic
-character sets: 
+This program recognizes or produces around 150 different character
+sets and is able to transliterate files between almost any pair.
 
-	ISO 5426:1983
-	Extension of the Latin alphabet coded character set for bibliographic
-	information interchange.
+Most RFC 1345 character sets are supported.
 
-	Z39.47-1993 Extended Latin Alphabet Coded Character Set for
-	Bibliographic Use (ANSEL)
-	[also known as 8-Bit ANSEL, used by USMARC]
-
-See http://www.de.freebsd.org/~wosch/src/recode/
-Extract the archive and follow the instructions in README.bib.
+WWW: http://www.gnu.org/software/recode/recode.html
diff --git a/converters/recode/pkg-plist b/converters/recode/pkg-plist
index 66062584d6a2..c9a266cacb91 100644
--- a/converters/recode/pkg-plist
+++ b/converters/recode/pkg-plist
@@ -1,22 +1,19 @@
 bin/recode
+include/recode.h
+include/recodext.h
 @unexec install-info --delete %D/info/recode.info %D/info/dir
 info/recode.info
-info/recode.info-1
-info/recode.info-2
-info/recode.info-3
-info/recode.info-4
-info/recode.info-5
-info/recode.info-6
-@exec install-info --delete %D/info/recode.info %D/info/dir
+@exec install-info %D/info/recode.info %D/info/dir
 lib/librecode.a
 lib/librecode.so
 lib/librecode.so.3
-include/recode.h
-include/recodext.h
 share/locale/da/LC_MESSAGES/recode.mo
 share/locale/de/LC_MESSAGES/recode.mo
+share/locale/el/LC_MESSAGES/recode.mo
 share/locale/es/LC_MESSAGES/recode.mo
 share/locale/fr/LC_MESSAGES/recode.mo
+share/locale/gl/LC_MESSAGES/recode.mo
+share/locale/it/LC_MESSAGES/recode.mo
 share/locale/nl/LC_MESSAGES/recode.mo
 share/locale/pl/LC_MESSAGES/recode.mo
 share/locale/pt/LC_MESSAGES/recode.mo