. Make BUILD_DEPENDS against the Diablo JDK, not the Linux JDK. [2]

. Add some more make environment variables to control the build of the
  debug versions. [1]
. Allow the setting of ALT_PARALLEL_BUILD_JOBS. [1]
. Install more of the Gnome desktop files, and provide them with the
  correct path for the installation. [1]
. Add ${LOCALBASE}/lib to the default library path in HotSpot. [1]
. Backwards compatibility in time zone updates. [1]
. Bump PORTREVISION.

Submitted by:	jkim [1]
Inspired by:	scf [2]

4 files changed, 58 insertions, 0 deletions

diff --git a/java/jdk16/files/patch-deploy-applications-sun-java.desktop b/java/jdk16/files/patch-deploy-applications-sun-java.desktop
new file mode 100644
index 000000000000..74f9f176855a
--- /dev/null
+++ b/java/jdk16/files/patch-deploy-applications-sun-java.desktop
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- ../../deploy/src/desktop/freedesktop/applications/sun-java.desktop.orig	Thu Apr 12 04:55:27 2007
++++ ../../deploy/src/desktop/freedesktop/applications/sun-java.desktop	Wed Jun 13 16:57:20 2007
+@@ -18,8 +18,8 @@
+ Encoding=UTF-8
+ Name=Java
+ Comment=Java Virtual Machine
+-Exec=java -jar
+-Icon=sun-java.png
++Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/java -jar
++Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png
+ Terminal=false
+ Type=Application
+ NoDisplay=true
diff --git a/java/jdk16/files/patch-deploy-applications-sun-javaws.desktop b/java/jdk16/files/patch-deploy-applications-sun-javaws.desktop
new file mode 100644
index 000000000000..905ac89a8790
--- /dev/null
+++ b/java/jdk16/files/patch-deploy-applications-sun-javaws.desktop
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- ../../deploy/src/desktop/freedesktop/applications/sun-javaws.desktop.orig	Thu Apr 12 04:55:27 2007
++++ ../../deploy/src/desktop/freedesktop/applications/sun-javaws.desktop	Wed Jun 13 16:58:15 2007
+@@ -15,8 +15,8 @@
+ Encoding=UTF-8
+ Name=JavaWS
+ Comment=Java Web Start
+-Exec=javaws
+-Icon=sun-javaws.png
++Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/javaws
++Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png
+ Terminal=false
+ Type=Application
+ NoDisplay=true
diff --git a/java/jdk16/files/patch-deploy-controlpanel-sun_java.desktop b/java/jdk16/files/patch-deploy-controlpanel-sun_java.desktop
new file mode 100644
index 000000000000..2d0908e7aa0d
--- /dev/null
+++ b/java/jdk16/files/patch-deploy-controlpanel-sun_java.desktop
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop.orig	Wed Jun 13 16:44:31 2007
++++ ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop	Wed Jun 13 16:59:32 2007
+@@ -15,8 +15,8 @@
+ Encoding=UTF-8
+ Name=Java
+ Comment=Java Control Panel
+-Exec=jcontrol
+-Icon=sun-jcontrol.png
++Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/jcontrol
++Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Settings;Java;
diff --git a/java/jdk16/files/patch-hotspot-vm-os_bsd.cpp b/java/jdk16/files/patch-hotspot-vm-os_bsd.cpp
new file mode 100644
index 000000000000..c006ad9e9459
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot-vm-os_bsd.cpp
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Wed Jun 13 16:16:36 2007
++++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp	Wed Jun 13 16:36:13 2007
+@@ -364,7 +364,7 @@
+  *	  7: The default directories, normally /lib and /usr/lib.
+  */
+ #ifndef DEFAULT_LIBPATH
+-#define DEFAULT_LIBPATH	"/lib:/usr/lib"
++#define DEFAULT_LIBPATH	"/lib:/usr/lib:%%LOCALBASE%%/lib"
+ #endif
+ 
+ #define EXTENSIONS_DIR	"/lib/ext"