From fd6d7231546647440c425cdbcd82066614d43a13 Mon Sep 17 00:00:00 2001
From: Andrej Zverev <az@FreeBSD.org>
Date: Tue, 14 Aug 2007 17:29:10 +0000
Subject: [PATCH] - Try build port with NLS support and recent version of
 gettext.

---
 misc/mc-light/Makefile             | 13 ++++++-------
 misc/mc-light/files/patch-po-ru.po | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 misc/mc-light/files/patch-po-ru.po

diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 629b0b98b36f..477862dfd711 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 
 CONFLICTS=	mc-4.6*
 
-OPTIONS=	NLS "Enable gettext support (broken)" on \
+OPTIONS=	NLS "Enable gettext support" on \
 		SUBSHELL "Build with subshell support (only for bash!)" off \
 		MC_IN_MC "Allow run mc inside mc (useful for mcedit)" off
 
@@ -43,14 +43,13 @@ MAN8=		mcserv.8
 CONFIGURE_ARGS+=--without-subshell
 .endif
 
-# XXX: ru.po is broken with gettext-0.16.1
-# XXX: .if !defined(WITHOUT_NLS)
-# XXX: USE_GETTEXT=	yes
-# XXX: PLIST_SUB+=	NLS=""
-# XXX: .else
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-# XXX: .endif
+.endif
 
 .if defined(WITH_MC_IN_MC)
 CONFIGURE_ENV+=	CPPFLAGS=-DMC_IN_MC_ALLOWED
diff --git a/misc/mc-light/files/patch-po-ru.po b/misc/mc-light/files/patch-po-ru.po
new file mode 100644
index 000000000000..61aee5a0dd3a
--- /dev/null
+++ b/misc/mc-light/files/patch-po-ru.po
@@ -0,0 +1,24 @@
+--- po/ru.po.orig	Mon Aug 30 23:55:58 2004
++++ po/ru.po	Tue Aug 14 21:17:35 2007
+@@ -875,7 +875,7 @@
+ 
+ #: src/fixhlp.c:181
+ msgid ""
+-"[Contents]\n"
++"[Contents]\n"
+ " Topics:\n"
+ "\n"
+ msgstr ""
+@@ -2404,10 +2404,10 @@
+ #: src/help.c:278
+ msgid ""
+ " Help file format error\n"
+-""
++""
+ msgstr ""
+ "Ошибка в формате файла помощи\n"
+-""
++""
+ 
+ #: src/help.c:317
+ msgid " Internal bug: Double start of link area "