[PC-BSD Commits] r3459 - in pbibuild/modules/openoffice3-en: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-02-13 13:46:16 -0800 (Fri, 13 Feb 2009)
New Revision: 3459

Modified:
   pbibuild/modules/openoffice3-en/build.sh
   pbibuild/modules/openoffice3-en/copy-files
   pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/openoffice3-en/pbi.conf
Log:

Hopefully our last build of OO3 for a while now :) Included java for the extra goodies it brings, and fixed a bug with a missing "soffice" link



Modified: pbibuild/modules/openoffice3-en/build.sh
===================================================================
--- pbibuild/modules/openoffice3-en/build.sh	2009-02-13 21:31:14 UTC (rev 3458)
+++ pbibuild/modules/openoffice3-en/build.sh	2009-02-13 21:46:16 UTC (rev 3459)
@@ -8,6 +8,14 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
+
+# Copy over only the JRE portion
+cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
+
+# Make the javavms file
+echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+
+# Setup the OO dir in our install-dict.sh script
 sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
 mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
 chmod 755 ${PBIDIR}/bin/install-dict.sh

Modified: pbibuild/modules/openoffice3-en/copy-files
===================================================================
--- pbibuild/modules/openoffice3-en/copy-files	2009-02-13 21:31:14 UTC (rev 3458)
+++ pbibuild/modules/openoffice3-en/copy-files	2009-02-13 21:46:16 UTC (rev 3459)
@@ -8,3 +8,7 @@
 /usr/local/bin/scalc bin/
 /usr/local/bin/simpress bin/
 /usr/local/bin/soffice bin/
+/usr/local/bin/java* bin/
+/usr/local/bin/classpath bin/
+/usr/local/etc/java* etc/
+/usr/local/share/java* share/

Modified: pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh	2009-02-13 21:31:14 UTC (rev 3458)
+++ pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh	2009-02-13 21:46:16 UTC (rev 3459)
@@ -22,6 +22,7 @@
 ln -s open*smath smath
 ln -s open*spadmin spadmin
 ln -s open*swriter swriter
+ln -s swriter soffice
 
 
 # Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore

Modified: pbibuild/modules/openoffice3-en/pbi.conf
===================================================================
--- pbibuild/modules/openoffice3-en/pbi.conf	2009-02-13 21:31:14 UTC (rev 3458)
+++ pbibuild/modules/openoffice3-en/pbi.conf	2009-02-13 21:46:16 UTC (rev 3459)
@@ -38,7 +38,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="03"
+BUILDKEY="21"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="