[PC-BSD Commits] r3330 - in pbibuild/modules: openoffice-en openoffice-en/overlay-dir openoffice-en/overlay-dir/bin openoffice-i18n openoffice3-en openoffice3-en/overlay-dir openoffice3-en/overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Mon Jan 26 11:47:08 PST 2009


Author: kris
Date: 2009-01-26 11:47:06 -0800 (Mon, 26 Jan 2009)
New Revision: 3330

Removed:
   pbibuild/modules/openoffice-en/overlay-dir/bin/sbase
   pbibuild/modules/openoffice-en/overlay-dir/bin/scalc
   pbibuild/modules/openoffice-en/overlay-dir/bin/sdraw
   pbibuild/modules/openoffice-en/overlay-dir/bin/simpress
   pbibuild/modules/openoffice-en/overlay-dir/bin/smath
   pbibuild/modules/openoffice-en/overlay-dir/bin/swriter
   pbibuild/modules/openoffice-en/overlay-dir/scripts/
   pbibuild/modules/openoffice3-en/overlay-dir/bin/sbase
   pbibuild/modules/openoffice3-en/overlay-dir/bin/scalc
   pbibuild/modules/openoffice3-en/overlay-dir/bin/sdraw
   pbibuild/modules/openoffice3-en/overlay-dir/bin/simpress
   pbibuild/modules/openoffice3-en/overlay-dir/bin/smath
   pbibuild/modules/openoffice3-en/overlay-dir/bin/soffice
   pbibuild/modules/openoffice3-en/overlay-dir/bin/swriter
Modified:
   pbibuild/modules/openoffice-en/build.sh
   pbibuild/modules/openoffice-en/copy-files
   pbibuild/modules/openoffice-en/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/openoffice-en/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/openoffice-en/pbi.conf
   pbibuild/modules/openoffice-i18n/pbi.conf
   pbibuild/modules/openoffice3-en/build.sh
   pbibuild/modules/openoffice3-en/copy-files
   pbibuild/modules/openoffice3-en/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/openoffice3-en/pbi.conf
Log:

Updated openoffice to be 100% self-contained, and trigger a rebuild of OO 2 / OO 3 for testing



