[PC-BSD Commits] r7574 - in pbibuild/modules/java: . openjdk6 openjdk6/overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2010-09-16 07:11:50 -0700 (Thu, 16 Sep 2010)
New Revision: 7574

Added:
   pbibuild/modules/java/openjdk6/
Removed:
   pbibuild/modules/java/openjdk6/build.sh
   pbibuild/modules/java/openjdk6/copy-files
   pbibuild/modules/java/openjdk6/dirstatus
   pbibuild/modules/java/openjdk6/overlay-dir/scripts/
   pbibuild/modules/java/openjdk6/overlay-dir/share/
Modified:
   pbibuild/modules/java/openjdk6/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/java/openjdk6/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/java/openjdk6/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/java/openjdk6/pbi.conf
   pbibuild/modules/java/openjdk6/preportmake.sh
Log:

Added module for openjdk6, which should included the new Mozilla Plugin "IcedTea"



Modified: pbibuild/modules/java/openjdk6/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/java/diablo-jre16/overlay-dir/PBI.FirstRun.sh	2010-08-30 15:03:55 UTC (rev 7453)
+++ pbibuild/modules/java/openjdk6/overlay-dir/PBI.FirstRun.sh	2010-09-16 14:11:50 UTC (rev 7574)
@@ -12,10 +12,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-INSTALLED=`ls /Programs | grep Java`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of Java first"
-	exit 2
-fi
-

Modified: pbibuild/modules/java/openjdk6/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/java/diablo-jre16/overlay-dir/PBI.RemoveScript.sh	2010-08-30 15:03:55 UTC (rev 7453)
+++ pbibuild/modules/java/openjdk6/overlay-dir/PBI.RemoveScript.sh	2010-09-16 14:11:50 UTC (rev 7574)
@@ -8,7 +8,7 @@
 #########################################
 
 # Cleanup our main symlinks
-rm /usr/local/diablo-jre1.6.0
+rm /usr/local/openjdk6
 rm /usr/local/bin/javavm
 rm /usr/local/bin/classpath
 
@@ -24,8 +24,8 @@
 cd /home
 for i in `ls`
 do
-  if [ -e "${i}/.mozilla/plugins/libjavaplugin_oji.so" ]
+  if [ -e "${i}/.mozilla/plugins/IcedTeaPlugin.so" ]
   then
-    rm /home/${i}/.mozilla/plugins/libjavaplugin_oji.so
+    rm /home/${i}/.mozilla/plugins/IcedTeaPlugin.so
   fi
 done

Modified: pbibuild/modules/java/openjdk6/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/java/diablo-jre16/overlay-dir/PBI.SetupScript.sh	2010-08-30 15:03:55 UTC (rev 7453)
+++ pbibuild/modules/java/openjdk6/overlay-dir/PBI.SetupScript.sh	2010-09-16 14:11:50 UTC (rev 7574)
@@ -14,7 +14,7 @@
 
 cd /Programs/${PROGDIR}
 
-ln -s /Programs/${PROGDIR}/diablo-jre1.6.0 /usr/local/diablo-jre1.6.0
+ln -s /Programs/${PROGDIR}/openjdk6 /usr/local/openjdk6
 ln -s /Programs/${PROGDIR}/bin/javavm /usr/local/bin/javavm
 ln -s /Programs/${PROGDIR}/bin/classpath /usr/local/bin/classpath
 
@@ -31,6 +31,6 @@
 do
   if [ -e "${i}/.mozilla/plugins" ]
   then
-    ln -s /Programs/${PROGDIR}/diablo-jre1.6.0/plugin/${ARCH}/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so
+    ln -s /Programs/${PROGDIR}/openjdk6/jre/lib/IcedTeaPlugin.so /home/${i}/.mozilla/plugins/IcedTeaPlugin.so
   fi
 done

Modified: pbibuild/modules/java/openjdk6/pbi.conf
===================================================================
--- pbibuild/modules/java/diablo-jre16/pbi.conf	2010-08-30 15:03:55 UTC (rev 7453)
+++ pbibuild/modules/java/openjdk6/pbi.conf	2010-09-16 14:11:50 UTC (rev 7574)
@@ -16,7 +16,7 @@
 PROGICON="logo.png"
 
 # Port we want to build
-PBIPORT="/usr/ports/java/diablo-jre16"
+PBIPORT="/usr/ports/java/openjdk6"
 
 # Set to "Auto or NONE" to have the PBI creator auto-populate libs or not
 PROGLIBS="Auto"
@@ -28,14 +28,12 @@
 OTHERPORT=""
 
 # Enter your custom make options here
-MAKEOPTS=""
+MAKEOPTS="PACKAGE_BUILDING=YES
+WITH_WEB=YES
+WITH_IPV6=YES"
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
 BUILDKEY="01"
 
-# If this port has a non-standard port version variable in Makefile, then
-# list the key here such as "OOOVERSION="
-VERKEY="JRE_VERSION="
-
-export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY VERKEY
+export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/java/openjdk6/preportmake.sh
===================================================================
--- pbibuild/modules/java/diablo-jre16/preportmake.sh	2010-08-30 15:03:55 UTC (rev 7453)
+++ pbibuild/modules/java/openjdk6/preportmake.sh	2010-09-16 14:11:50 UTC (rev 7574)
@@ -7,9 +7,3 @@
 fetch ftp://ftp.pcbsd.org/pub/autobuildpkgs/javapack.tbz
 tar xvjf javapack.tbz
 
-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