java/eclipse: Set a default theme and external browser

PR:		192696
Submitted by:	Jimmy Kelley <ljboiler@gmail.com>
Reviewed by:	swills (mentor), marino (mentor)
Approved by:	mentors (implicit)

3 files changed, 61 insertions, 3 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 3bdc50360bc3..a4c246c59376 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	4.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
 DISTFILES=	eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
diff --git a/java/eclipse/files/patch-submodules b/java/eclipse/files/patch-submodules
index 74bd1f094a34..2d71566cce74 100644
--- a/java/eclipse/files/patch-submodules
+++ b/java/eclipse/files/patch-submodules
@@ -2457,3 +2457,63 @@ index b3ed6f8..7544d34 100644
      </plugins>
    </build>
  
+--- a/eclipse.platform/platform/org.eclipse.platform/plugin.xml.orig	2014-06-05 16:12:04.000000000 -0500
++++ b/eclipse.platform/platform/org.eclipse.platform/plugin.xml	2014-08-01 17:23:26.000000000 -0500
+@@ -141,6 +141,12 @@
+             basestylesheeturi="css/e4_default_gtk.css"
+             id="org.eclipse.e4.ui.css.theme.e4_default"
+             label="%theme.gtk"
++            os="freebsd">
++      </theme>
++      <theme
++            basestylesheeturi="css/e4_default_gtk.css"
++            id="org.eclipse.e4.ui.css.theme.e4_default"
++            label="%theme.gtk"
+             os="linux">
+       </theme>
+       <theme
+--- a/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml.orig	2014-06-05 17:05:18.000000000 -0500
++++ b/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml	2014-08-01 19:39:25.000000000 -0500
+@@ -46,7 +46,7 @@
+             <implementation
+                   style="themes/shared/html/shared.css,$theme$/html/shared.css,$theme$/html/font-$fontStyle$.css,$theme$/html/$direction$.css"
+                   kind="html"
+-                  os="win32,linux,macosx,solaris">
++                  os="win32,freebsd,linux,macosx,solaris">
+             </implementation>
+             <implementation
+                   kind="swt">
+--- a/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml.orig	2014-06-05 17:09:12.000000000 -0500
++++ b/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	2014-08-01 19:58:51.000000000 -0500
+@@ -83,6 +83,17 @@
+ 
+    <!-- Web Browsers -->
+    <extension point="org.eclipse.ui.browser.browsers">
++      <!-- FreeBSD -->
++      <browser
++         id="org.eclipse.ui.browser.firefox"
++         name="%browserFirefox"
++         os="freebsd"
++         executable="firefox"
++         factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
++         <location>
++            usr/local/bin/firefox
++         </location>
++      </browser>
+       <!-- Linux -->
+       <browser
+          id="org.eclipse.ui.browser.firefox"
+--- a/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml.orig	2014-06-05 17:04:42.000000000 -0500
++++ b/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml	2014-08-01 20:03:04.000000000 -0500
+@@ -1184,6 +1184,11 @@
+             %blockSelectionModeFont.description
+          </description>
+          <fontValue
++               os="freebsd"
++               value="Monospace-regular-10"
++               ws="gtk">
++         </fontValue>
++         <fontValue
+                os="linux"
+                value="Monospace-regular-10"
+                ws="gtk">
diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch
index 3444009f5048..7c99930daed4 100644
--- a/java/eclipse/scripts/pre-patch
+++ b/java/eclipse/scripts/pre-patch
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -x
-
 # Copy the Linux 'native' code for the FreeBSD versions
 # At this point, just make sure the directory and file names are "freebsd"
 # These files will be patched in the do-patch step.