Really fix the incompatibilities with gettext 0.11. The previous

bandaid is reverted by this commit and instead patches are added
which will remove duplicate message entries from the .po files for
the plugin.

These are essentially the patches of marius@alchemy.franken.de, with
the first part of each patch removed (the message does actually have
two spaces in the code!).  These patches were verified with the script
submitted by KANOU Hiroki-san and against the patches submitted by
SUGIMURA Takashi-san.  Thanks to all of these people.

Apologies for the increasingly long patch names.

PR:		37087, 37147
Submitted by:	marius@alchemy.franken.de
Reviewed by:	sobomax
Approved by:	sobomax

9 files changed, 176 insertions, 10 deletions

diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 6ad42195b252..e4b5c43a114f 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-jdk13 \
 		${X11BASE}/lib/libMrm.a:${PORTSDIR}/x11-toolkits/open-motif-devel
 .if !defined(WITHOUT_PLUGIN)
-BUILD_DEPENDS+=	msgfmt-old:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
 		gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
 		nspr4.1:$(PORTSDIR)/devel/nspr
diff --git a/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
index 9fb83c620796..3f6876b47f3b 100644
--- a/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
+++ b/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -3,15 +3,6 @@ $FreeBSD$
 
 --- ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:35:23	1.1
 +++ ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:36:33
-@@ -481,7 +481,7 @@
- 
- $(OUTPUT_DIR)/lib/locale/%/LC_MESSAGES/sunw_java_plugin.mo : $(RESOURCESRCDIR)/%/sunw_java_plugin.po
- 	@mkdir -p $(@D)
--	msgfmt -o $(@) $<
-+	msgfmt-old -o $(@) $<
- 
- 
- #----------------------------------------------------------------------
 @@ -645,7 +645,7 @@
  $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
  	export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ja::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ja::sunw_java_plugin.po
