[PC-BSD Commits] r4223 - in pbibuild/modules/office: openoffice3-de openoffice3-de/overlay-dir openoffice3-en openoffice3-en/overlay-dir openoffice3-es openoffice3-es/overlay-dir openoffice3-et openoffice3-et/overlay-dir openoffice3-fr openoffice3-fr/overlay-dir openoffice3-it openoffice3-it/overlay-dir openoffice3-ja openoffice3-ja/overlay-dir openoffice3-pt openoffice3-pt/overlay-dir openoffice3-pt-BR openoffice3-pt-BR/overlay-dir openoffice3-ru openoffice3-ru/overlay-dir openoffice3-uk openoffice3-uk/overlay-dir openoffice3-zh-TW openoffice3-zh-TW/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Jul 13 08:58:23 PDT 2009


Author: kris
Date: 2009-07-13 08:58:19 -0700 (Mon, 13 Jul 2009)
New Revision: 4223

Modified:
   pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-de/pbi.conf
   pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-en/pbi.conf
   pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-es/pbi.conf
   pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-et/pbi.conf
   pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-fr/pbi.conf
   pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-it/pbi.conf
   pbibuild/modules/office/openoffice3-ja/copy-files
   pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-ja/pbi.conf
   pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-pt-BR/pbi.conf
   pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-pt/pbi.conf
   pbibuild/modules/office/openoffice3-ru/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-ru/pbi.conf
   pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-uk/pbi.conf
   pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/office/openoffice3-zh-TW/pbi.conf
Log:

Fixed bugs in OO 3 i18n ports and english. Now it uses system font library properly



Modified: pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-de/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,4 +24,10 @@
 ln -s open*swriter swriter
 ln -s swriter soffice
 
+f [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
 

Modified: pbibuild/modules/office/openoffice3-de/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-de/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-de/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-en/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,3 +24,10 @@
 ln -s open*swriter swriter
 ln -s swriter soffice
 
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-en/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-en/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-en/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -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="06"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-es/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,3 +24,11 @@
 ln -s open*swriter swriter
 ln -s swriter soffice
 
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-es/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-es/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-es/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-et/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -23,3 +23,11 @@
 ln -s open*spadmin spadmin
 ln -s open*swriter swriter
 ln -s swriter soffice
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-et/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-et/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-et/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-fr/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -23,3 +23,11 @@
 ln -s open*spadmin spadmin
 ln -s open*swriter swriter
 ln -s swriter soffice
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-fr/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-fr/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-fr/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-it/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -23,3 +23,11 @@
 ln -s open*spadmin spadmin
 ln -s open*swriter swriter
 ln -s swriter soffice
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-it/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-it/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-it/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-ja/copy-files
===================================================================
--- pbibuild/modules/office/openoffice3-ja/copy-files	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-ja/copy-files	2009-07-13 15:58:19 UTC (rev 4223)
@@ -13,5 +13,3 @@
 /usr/local/etc/java* etc/
 /usr/local/share/java* share/
 /usr/local/lib/libfont* autolibs/
-/usr/local/lib/X11 autolibs/
-/usr/local/etc/fonts etc/

Modified: pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-ja/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -23,3 +23,11 @@
 ln -s open*spadmin spadmin
 ln -s open*swriter swriter
 ln -s swriter soffice
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-ja/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-ja/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-ja/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="02"
+BUILDKEY="04"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-pt/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,3 +24,10 @@
 ln -s open*swriter swriter
 ln -s swriter soffice
 
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-pt/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-pt/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-pt/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-pt-BR/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,3 +24,11 @@
 ln -s open*swriter swriter
 ln -s swriter soffice
 
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-pt-BR/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-pt-BR/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-pt-BR/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-ru/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-ru/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-ru/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,25 +24,9 @@
 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
-cd /home
-for i in `ls`
-do
-
-  if [ ! -d "${i}/.openoffice.org/3/user/wordbook" ]
-  then
-    mkdir -p ${i}/.openoffice.org/3/user
-    cp -R /Programs/${PROGDIR}/wordbook ${i}/.openoffice.org/3/user/
-    chown -R ${i}:${i} ${i}/.openoffice.org
-  else
-    cp /Programs/${PROGDIR}/wordbook/en_* ${i}/.openoffice.org/3/user/wordbook/
-    cat ${i}/.openoffice.org/3/user/wordbook/dictionary.lst | grep "en_US" >/dev/null 2>/dev/null
-    if [ "$?" != "0" ]
-    then
-     echo "DICT en US en_US" >> ${i}/.openoffice.org/3/user/wordbook/dictionary.lst
-    fi
-    chown -R ${i}:${i} ${i}/.openoffice.org/user/wordbook
-  fi
-done
-
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi

Modified: pbibuild/modules/office/openoffice3-ru/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-ru/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-ru/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-uk/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -24,3 +24,11 @@
 ln -s open*swriter swriter
 ln -s swriter soffice
 
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-uk/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-uk/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-uk/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-zh-TW/overlay-dir/PBI.SetupScript.sh	2009-07-13 15:58:19 UTC (rev 4223)
@@ -23,3 +23,11 @@
 ln -s open*spadmin spadmin
 ln -s open*swriter swriter
 ln -s swriter soffice
+
+if [ -d "/PCBSD/local/lib/X11" ]
+then
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
+

Modified: pbibuild/modules/office/openoffice3-zh-TW/pbi.conf
===================================================================
--- pbibuild/modules/office/openoffice3-zh-TW/pbi.conf	2009-07-13 15:51:00 UTC (rev 4222)
+++ pbibuild/modules/office/openoffice3-zh-TW/pbi.conf	2009-07-13 15:58:19 UTC (rev 4223)
@@ -39,7 +39,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="01"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE



More information about the Commits mailing list