Modified: pbibuild/modules/openoffice-en/build.sh
===================================================================
--- pbibuild/modules/openoffice-en/build.sh	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice-en/build.sh	2009-01-26 19:47:06 UTC (rev 3330)
@@ -9,8 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,OpenOffice${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-

Modified: pbibuild/modules/openoffice-en/copy-files
===================================================================
--- pbibuild/modules/openoffice-en/copy-files	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice-en/copy-files	2009-01-26 19:47:06 UTC (rev 3330)
@@ -1,3 +1,10 @@
 /usr/local/bin/openoffice* bin/
 /usr/local/openoffice* ./
 /usr/local/openoffice*/program/*.bin bin/
+/usr/local/bin/sbase bin/
+/usr/local/bin/sdraw bin/
+/usr/local/bin/smath bin/
+/usr/local/bin/swriter bin/
+/usr/local/bin/scalc bin/
+/usr/local/bin/simpress bin/
+/usr/local/bin/soffice bin/

Modified: pbibuild/modules/openoffice-en/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/openoffice-en/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice-en/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:47:06 UTC (rev 3330)
@@ -7,29 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -f /usr/local/openoffice.org-*
-rm -f /usr/local/bin/openoffice.org-*
-rm -f /usr/local/bin/sbase
-rm -f /usr/local/bin/sdraw
-rm -f /usr/local/bin/scalc
-rm -f /usr/local/bin/simpress
-rm -f /usr/local/bin/smath
-rm -f /usr/local/bin/swriter
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove OpenOffice user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
-  cd /home
-  for i in `ls`
-  do
-   if [ -e "/home/${i}/.openoffice.org2" ]
-   then
-    rm -rf /home/${i}/.openoffice.org2
-   fi
-  done
- fi
-fi
-

Modified: pbibuild/modules/openoffice-en/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/openoffice-en/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice-en/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:47:06 UTC (rev 3330)
@@ -12,35 +12,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-cd /Programs/${PROGDIR}
-
-# Get the OO base name
-OODIR="`ls -d openoffice.org*`"
-
-# Setup the external links
-ln -s /Programs/${PROGDIR}/${OODIR} /usr/local/${OODIR}
-ln -s /Programs/${PROGDIR}/bin/${OODIR} /usr/local/bin/${OODIR}
-
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-sbase /usr/local/bin/${OODIR}-sbase
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-scalc /usr/local/bin/${OODIR}-scalc
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-sdraw /usr/local/bin/${OODIR}-sdraw
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-setofficelang /usr/local/bin/${OODIR}-setofficelang
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-simpress /usr/local/bin/${OODIR}-simpress
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-smath /usr/local/bin/${OODIR}-smath
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-spadmin /usr/local/bin/${OODIR}-spadmin
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-swriter /usr/local/bin/${OODIR}-swriter
-
-ln -s /Programs/${PROGDIR}/.sbin/sbase /usr/local/bin/sbase
-ln -s /Programs/${PROGDIR}/.sbin/scalc /usr/local/bin/scalc
-ln -s /Programs/${PROGDIR}/.sbin/sdraw /usr/local/bin/sdraw
-ln -s /Programs/${PROGDIR}/.sbin/simpress /usr/local/bin/simpress
-ln -s /Programs/${PROGDIR}/.sbin/smath /usr/local/bin/smath
-ln -s /Programs/${PROGDIR}/.sbin/swriter /usr/local/bin/swriter
-
-# Make sure any old sun.xml mime types are removed
-rm /usr/local/share/mimelnk/application/vnd.sun.xml*
-rm /usr/local/share/mimelnk/application/vnd.star*
-rm /usr/local/share/mimelnk/application/vnd.oasis.opendocument*
-rm /usr/local/share/mimelnk/application/vnd.ms-excel.desktop
-rm /usr/local/share/mimelnk/application/vnd.ms-powerpoint.desktop
-rm /usr/local/share/mimelnk/application/vnd.ms-word.desktop

Modified: pbibuild/modules/openoffice-en/pbi.conf
===================================================================
--- pbibuild/modules/openoffice-en/pbi.conf	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice-en/pbi.conf	2009-01-26 19:47:06 UTC (rev 3330)
@@ -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="23"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="

Modified: pbibuild/modules/openoffice-i18n/pbi.conf
===================================================================
--- pbibuild/modules/openoffice-i18n/pbi.conf	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice-i18n/pbi.conf	2009-01-26 19:47:06 UTC (rev 3330)
@@ -47,7 +47,7 @@
 VERKEY="OOOVERSION="
 
 # Set this to YES to mark a port / module as broken
-#PORTBROKE="YES" ; export PORTBROKE
+PORTBROKE="YES" ; export PORTBROKE
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE

Modified: pbibuild/modules/openoffice3-en/build.sh
===================================================================
--- pbibuild/modules/openoffice3-en/build.sh	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice3-en/build.sh	2009-01-26 19:47:06 UTC (rev 3330)
@@ -8,14 +8,6 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Save the right version number in the soffice script
-cd /usr/local
-OOVER="`ls -d openoffice.org*`"
-sed -e "s,CHANGEME,${OOVER},g" ${PBIDIR}/bin/soffice > /tmp/soffice
-mv /tmp/soffice ${PBIDIR}/bin/soffice
-chmod 755 ${PBIDIR}/bin/soffice
-
 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-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice3-en/copy-files	2009-01-26 19:47:06 UTC (rev 3330)
@@ -1,3 +1,10 @@
 /usr/local/bin/openoffice* bin/
 /usr/local/openoffice* ./
 /usr/local/openoffice*/program/*.bin bin/
+/usr/local/bin/sbase bin/
+/usr/local/bin/sdraw bin/
+/usr/local/bin/smath bin/
+/usr/local/bin/swriter bin/
+/usr/local/bin/scalc bin/
+/usr/local/bin/simpress bin/
+/usr/local/bin/soffice bin/

Modified: pbibuild/modules/openoffice3-en/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/openoffice3-en/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice3-en/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:47:06 UTC (rev 3330)
@@ -7,15 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -f /usr/local/openoffice.org-*
-rm -f /usr/local/bin/openoffice.org-*
-rm -f /usr/local/bin/sbase
-rm -f /usr/local/bin/sdraw
-rm -f /usr/local/bin/scalc
-rm -f /usr/local/bin/simpress
-rm -f /usr/local/bin/smath
-rm -f /usr/local/bin/swriter
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice3-en/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:47:06 UTC (rev 3330)
@@ -12,32 +12,7 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-cd /Programs/${PROGDIR}
 
-# Get the OO base name
-OODIR="`ls -d openoffice.org*`"
-
-# Setup the external links
-ln -s /Programs/${PROGDIR}/${OODIR} /usr/local/${OODIR}
-ln -s /Programs/${PROGDIR}/bin/${OODIR} /usr/local/bin/${OODIR}
-
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-sbase /usr/local/bin/${OODIR}-sbase
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-scalc /usr/local/bin/${OODIR}-scalc
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-sdraw /usr/local/bin/${OODIR}-sdraw
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-setofficelang /usr/local/bin/${OODIR}-setofficelang
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-simpress /usr/local/bin/${OODIR}-simpress
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-smath /usr/local/bin/${OODIR}-smath
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-spadmin /usr/local/bin/${OODIR}-spadmin
-ln -s /Programs/${PROGDIR}/bin/${OODIR}-swriter /usr/local/bin/${OODIR}-swriter
-
-ln -s /Programs/${PROGDIR}/.sbin/soffice /usr/local/bin/soffice
-ln -s /Programs/${PROGDIR}/.sbin/sbase /usr/local/bin/sbase
-ln -s /Programs/${PROGDIR}/.sbin/scalc /usr/local/bin/scalc
-ln -s /Programs/${PROGDIR}/.sbin/sdraw /usr/local/bin/sdraw
-ln -s /Programs/${PROGDIR}/.sbin/simpress /usr/local/bin/simpress
-ln -s /Programs/${PROGDIR}/.sbin/smath /usr/local/bin/smath
-ln -s /Programs/${PROGDIR}/.sbin/swriter /usr/local/bin/swriter
-
 # Copy over the english wordbook to the users profile, since OO3 doesn't include a dictionary anymore
 cd /home
 for i in `ls`

Modified: pbibuild/modules/openoffice3-en/pbi.conf
===================================================================
--- pbibuild/modules/openoffice3-en/pbi.conf	2009-01-26 19:11:50 UTC (rev 3329)
+++ pbibuild/modules/openoffice3-en/pbi.conf	2009-01-26 19:47:06 UTC (rev 3330)
@@ -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="23"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="



More information about the Commits mailing list