Update to 3.1.1.

FreeBSD ports specific changes are following.

* Correct exception handling for >=702104 and better for prior ones.
  This fixes unknown crashes [1].

* Install extensions; users should manually install extensions to actual
  use though.
  Installed extensions are:
  sun-presentation-minimizer.oxt
       http://extensions.services.openoffice.org/project/PresentationMinimizer
  presenter-screen.oxt
       http://extensions.services.openoffice.org/project/presenter-screen
  pdfimport.oxt
       http://extensions.services.openoffice.org/project/pdfimport
  wiki-publisher.oxt
       http://extensions.services.openoffice.org/project/wikipublisher
  sun-report-builder.oxt
       http://extensions.services.openoffice.org/project/reportdesign
  located at ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/

* Allow openjdk6 as valid, and buildable JDK.

* remove boost for amd64.

[1] http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
    http://www.openoffice.org/issues/show_bug.cgi?id=98781
    http://www.openoffice.org/issues/show_bug.cgi?id=82690
    http://www.freebsd.org/cgi/cvsweb.cgi/src/libexec/rtld-elf/rtld.c?rev=1.135;content-type=text%2Fx-cvsweb-markup
    http://www.freebsd.org/cgi/cvsweb.cgi/src/libexec/rtld-elf/rtld.c?rev=1.124.2.6;content-type=text%2Fx-cvsweb-markup

Funded by OpenOffice.org community.

3 files changed, 28 insertions, 4 deletions

diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index e1053db6682d..5d96251759ef 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -4,8 +4,6 @@
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 
-CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
-
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
diff --git a/editors/openoffice-3/files/patch-i103628 b/editors/openoffice-3/files/patch-i103628
new file mode 100644
index 000000000000..c3846bc27ae2
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i103628
@@ -0,0 +1,26 @@
+very strange workaround indeed.
+
+--- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
++++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
+@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
+ 
+ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
+ JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
++JAR=${JAVA_HOME}/bin/jar
+ 
+ # --- Targets ------------------------------------------------------
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
+ 
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ 
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ 
+ .ELSE
+ all:
diff --git a/editors/openoffice-3/files/patch-i85126 b/editors/openoffice-3/files/patch-i85126
index 973ae74a51bd..d2b427c99915 100644
--- a/editors/openoffice-3/files/patch-i85126
+++ b/editors/openoffice-3/files/patch-i85126
@@ -155,7 +155,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
 -#if __FreeBSD_version < 602103
-+#if __FreeBSD_version < 702104
++#if __FreeBSD_version < 702104 /* #i22253# */
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
  #else
      : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -164,7 +164,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
          
          OString symName( buf.makeStringAndClear() );
 -#if __FreeBSD_version < 602103  /* #i22253# */
-+#if __FreeBSD_version < 702104  /* #i22253# */
++#if __FreeBSD_version < 702104 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
  #else
          rtti = (type_info *)dlsym( m_hApp, symName.getStr() );