[PC-BSD Commits] r2603 - in pbibuild/modules: . javajre16

[svn at pcbsd.org]

Author: kris
Date: 2008-08-18 06:40:47 -0700 (Mon, 18 Aug 2008)
New Revision: 2603

Added:
   pbibuild/modules/javajre16/
Modified:
   pbibuild/modules/javajre16/pbi.conf
   pbibuild/modules/javajre16/preportmake.sh
Log:

Added a port for javajre 1.6, so we don't need to all install the JDK version to get the newer java client. 



Modified: pbibuild/modules/javajre16/pbi.conf
===================================================================
--- pbibuild/modules/javajre/pbi.conf	2008-08-11 19:33:52 UTC (rev 2578)
+++ pbibuild/modules/javajre16/pbi.conf	2008-08-18 13:40:47 UTC (rev 2603)
@@ -16,7 +16,7 @@
 PROGICON="logo.png"
 
 # Port we want to build
-PBIPORT="/usr/ports/java/diablo-jre15"
+PBIPORT="/usr/ports/java/diablo-jre16"
 
 # Set to "Auto or NONE" to have the PBI creator auto-populate libs or not
 PROGLIBS="Auto"

Modified: pbibuild/modules/javajre16/preportmake.sh
===================================================================
--- pbibuild/modules/javajre/preportmake.sh	2008-08-11 19:33:52 UTC (rev 2578)
+++ pbibuild/modules/javajre16/preportmake.sh	2008-08-18 13:40:47 UTC (rev 2603)
@@ -8,19 +8,33 @@
 ARCH="`uname -p`"
 if [ "$ARCH" = "i386" ]
 then
-  # Get the diablo-latte file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2
+  # Get the diablo-caffe file
+  # Get the Java files / patchset
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/bsd-jdk16-patches-4.tar.bz2
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2
 fi
 
 if [ "$ARCH" = "amd64" ]
 then
-  # Get the diablo-caffe file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/bsd-jdk16-patches-4.tar.bz2
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2
+  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2
 fi
 
-
 # Get the tzupdater files
 fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_6-2008c.zip
 
+pkg_add -r perl
+
+cd /usr/ports/java/jdk16/
+echo "#!/bin/sh
+exit 0" > /usr/ports/java/jdk16/files/license.sh
+
 cd /usr/ports/devel/automake15
 make install clean