[PC-BSD Commits] r2625 - in pbibuild/modules/javajdk16: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2008-08-20 09:41:51 -0700 (Wed, 20 Aug 2008)
New Revision: 2625

Modified:
   pbibuild/modules/javajdk16/copy-files
   pbibuild/modules/javajdk16/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/javajdk16/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/javajdk16/pbi.conf
Log:

Updated diablo-jdk16 to grab the right directory now



Modified: pbibuild/modules/javajdk16/copy-files
===================================================================
--- pbibuild/modules/javajdk16/copy-files	2008-08-20 16:29:55 UTC (rev 2624)
+++ pbibuild/modules/javajdk16/copy-files	2008-08-20 16:41:51 UTC (rev 2625)
@@ -1,4 +1,4 @@
 /usr/local/bin/javavm bin/
 /usr/local/bin/classpath bin/
 /usr/local/etc/java* etc/
-/usr/local/jdk* ./
+/usr/local/diablo-jdk* ./

Modified: pbibuild/modules/javajdk16/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/javajdk16/overlay-dir/PBI.RemoveScript.sh	2008-08-20 16:29:55 UTC (rev 2624)
+++ pbibuild/modules/javajdk16/overlay-dir/PBI.RemoveScript.sh	2008-08-20 16:41:51 UTC (rev 2625)
@@ -9,7 +9,7 @@
 
 
 # Cleanup our main symlinks
-rm /usr/local/jdk1.6.0
+rm /usr/local/diablo-jdk1.6.0
 rm /usr/local/bin/javavm
 rm /usr/local/bin/classpath
 

Modified: pbibuild/modules/javajdk16/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/javajdk16/overlay-dir/PBI.SetupScript.sh	2008-08-20 16:29:55 UTC (rev 2624)
+++ pbibuild/modules/javajdk16/overlay-dir/PBI.SetupScript.sh	2008-08-20 16:41:51 UTC (rev 2625)
@@ -14,7 +14,7 @@
 
 cd /Programs/${PROGDIR}
 
-ln -s /Programs/${PROGDIR}/jdk1.6.0 /usr/local/jdk1.6.0
+ln -s /Programs/${PROGDIR}/diablo-jdk1.6.0 /usr/local/diablo-jdk1.6.0
 ln -s /Programs/${PROGDIR}/bin/javavm /usr/local/bin/javavm
 ln -s /Programs/${PROGDIR}/bin/classpath /usr/local/bin/classpath
 
@@ -36,6 +36,6 @@
 do
   if [ -e "${i}/.mozilla/plugins" ]
   then
-    ln -s /Programs/${PROGDIR}/jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so
+    ln -s /Programs/${PROGDIR}/diablo-jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so
   fi
 done

Modified: pbibuild/modules/javajdk16/pbi.conf
===================================================================
--- pbibuild/modules/javajdk16/pbi.conf	2008-08-20 16:29:55 UTC (rev 2624)
+++ pbibuild/modules/javajdk16/pbi.conf	2008-08-20 16:41:51 UTC (rev 2625)
@@ -32,7 +32,7 @@
 
 # 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="51"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="