diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2010-04-29 20:52:53 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2010-04-29 20:52:53 +0000 |
| commit | f495f24551d52e4afbbdce4605ba4feefef70b44 (patch) | |
| tree | dac98ada361282cba59f7caf9c54e774b3459106 /editors/openoffice.org-3-RC | |
| parent | - Update to 0.28 (diff) | |
Update to OOO320_m16.
Funded by: OpenOffice.org community
Notes
Notes:
svn path=/head/; revision=253442
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i102181 | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 3fad359a3453..3732e8c6831a 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -74,11 +74,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 15 +MILESTONE?= 16 OOOTAG?= OOO320_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20100418 +SNAPDATE= 20100429 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org3 diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 6069437ae93f..75876c54b77d 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO320_m15_source.tar.bz2) = 14d65614e993d7142b16f7353d1b524c -SHA256 (openoffice.org3/OOo_OOO320_m15_source.tar.bz2) = ce9cd0f52a3bee551c5f316a52235d75caa27dababc550ac4f501a535b7891c5 -SIZE (openoffice.org3/OOo_OOO320_m15_source.tar.bz2) = 444812211 +MD5 (openoffice.org3/OOo_OOO320_m16_source.tar.bz2) = e4820044d50166e5573f2a9828e0c87b +SHA256 (openoffice.org3/OOo_OOO320_m16_source.tar.bz2) = 00f6e538672b16a5bffa1af47c536d9709269c2e4c6ca4682bc901fd4a309cce +SIZE (openoffice.org3/OOo_OOO320_m16_source.tar.bz2) = 445097566 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-RC/files/patch-i102181 b/editors/openoffice.org-3-RC/files/patch-i102181 index 53ccde029f35..e94916cab98b 100644 --- a/editors/openoffice.org-3-RC/files/patch-i102181 +++ b/editors/openoffice.org-3-RC/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" |