aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2002-04-16 18:24:44 +0000
committerGreg Lewis <glewis@FreeBSD.org>2002-04-16 18:24:44 +0000
commit8716a1907f32e1274ab6a307e81d8fd050bbfe84 (patch)
treee591b651aa5a1a2cb52ed80409adfcd64cc2e8fb /java
parent8e60d7c2a0e1d54f455d49fa54aba6fd36de8933 (diff)
downloadports-8716a1907f32e1274ab6a307e81d8fd050bbfe84.tar.gz
ports-8716a1907f32e1274ab6a307e81d8fd050bbfe84.zip
Add a temporary dependency on gettext-old and use msgfmt-old to process
messages for the browser plugin. This is a bandaid for the problem expressed in the PR while I evaluate a number of other proposed patches for the correct fix. Hence the PR currently remains open. PR: 37087 Reviewed by: sobomax Approved by: sobomax
Notes
Notes: svn path=/head/; revision=57767
Diffstat (limited to 'java')
-rw-r--r--java/jdk13/Makefile1
-rw-r--r--java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile9
-rw-r--r--java/jdk14/Makefile1
-rw-r--r--java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile9
-rw-r--r--java/jdk15/Makefile1
-rw-r--r--java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile9
-rw-r--r--java/jdk16/Makefile1
-rw-r--r--java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile9
8 files changed, 40 insertions, 0 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 99d0f9ede611..6ad42195b252 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -22,6 +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
LIB_DEPENDS= glib12.3:$(PORTSDIR)/devel/glib12 \
gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
nspr4.1:$(PORTSDIR)/devel/nspr
diff --git a/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile
index 3f6876b47f3b..9fb83c620796 100644
--- a/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile
+++ b/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -3,6 +3,15 @@ $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/jdk14/Makefile b/java/jdk14/Makefile
index 99d0f9ede611..6ad42195b252 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -22,6 +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
LIB_DEPENDS= glib12.3:$(PORTSDIR)/devel/glib12 \
gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
nspr4.1:$(PORTSDIR)/devel/nspr
diff --git a/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile
index 3f6876b47f3b..9fb83c620796 100644
--- a/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile
+++ b/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -3,6 +3,15 @@ $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/Makefile b/java/jdk15/Makefile
index 99d0f9ede611..6ad42195b252 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -22,6 +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
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 3f6876b47f3b..9fb83c620796 100644
--- a/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
+++ b/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -3,6 +3,15 @@ $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/jdk16/Makefile b/java/jdk16/Makefile
index 99d0f9ede611..6ad42195b252 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -22,6 +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
LIB_DEPENDS= glib12.3:$(PORTSDIR)/devel/glib12 \
gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
nspr4.1:$(PORTSDIR)/devel/nspr
diff --git a/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile
index 3f6876b47f3b..9fb83c620796 100644
--- a/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile
+++ b/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -3,6 +3,15 @@ $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); \