From 6c0bd12a3be59c2fa955235af1f30014e30366e2 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Mon, 31 Aug 2009 10:47:55 +0000 Subject: 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. --- editors/openoffice-3/Makefile | 25 ++++++++++++++++++------- editors/openoffice-3/distinfo | 6 +++--- editors/openoffice-3/files/Makefile.knobs | 2 -- editors/openoffice-3/files/patch-i103628 | 26 ++++++++++++++++++++++++++ editors/openoffice-3/files/patch-i85126 | 4 ++-- editors/openoffice.org-3/Makefile | 25 ++++++++++++++++++------- editors/openoffice.org-3/distinfo | 6 +++--- editors/openoffice.org-3/files/Makefile.knobs | 2 -- editors/openoffice.org-3/files/patch-i103628 | 26 ++++++++++++++++++++++++++ editors/openoffice.org-3/files/patch-i85126 | 4 ++-- 10 files changed, 98 insertions(+), 28 deletions(-) create mode 100644 editors/openoffice-3/files/patch-i103628 create mode 100644 editors/openoffice.org-3/files/patch-i103628 (limited to 'editors') diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 1d2bd7d4d50c..ed40f3647b22 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -1,4 +1,3 @@ - # New ports collection makefile for: OpenOffice.org # Date created: 28 February 2002 # Whom: Martin Blapp @@ -8,7 +7,6 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION= 2 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -24,7 +22,7 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) -OOOVERSION= 3.1.0 +OOOVERSION= 3.1.1 NO_LATEST_LINK= yes USE_GNOME= desktopfileutils gtk20 MOZILLA_VERSION= 1.7.5 @@ -49,7 +47,7 @@ MAKE_JOBS_SAFE= yes USE_JAVA= yes JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava +JAVA_VENDOR= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else @@ -66,7 +64,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 11 +MILESTONE?= 19 OOOTAG?= OOO310_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 @@ -134,7 +132,18 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-crashdump=yes \ --with-system-zlib \ --with-system-stdlibs \ - --with-epm=internal + --with-epm=internal \ + --enable-minimizer \ + --enable-presenter-console \ + --enable-pdfimport \ + --enable-wiki-publisher \ + --enable-report-builder + +OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt +OOOEXTENSIONS+= presenter/presenter-screen.oxt +OOOEXTENSIONS+= pdfimport/pdfimport.oxt +OOOEXTENSIONS+= swext/wiki-publisher.oxt +OOOEXTENSIONS+= sun-report-builder.oxt .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes @@ -166,7 +175,7 @@ pre-everything:: .endif #issue XXXXXX not raised yet... -CRLFFILES=curl/curl*patch neon/neon*patch +CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch post-extract: for i in ${CRLFFILES}; do \ @@ -221,6 +230,8 @@ do-install: @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} .endif + @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/310/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: @${ECHO_MSG} "===> Add wrapper scripts"; diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index d1276562a517..10dc9958097c 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 7f8a9dd05f2bb8449447cca02a54891b -SHA256 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 77a5c868b3dcfdfd4439727b491f6724d86fee318ae706e287bfb4159203dd55 -SIZE (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 407464693 +MD5 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 29a3f5de50afbc1a19121a0b2fcbe7ef +SHA256 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 877ebfbbc62bb6e5d66582e561f6b4692508c28cf770a7bfc5b9173296bbe5ca +SIZE (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 407469121 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 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() ); diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 1d2bd7d4d50c..ed40f3647b22 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -1,4 +1,3 @@ - # New ports collection makefile for: OpenOffice.org # Date created: 28 February 2002 # Whom: Martin Blapp @@ -8,7 +7,6 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION= 2 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -24,7 +22,7 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) -OOOVERSION= 3.1.0 +OOOVERSION= 3.1.1 NO_LATEST_LINK= yes USE_GNOME= desktopfileutils gtk20 MOZILLA_VERSION= 1.7.5 @@ -49,7 +47,7 @@ MAKE_JOBS_SAFE= yes USE_JAVA= yes JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava +JAVA_VENDOR= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else @@ -66,7 +64,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 11 +MILESTONE?= 19 OOOTAG?= OOO310_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 @@ -134,7 +132,18 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-crashdump=yes \ --with-system-zlib \ --with-system-stdlibs \ - --with-epm=internal + --with-epm=internal \ + --enable-minimizer \ + --enable-presenter-console \ + --enable-pdfimport \ + --enable-wiki-publisher \ + --enable-report-builder + +OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt +OOOEXTENSIONS+= presenter/presenter-screen.oxt +OOOEXTENSIONS+= pdfimport/pdfimport.oxt +OOOEXTENSIONS+= swext/wiki-publisher.oxt +OOOEXTENSIONS+= sun-report-builder.oxt .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes @@ -166,7 +175,7 @@ pre-everything:: .endif #issue XXXXXX not raised yet... -CRLFFILES=curl/curl*patch neon/neon*patch +CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch post-extract: for i in ${CRLFFILES}; do \ @@ -221,6 +230,8 @@ do-install: @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} .endif + @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/310/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: @${ECHO_MSG} "===> Add wrapper scripts"; diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index d1276562a517..10dc9958097c 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 7f8a9dd05f2bb8449447cca02a54891b -SHA256 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 77a5c868b3dcfdfd4439727b491f6724d86fee318ae706e287bfb4159203dd55 -SIZE (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 407464693 +MD5 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 29a3f5de50afbc1a19121a0b2fcbe7ef +SHA256 (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 877ebfbbc62bb6e5d66582e561f6b4692508c28cf770a7bfc5b9173296bbe5ca +SIZE (openoffice.org3/OOo_OOO310_m19_source.tar.bz2) = 407469121 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs index e1053db6682d..5d96251759ef 100644 --- a/editors/openoffice.org-3/files/Makefile.knobs +++ b/editors/openoffice.org-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.org-3/files/patch-i103628 b/editors/openoffice.org-3/files/patch-i103628 new file mode 100644 index 000000000000..c3846bc27ae2 --- /dev/null +++ b/editors/openoffice.org-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.org-3/files/patch-i85126 b/editors/openoffice.org-3/files/patch-i85126 index 973ae74a51bd..d2b427c99915 100644 --- a/editors/openoffice.org-3/files/patch-i85126 +++ b/editors/openoffice.org-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() ); -- cgit v1.2.3