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

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-04-10 15:43:51 +0000 (Tue, 10 Apr 2012)
New Revision: 16311

Modified:
   pbi/modules/java/openjdk7/external-links
   pbi/modules/java/openjdk7/pbi.conf
   pbi/modules/java/openjdk7/scripts/post-install.sh
   pbi/modules/java/openjdk7/scripts/pre-remove.sh
Log:
Fix the OpenJDK7 module - make it almost identical to the (working) openJDK6 module



Modified: pbi/modules/java/openjdk7/external-links
===================================================================
--- pbi/modules/java/openjdk7/external-links	2012-04-10 14:48:37 UTC (rev 16310)
+++ pbi/modules/java/openjdk7/external-links	2012-04-10 15:43:51 UTC (rev 16311)
@@ -8,3 +8,42 @@
 #include/libfoo.h       include/libfoo.h        replace
 #bin/appfoo             bin/appfoo              binary,nocrash
 #bin/appfoo2            bin/appfoo-test         binary
+bin/appletviewer        bin/appletviewer       binary,nocrash
+bin/apt        bin/apt        binary,nocrash
+bin/extcheck   bin/extcheck   binary,nocrash
+bin/idlj       bin/idlj       binary,nocrash
+bin/jar        bin/jar        binary,nocrash
+bin/jarsigner  bin/jarsigner  binary,nocrash
+bin/java       bin/java       binary,nocrash
+bin/javac      bin/javac      binary,nocrash
+bin/javadoc    bin/javadoc    binary,nocrash
+bin/javah      bin/javah      binary,nocrash
+bin/javap      bin/javap      binary,nocrash
+bin/jconsole   bin/jconsole   binary,nocrash
+bin/jdb        bin/jdb        binary,nocrash
+bin/jhat       bin/jhat       binary,nocrash
+bin/jinfo      bin/jinfo      binary,nocrash
+bin/jmap       bin/jmap       binary,nocrash
+bin/jps        bin/jps        binary,nocrash
+bin/jrunscript bin/jrunscript binary,nocrash
+bin/jsadebugd  bin/jsadebugd  binary,nocrash
+bin/jstack     bin/jstack     binary,nocrash
+bin/jstat      bin/jstat      binary,nocrash
+bin/jstatd     bin/jstatd     binary,nocrash
+bin/keytool    bin/keytool    binary,nocrash
+bin/native2ascii       bin/native2ascii       binary,nocrash
+bin/orbd       bin/orbd       binary,nocrash
+bin/pack200    bin/pack200    binary,nocrash
+bin/policytool bin/policytool binary,nocrash
+bin/rmic       bin/rmic       binary,nocrash
+bin/rmid       bin/rmid       binary,nocrash
+bin/rmiregistry        bin/rmiregistry        binary,nocrash
+bin/schemagen  bin/schemagen  binary,nocrash
+bin/serialver  bin/serialver  binary,nocrash
+bin/servertool bin/servertool binary,nocrash
+bin/tnameserv  bin/tnameserv  binary,nocrash
+bin/unpack200  bin/unpack200  binary,nocrash
+bin/wsgen      bin/wsgen      binary,nocrash
+bin/wsimport   bin/wsimport   binary,nocrash
+bin/xjc        bin/xjc        binary,nocrash
+bin/itweb-javaws	bin/itweb-javaws	binary,nocrash

Modified: pbi/modules/java/openjdk7/pbi.conf
===================================================================
--- pbi/modules/java/openjdk7/pbi.conf	2012-04-10 14:48:37 UTC (rev 16310)
+++ pbi/modules/java/openjdk7/pbi.conf	2012-04-10 15:43:51 UTC (rev 16311)
@@ -26,8 +26,10 @@
 WITH_WEB=YES
 WITH_IPV6=YES"
 
+PBI_MKPORTAFTER="java/icedtea-web"; export PBI_MKPORTAFTER
+
 PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
 
-PBI_BUILDKEY="01"; export PBI_BUILDKEY
+PBI_BUILDKEY="03"; 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	2012-04-10 14:48:37 UTC (rev 16310)
+++ pbi/modules/java/openjdk7/scripts/post-install.sh	2012-04-10 15:43:51 UTC (rev 16311)
@@ -18,6 +18,7 @@
 do
   if [ -e "${i}/.mozilla/plugins" ]
   then
-    ln -s ${PBI_PROGDIRPATH}/openjdk7/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/IcedTeaPlugin.so
   fi
 done

Modified: pbi/modules/java/openjdk7/scripts/pre-remove.sh
===================================================================
--- pbi/modules/java/openjdk7/scripts/pre-remove.sh	2012-04-10 14:48:37 UTC (rev 16310)
+++ pbi/modules/java/openjdk7/scripts/pre-remove.sh	2012-04-10 15:43:51 UTC (rev 16311)
@@ -4,12 +4,12 @@
 rm /usr/local/bin/javavm
 rm /usr/local/bin/classpath
 
-#cd /Programs/${1}
+cd ${PBI_PROGDIRPATH}
 
-#while read line
-#do
-# rm /usr/local/bin/${line}
-#done < bin-links
+while read line
+do
+ rm /usr/local/bin/${line}
+done < bin-links
 
 cd /home
 for i in `ls`