new file mode 100644
index 000000000000..893ca8fdfabb
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ja::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po	Sat Apr 27 01:05:41 2002
+@@ -21,20 +21,12 @@
+ msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "Plugin: ディレクトリを読み取れません。"
+-msgid  "plugin: java process exited with status"
+-msgstr "plugin: java プロセスが終了状態付きで終了しました。"
+ msgid  "plugin: java process died due to signal"
+ msgstr "plugin: java プロセスがシグナルのために終了しました。"
+ msgid  "  a core file was generated"
+ msgstr "  コアファイルが生成されました。"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "Plugin: 子からの処理要求に失敗しました。"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "Plugin: 現ホストの IP アドレスが見つかりません。"
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "Plugin: ディレクトリ plugins/../java が見つかりません。"
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "Plugin: 子からの予期しない処理要求です。"
+ msgid  "Plugin: Java VM process has died."
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ko.UTF-8::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ko.UTF-8::sunw_java_plugin.po
new file mode 100644
index 000000000000..4e57bcce47cb
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ko.UTF-8::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po	Sat Apr 27 01:06:46 2002
+@@ -21,20 +21,12 @@
+ msgstr "������蠏語��: ��れ����朱��覿���� Netscape �����曙�� 蟲���� URL��� ��曙�� ��� �����給�����.\n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "������蠏語��: ���������襴�襯� ��曙�� ��� �����給�����."
+-msgid  "plugin: java process exited with status"
+-msgstr "������蠏語��: ������ ������襦� ���覦� ���襦���語�るゼ 譬�襭����������."
+ msgid  "plugin: java process died due to signal"
+ msgstr "������蠏語��: �����碁�� ��誤�� ���覦� ���襦���語�り�� 譴������������給�����."
+ msgid  "  a core file was generated"
+ msgstr "  貊���� �����殊�� �����焔�������給�����."
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "������蠏語��: ������襦�覿���一�� ������ ���豌���� 覓語��螳� 覦���������給�����."
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "������蠏語��: ������ ��語�ろ�語�� IP 譯殊��襯� 谿場�� ��� �����給�����."
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "������蠏語��: ��れ����朱��覿���� Netscape �����曙�� 蟲���� URL��� ��曙�� ��� �����給�����.\n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "������蠏語��: plugins/../java ���������襴�襯� 谿場�� ��� �����給�����."
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "������蠏語��: ������襦�覿���一�� ������豺� 覈詩�� ������ ���豌����������."
+ msgid  "Plugin: Java VM process has died."
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ko::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ko::sunw_java_plugin.po
new file mode 100644
index 000000000000..7c0bef56bbe5
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::ko::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po	Sat Apr 27 01:06:37 2002
+@@ -21,20 +21,12 @@
+ msgstr "巴君益昔: 陥製生稽採斗 Netscape 覗喰獣 姥失 URL聖 石聖 呪 蒸柔艦陥.\n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "巴君益昔: 巨刑塘軒研 石聖 呪 蒸柔艦陥."
+-msgid  "plugin: java process exited with status"
+-msgstr "巴君益昔: 薄仙 雌殿稽 切郊 覗稽室什研 曽戟杯艦陥."
+ msgid  "plugin: java process died due to signal"
+ msgstr "巴君益昔: 重硲稽 昔背 切郊 覗稽室什亜 掻舘鞠醸柔艦陥."
+ msgid  "  a core file was generated"
+ msgstr "  坪嬢 督析戚 持失鞠醸柔艦陥."
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "巴君益昔: 馬是稽採斗税 拙穣 推短拭 庚薦亜 降持梅柔艦陥."
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "巴君益昔: 薄仙 硲什闘税 IP 爽社研 達聖 呪 蒸柔艦陥."
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "巴君益昔: 陥製生稽採斗 Netscape 覗喰獣 姥失 URL聖 石聖 呪 蒸柔艦陥.\n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "巴君益昔: plugins/../java 巨刑塘軒研 達聖 呪 蒸柔艦陥."
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "巴君益昔: 馬是稽採斗税 森雌帖 公廃 拙穣 推短脊艦陥."
+ msgid  "Plugin: Java VM process has died."
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po
new file mode 100644
index 000000000000..b562ec38b669
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po	Sat Apr 27 01:07:14 2002
+@@ -21,20 +21,12 @@
+ msgstr "峨周�佐嗜汰仞還感組� Netscape 旗尖捲暦匂塘崔 URL 嗤諒籾\n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "峨周�採涎╋組…紳�"
+-msgid  "plugin: java process exited with status"
+-msgstr "峨周��java 厮揮彜蓑曜竃"
+ msgid  "plugin: java process died due to signal"
+ msgstr "峨周��java 序殻厮咀佚催遇棒"
+ msgid  "  a core file was generated"
+ msgstr " 伏撹阻匯倖坪宰猟周"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "峨周�佐�尖栖徭徨窃議垢恬萩箔嗤諒籾"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "峨周�砕匆撒週映慰�字議 IP 仇峽"
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "峨周�佐嗜汰仞還感組� Netscape 旗尖捲暦匂塘崔 URL 嗤諒籾\n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "峨周�砕匆撒� plugins/../java 朕村"
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "峨周�裟閑墸喟犁漬睛盖長ぷ�萩箔"
+ msgid  "Plugin: Java VM process has died."
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh::sunw_java_plugin.po
new file mode 100644
index 000000000000..e2e3af75322d
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po	Sat Apr 27 01:06:57 2002
+@@ -21,20 +21,12 @@
+ msgstr "峨周�佐嗜汰仞還感組� Netscape 旗尖捲暦匂塘崔 URL 嗤諒籾\n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "峨周�採涎╋組…紳�"
+-msgid  "plugin: java process exited with status"
+-msgstr "峨周��java 厮揮彜蓑曜竃"
+ msgid  "plugin: java process died due to signal"
+ msgstr "峨周��java 序殻厮咀佚催遇棒"
+ msgid  "  a core file was generated"
+ msgstr " 伏撹阻匯倖坪宰猟周"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "峨周�佐�尖栖徭徨窃議垢恬萩箔嗤諒籾"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "峨周�砕匆撒週映慰�字議 IP 仇峽"
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "峨周�佐嗜汰仞還感組� Netscape 旗尖捲暦匂塘崔 URL 嗤諒籾\n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "峨周�砕匆撒� plugins/../java 朕村"
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "峨周�裟閑墸喟犁漬睛盖長ぷ�萩箔"
+ msgid  "Plugin: Java VM process has died."
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh_TW.BIG5::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh_TW.BIG5::sunw_java_plugin.po
new file mode 100644
index 000000000000..0dddf7d15a8b
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh_TW.BIG5::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Sat Apr 27 01:07:46 2002
+@@ -21,20 +21,12 @@
+ msgstr "Plugin: 的�� Netscape �N�z�]�w URL �謬oネ維�D\n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "Plugin: �L�k的��ヘ雀"
+-msgid  "plugin: java process exited with status"
+-msgstr "plugin: java �{�農H���A�h�X"
+ msgid  "plugin: java process died due to signal"
+ msgstr "plugin: java �{�任w�]�T弦τ郡"
+ msgid  "  a core file was generated"
+ msgstr "  �w横ネ�屬濱筆�"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "Plugin: �l寵�O�勠n�D�困u�@�oネ維�D"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "Plugin: тぃ�譽惓e�D穣�� IP �讌}"
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "Plugin: 的�� Netscape �N�z�t�m URL �謬oネ維�D\n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "Plugin: тぃ�� plugins/../java ヘ雀"
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "Plugin: �l寵�O�n�D�F�D�w漢�困u�@"
+ msgid  "Plugin: Java VM process has died."
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh_TW::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh_TW::sunw_java_plugin.po
new file mode 100644
index 000000000000..b6bd168cd078
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh_TW::sunw_java_plugin.po
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
++++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Sat Apr 27 01:07:31 2002
+@@ -21,20 +21,12 @@
+ msgstr "Plugin: ��冥 Netscape 梼棔歟薮 URL 寞瑪畷拌��\n"
+ msgid  "Plugin: couldn't read directory"
+ msgstr "Plugin: 獎領��冥賑鱧"
+-msgid  "plugin: java process exited with status"
+-msgstr "plugin: java 瓧仏鴆零蓙慷祷"
+ msgid  "plugin: java process died due to signal"
+ msgstr "plugin: java 瓧仏椿媒惺羸挽籀"
+ msgid  "  a core file was generated"
+ msgstr "  椿棣畷尨点齟尸"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "Plugin: 塚�防瑛墫冓緡�綴柊瑪畷拌��"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "Plugin: 米亭妙賑乂塘顴煉 IP 罷敷"
+-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+-msgstr "Plugin: ��冥 Netscape 梼棔慵續 URL 寞瑪畷拌��\n"
+-msgid  "Plugin: can't find plugins/../java directory"
+-msgstr "Plugin: 米亭妙 plugins/../java 賑鱧"
+ msgid  "Plugin: unexpected work request from child"
+ msgstr "Plugin: 塚�防詠冓緜��肄烝耄�綴柊"
+ msgid  "Plugin: Java VM process has died."