From 2a9e6e3962b85270595d6018b08d56e004275a32 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sat, 5 Jun 2010 11:01:56 +0000 Subject: Update to 3.2.1. Funded by: OpenOffice.org community. --- editors/openoffice-3/Makefile | 9 ++++----- editors/openoffice-3/distinfo | 6 +++--- editors/openoffice-3/files/patch-i102181 | 10 +++++----- editors/openoffice.org-3/Makefile | 9 ++++----- editors/openoffice.org-3/distinfo | 6 +++--- editors/openoffice.org-3/files/patch-i102181 | 10 +++++----- 6 files changed, 24 insertions(+), 26 deletions(-) (limited to 'editors') diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 812b13d87f03..8874b2e1878b 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -7,7 +7,6 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION= 2 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ @@ -24,7 +23,7 @@ COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(releas CONFLICTS= cppunit* -OOOVERSION= 3.2.0 +OOOVERSION= 3.2.1 NO_LATEST_LINK= yes .if !defined(WITHOUT_MOZILLA) @@ -76,7 +75,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 12 +MILESTONE?= 19 OOOTAG?= OOO320_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 @@ -151,11 +150,11 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-wiki-publisher \ --enable-report-builder -OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt +OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt -OOOEXTENSIONS+= sun-report-builder.oxt +OOOEXTENSIONS+= report-builder.oxt .if (${OSVERSION} <= 602102) EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index 68f3524d9df2..ca07850589d4 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 11fc18288da977d1007c90dfffbee865 -SHA256 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = bb15929f9316af39596cd169cba9c9f86cfb6c7f623cb93ba662d5ebf162ef26 -SIZE (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 447062642 +MD5 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = feb692912799d9f7369a48d704f3b6df +SHA256 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 130a7ec1c61f3f18698be40312ab7457bd46aac0281e412b4f9d7b9d422e2d79 +SIZE (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 447921964 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/patch-i102181 b/editors/openoffice-3/files/patch-i102181 index 53ccde029f35..e94916cab98b 100644 --- a/editors/openoffice-3/files/patch-i102181 +++ b/editors/openoffice-3/files/patch-i102181 @@ -1,6 +1,6 @@ --- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900 +++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900 -@@ -65,7 +65,7 @@ +@@ -61,7 +61,7 @@ OUT2LIB += libcrypto.* OUT2INC += include/openssl/* @@ -8,16 +8,16 @@ +.IF "$(OS)" == "LINUX" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8l.map \ -@@ -103,6 +103,22 @@ + libcrypto_OOo_0_9_8n.map \ +@@ -99,6 +99,22 @@ .ENDIF .ENDIF +.IF "$(OS)" == "FREEBSD" + PATCH_FILES=openssllnx.patch + ADDITIONAL_FILES:= \ -+ libcrypto_OOo_0_9_8l.map \ -+ libssl_OOo_0_9_8l.map ++ libcrypto_OOo_0_9_8n.map \ ++ libssl_OOo_0_9_8n.map + .IF "$(CPU)" == "I" + CONFIGURE_ACTION=Configure BSD-x86-elf + .ELIF "$(BUILD64)" == "1" diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 812b13d87f03..8874b2e1878b 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -7,7 +7,6 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION= 2 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ @@ -24,7 +23,7 @@ COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(releas CONFLICTS= cppunit* -OOOVERSION= 3.2.0 +OOOVERSION= 3.2.1 NO_LATEST_LINK= yes .if !defined(WITHOUT_MOZILLA) @@ -76,7 +75,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 12 +MILESTONE?= 19 OOOTAG?= OOO320_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 @@ -151,11 +150,11 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-wiki-publisher \ --enable-report-builder -OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt +OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt -OOOEXTENSIONS+= sun-report-builder.oxt +OOOEXTENSIONS+= report-builder.oxt .if (${OSVERSION} <= 602102) EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index 68f3524d9df2..ca07850589d4 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 11fc18288da977d1007c90dfffbee865 -SHA256 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = bb15929f9316af39596cd169cba9c9f86cfb6c7f623cb93ba662d5ebf162ef26 -SIZE (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 447062642 +MD5 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = feb692912799d9f7369a48d704f3b6df +SHA256 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 130a7ec1c61f3f18698be40312ab7457bd46aac0281e412b4f9d7b9d422e2d79 +SIZE (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 447921964 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/patch-i102181 b/editors/openoffice.org-3/files/patch-i102181 index 53ccde029f35..e94916cab98b 100644 --- a/editors/openoffice.org-3/files/patch-i102181 +++ b/editors/openoffice.org-3/files/patch-i102181 @@ -1,6 +1,6 @@ --- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900 +++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900 -@@ -65,7 +65,7 @@ +@@ -61,7 +61,7 @@ OUT2LIB += libcrypto.* OUT2INC += include/openssl/* @@ -8,16 +8,16 @@ +.IF "$(OS)" == "LINUX" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8l.map \ -@@ -103,6 +103,22 @@ + libcrypto_OOo_0_9_8n.map \ +@@ -99,6 +99,22 @@ .ENDIF .ENDIF +.IF "$(OS)" == "FREEBSD" + PATCH_FILES=openssllnx.patch + ADDITIONAL_FILES:= \ -+ libcrypto_OOo_0_9_8l.map \ -+ libssl_OOo_0_9_8l.map ++ libcrypto_OOo_0_9_8n.map \ ++ libssl_OOo_0_9_8n.map + .IF "$(CPU)" == "I" + CONFIGURE_ACTION=Configure BSD-x86-elf + .ELIF "$(BUILD64)" == "1" -- cgit v1.2.3