diff options
| author | maho <maho@FreeBSD.org> | 2009-06-12 04:09:31 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2009-06-12 04:09:31 +0800 |
| commit | 0080ffcd95d136ea99cac8fbb1a715bbe652bfc0 (patch) | |
| tree | 29d04f05f8013f405d00448bcca230885f5a2b5f /editors/openoffice.org-3-devel | |
| parent | 14bf7693504b5cb20e91d99a9dc06a05622450d9 (diff) | |
| download | freebsd-ports-gnome-0080ffcd95d136ea99cac8fbb1a715bbe652bfc0.tar.gz freebsd-ports-gnome-0080ffcd95d136ea99cac8fbb1a715bbe652bfc0.tar.zst freebsd-ports-gnome-0080ffcd95d136ea99cac8fbb1a715bbe652bfc0.zip | |
Updaaate to DEV300_m50.
Funded by OpenOffice.org community.
Diffstat (limited to 'editors/openoffice.org-3-devel')
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i102181 | 32 |
3 files changed, 27 insertions, 15 deletions
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 4cc5759cace6..5537a4dd772a 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -71,11 +71,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 49 +MILESTONE?= 50 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20090528 +SNAPDATE= 20090611 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 516880331cce..67701d345ec4 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_DEV300_m49_source.tar.bz2) = 40a0d7330859658df3777f356ea4fdef -SHA256 (openoffice.org3/OOo_DEV300_m49_source.tar.bz2) = 36f8e48e37b3a557d033f0e6d63da51fd0e326ca4c2f8a3ddc91b35400d39089 -SIZE (openoffice.org3/OOo_DEV300_m49_source.tar.bz2) = 408491377 +MD5 (openoffice.org3/OOo_DEV300_m50_source.tar.bz2) = c97465c9b429a99688b945e1d7714b57 +SHA256 (openoffice.org3/OOo_DEV300_m50_source.tar.bz2) = 0f771dcf2a8c6fd865aa936160957f6a4c3c20fb1e4a8588591ba770cd4f7c75 +SIZE (openoffice.org3/OOo_DEV300_m50_source.tar.bz2) = 408602446 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-devel/files/patch-i102181 b/editors/openoffice.org-3-devel/files/patch-i102181 index 2e89167f154c..a074079aa43b 100644 --- a/editors/openoffice.org-3-devel/files/patch-i102181 +++ b/editors/openoffice.org-3-devel/files/patch-i102181 @@ -1,11 +1,23 @@ ---- openssl/makefile.mk~ 2009-04-11 18:07:56.000000000 +0900 -+++ openssl/makefile.mk 2009-05-16 15:41:13.000000000 +0900 -@@ -65,7 +65,7 @@ - OUT2LIB += libcrypto.* - OUT2INC += include/openssl/* +--- 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 + .ENDIF --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - PATCH_FILES=openssllnx.patch - ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8k.map \ ++.IF "$(OS)" == "FREEBSD" ++ PATCH_FILES=openssllnx.patch ++ ADDITIONAL_FILES:= \ ++ libcrypto_OOo_0_9_8k.map \ ++ libssl_OOo_0_9_8k.map ++ .IF "$(CPU)" == "X" ++ CONFIGURE_ACTION=Configure BSD-x86_64 ++ .ELSE ++ CONFIGURE_ACTION=Configure BSD-x86-elf ++ .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' ++.ENDIF ++ + .IF "$(OS)" == "WNT" + + .IF "$(COM)"=="GCC" |