[PC-BSD Commits] r14041 - in pbi/modules/java/openjdk6: . scripts

[svn at pcbsd.org]

Author: kris
Date: 2011-11-28 08:07:49 -0800 (Mon, 28 Nov 2011)
New Revision: 14041

Modified:
   pbi/modules/java/openjdk6/pbi.conf
   pbi/modules/java/openjdk6/scripts/post-install.sh
   pbi/modules/java/openjdk6/scripts/pre-remove.sh
Log:

Fix the build of openjdk6 to include the IcedTeaPlugin




Modified: pbi/modules/java/openjdk6/pbi.conf
===================================================================
--- pbi/modules/java/openjdk6/pbi.conf	2011-11-28 15:31:37 UTC (rev 14040)
+++ pbi/modules/java/openjdk6/pbi.conf	2011-11-28 16:07:49 UTC (rev 14041)
@@ -25,5 +25,11 @@
 PBI_MAKEOPTS="PACKAGE_BUILDING=YES
 WITH_WEB=YES
 WITH_IPV6=YES"
+
+PBI_MKPORTAFTER="java/icedtea-web"
+
+PBI_BUILDKEY="02"
+
+PBI_AB_PRIORITY="40"
  
-export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS
+export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS PBI_BUILDKEY PBI_MKPORTAFTER PBI_AB_PRIORITY

Modified: pbi/modules/java/openjdk6/scripts/post-install.sh
===================================================================
--- pbi/modules/java/openjdk6/scripts/post-install.sh	2011-11-28 15:31:37 UTC (rev 14040)
+++ pbi/modules/java/openjdk6/scripts/post-install.sh	2011-11-28 16:07:49 UTC (rev 14041)
@@ -3,14 +3,7 @@
 cd ${PBI_PROGDIRPATH}
 
 ln -s ${PBI_PROGDIRPATH}/openjdk6 /usr/local/openjdk6
-ln -s ${PBI_PROGDIRPATH}/bin/javavm /usr/local/bin/javavm
-ln -s ${PBI_PROGDIRPATH}/bin/classpath /usr/local/bin/classpath
 
-while read line
-do
- ln -s /usr/local/bin/javavm /usr/local/bin/${line}
-done < bin-links
-
 ARCH="`uname -m`"
 
 cd /home
@@ -18,6 +11,7 @@
 do
   if [ -e "${i}/.mozilla/plugins" ]
   then
-    ln -s ${PBI_PROGDIRPATH}/openjdk6/jre/lib/IcedTeaPlugin.so /home/${i}/.mozilla/plugins/IcedTeaPlugin.so
+    ln -fs ${PBI_PROGDIRPATH}/lib/IcedTeaPlugin.so /home/${i}/.mozilla/plugins/IcedTeaPlugin.so
+    chown ${i}:${i} /home/${i}/.mozilla.plugins/IceTeaPlugin.so
   fi
 done

Modified: pbi/modules/java/openjdk6/scripts/pre-remove.sh
===================================================================
--- pbi/modules/java/openjdk6/scripts/pre-remove.sh	2011-11-28 15:31:37 UTC (rev 14040)
+++ pbi/modules/java/openjdk6/scripts/pre-remove.sh	2011-11-28 16:07:49 UTC (rev 14041)
@@ -1,16 +1,7 @@
 #!/bin/sh
 
 rm /usr/local/openjdk6
-rm /usr/local/bin/javavm
-rm /usr/local/bin/classpath
 
-cd /Programs/${1}
-
-while read line
-do
- rm /usr/local/bin/${line}
-done < bin-links
-
 cd /home
 for i in `ls`
 do