diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-12-12 22:35:26 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-12-12 22:35:26 +0000 |
| commit | a15d680f12f70db8d8c749d043be788f03d0430b (patch) | |
| tree | 5e9a17e5e1ee10e1a6f78ee09c76fdaefd92fa0e /editors/openoffice.org-3-RC | |
| parent | Temporarely remove archives.fedoraproject.org completely, it's slows down (diff) | |
Update to OOO320_m7.
Funded by: OpenOffice.org community.
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 | 27 |
3 files changed, 24 insertions, 13 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 76d5211ee1a2..08f0a6b165e7 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -64,11 +64,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 6 +MILESTONE?= 7 OOOTAG?= OOO320_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20091129 +SNAPDATE= 20091212 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 1ff2cecffe02..5a6d65e8d484 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO320_m6_source.tar.bz2) = e8010664bef7d72ad9c82eeff4665876 -SHA256 (openoffice.org3/OOo_OOO320_m6_source.tar.bz2) = 7b47d29036dffd463e5d55ea6dcc7f361a670d19ec20ba10b4e6a4e662087308 -SIZE (openoffice.org3/OOo_OOO320_m6_source.tar.bz2) = 445615475 +MD5 (openoffice.org3/OOo_OOO320_m7_source.tar.bz2) = 280dc06bed8e86277e749ce2aba7f262 +SHA256 (openoffice.org3/OOo_OOO320_m7_source.tar.bz2) = c7241940ebc55ed4365788f8a194be2b159abdf2304f8a54926b1baf118355e3 +SIZE (openoffice.org3/OOo_OOO320_m7_source.tar.bz2) = 446346365 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 a074079aa43b..53ccde029f35 100644 --- a/editors/openoffice.org-3-RC/files/patch-i102181 +++ b/editors/openoffice.org-3-RC/files/patch-i102181 @@ -1,18 +1,29 @@ ---- openssl/makefile.mk.orig 2009-06-11 09:05:38.000000000 +0900 -+++ openssl/makefile.mk 2009-06-11 20:30:14.000000000 +0900 -@@ -105,6 +105,20 @@ - .ENDIF +--- 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 @@ + OUT2LIB += libcrypto.* + OUT2INC += include/openssl/* + +-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" ++.IF "$(OS)" == "LINUX" + PATCH_FILES=openssllnx.patch + ADDITIONAL_FILES:= \ + libcrypto_OOo_0_9_8l.map \ +@@ -103,6 +103,22 @@ + .ENDIF .ENDIF +.IF "$(OS)" == "FREEBSD" + PATCH_FILES=openssllnx.patch + ADDITIONAL_FILES:= \ -+ libcrypto_OOo_0_9_8k.map \ -+ libssl_OOo_0_9_8k.map -+ .IF "$(CPU)" == "X" ++ libcrypto_OOo_0_9_8l.map \ ++ libssl_OOo_0_9_8l.map ++ .IF "$(CPU)" == "I" ++ CONFIGURE_ACTION=Configure BSD-x86-elf ++ .ELIF "$(BUILD64)" == "1" + CONFIGURE_ACTION=Configure BSD-x86_64 + .ELSE -+ CONFIGURE_ACTION=Configure BSD-x86-elf ++ CONFIGURE_ACTION=Configure BSD-generic32 + .ENDIF + # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \" + #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' |