[PC-BSD Commits] r12700 - in pbi/modules/java/openjdk7: . scripts

[svn at pcbsd.org]

Author: kenmoore
Date: 2011-09-07 09:46:18 -0700 (Wed, 07 Sep 2011)
New Revision: 12700

Modified:
   pbi/modules/java/openjdk7/pbi.conf
   pbi/modules/java/openjdk7/scripts/post-install.sh
   pbi/modules/java/openjdk7/scripts/pre-remove.sh
Log:
Fix openjdk7 scripts and rebuild


Modified: pbi/modules/java/openjdk7/pbi.conf
===================================================================
--- pbi/modules/java/openjdk7/pbi.conf	2011-09-07 16:40:08 UTC (rev 12699)
+++ pbi/modules/java/openjdk7/pbi.conf	2011-09-07 16:46:18 UTC (rev 12700)
@@ -25,5 +25,9 @@
 PBI_MAKEOPTS="PACKAGE_BUILDING=YES
 WITH_WEB=YES
 WITH_IPV6=YES"
+
+PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
+
+PBI_BUILDKEY="01"; export PBI_BUILDKEY
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS

Modified: pbi/modules/java/openjdk7/scripts/post-install.sh
===================================================================
--- pbi/modules/java/openjdk7/scripts/post-install.sh	2011-09-07 16:40:08 UTC (rev 12699)
+++ pbi/modules/java/openjdk7/scripts/post-install.sh	2011-09-07 16:46:18 UTC (rev 12700)
@@ -2,7 +2,7 @@
 
 cd ${PBI_PROGDIRPATH}
 
-ln -s ${PBI_PROGDIRPATH}/openjdk6 /usr/local/openjdk6
+ln -s ${PBI_PROGDIRPATH}/openjdk7 /usr/local/openjdk7
 ln -s ${PBI_PROGDIRPATH}/bin/javavm /usr/local/bin/javavm
 ln -s ${PBI_PROGDIRPATH}/bin/classpath /usr/local/bin/classpath
 
@@ -18,6 +18,6 @@
 do
   if [ -e "${i}/.mozilla/plugins" ]
   then
-    ln -s ${PBI_PROGDIRPATH}/openjdk6/jre/lib/IcedTeaPlugin.so /home/${i}/.mozilla/plugins/IcedTeaPlugin.so
+    ln -s ${PBI_PROGDIRPATH}/openjdk7/jre/lib/IcedTeaPlugin.so /home/${i}/.mozilla/plugins/IcedTeaPlugin.so
   fi
 done

Modified: pbi/modules/java/openjdk7/scripts/pre-remove.sh
===================================================================
--- pbi/modules/java/openjdk7/scripts/pre-remove.sh	2011-09-07 16:40:08 UTC (rev 12699)
+++ pbi/modules/java/openjdk7/scripts/pre-remove.sh	2011-09-07 16:46:18 UTC (rev 12700)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-rm /usr/local/openjdk6
+rm /usr/local/openjdk7
 rm /usr/local/bin/javavm
 rm /usr/local/bin/classpath