[PC-BSD Commits] r2845 - in pbibuild/modules/javajre16: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2008-10-02 08:22:36 -0700 (Thu, 02 Oct 2008)
New Revision: 2845

Modified:
   pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/javajre16/pbi.conf
Log:

Fixed the linking of firefox plugin for java on amd64



Modified: pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh	2008-10-02 15:08:19 UTC (rev 2844)
+++ pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh	2008-10-02 15:22:36 UTC (rev 2845)
@@ -29,6 +29,7 @@
   ln -s /Programs/${PROGDIR}/etc/${i} /usr/local/etc/${i}
 done
 
+ARCH="`uname -m`"
 
 # Link the mozilla plugin
 cd /home
@@ -36,6 +37,6 @@
 do
   if [ -e "${i}/.mozilla/plugins" ]
   then
-    ln -s /Programs/${PROGDIR}/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so
+    ln -s /Programs/${PROGDIR}/diablo-jre1.6.0/plugin/${ARCH}/ns7/libjavaplugin_oji.so /home/${i}/.mozilla/plugins/libjavaplugin_oji.so
   fi
 done

Modified: pbibuild/modules/javajre16/pbi.conf
===================================================================
--- pbibuild/modules/javajre16/pbi.conf	2008-10-02 15:08:19 UTC (rev 2844)
+++ pbibuild/modules/javajre16/pbi.conf	2008-10-02 15:22:36 UTC (rev 2845)
@@ -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="31"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="