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

[svn at pcbsd.org]

Author: kris
Date: 2011-11-28 08:14:42 -0800 (Mon, 28 Nov 2011)
New Revision: 14044

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

Turns out openjdk doesn't need root, remove that and fix install script




Modified: pbi/modules/java/openjdk6/pbi.conf
===================================================================
--- pbi/modules/java/openjdk6/pbi.conf	2011-11-28 16:09:20 UTC (rev 14043)
+++ pbi/modules/java/openjdk6/pbi.conf	2011-11-28 16:14:42 UTC (rev 14044)
@@ -32,6 +32,4 @@
 
 PBI_AB_PRIORITY="40"
 
-PBI_REQUIRESROOT="YES"
- 
-export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS PBI_BUILDKEY PBI_MKPORTAFTER PBI_AB_PRIORITY PBI_REQUIRESROOT
+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 16:09:20 UTC (rev 14043)
+++ pbi/modules/java/openjdk6/scripts/post-install.sh	2011-11-28 16:14:42 UTC (rev 14044)
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-cd ${PBI_PROGDIRPATH}
-
-ln -s ${PBI_PROGDIRPATH}/openjdk6 /usr/local/openjdk6
-
-ARCH="`uname -m`"
-
 cd /home
 for i in `ls`
 do