From ea7063ce507f8ec31edaa1ab9525c6881f4e2b18 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Thu, 26 Oct 2006 21:36:33 +0000 Subject: [PATCH] Update to 2.0.4.1 version of ooo-build. Approved by: portmgr(erwin) --- editors/ooo-build/Makefile | 12 ++++++------ editors/ooo-build/distinfo | 18 ++++++------------ editors/ooo-build/files/ooo-build-patch | 11 +++++------ 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile index a83468d5a107..69c78ea8314f 100644 --- a/editors/ooo-build/Makefile +++ b/editors/ooo-build/Makefile @@ -30,12 +30,12 @@ OOO_CRYSTAL_IMAGES= ooo_crystal_images-1.tar.gz OOO_OPENCLIPART= openclipart-0.18-full.tar.gz OOO_PATCHDIR=src680 .else -OOOBUILD_VERSION=2.0.4.m4 -OOOBUILD_TAG=ood680-m4 -OOOSRC= OOo_2.0.4rc2_src.tar.gz -OOOTAG= OOD680_m4 -#OOOBUILD= ooo-build-${OOOBUILD_VERSION} -OOOBUILD= ooo-build-${OOOBUILD_TAG} +OOOBUILD_VERSION=2.0.4.1 +OOOBUILD_TAG=ood680-m5 +OOOSRC= OOo_2.0.4_src.tar.gz +OOOTAG= OOD680_m5 +OOOBUILD= ooo-build-${OOOBUILD_VERSION} +#OOOBUILD= ooo-build-${OOOBUILD_TAG} OOOBUILD_SOURCE=${OOOBUILD}.tar.gz OOO_EXTRA_ARTWORK=extras-2.tar.bz2 OOO_CRYSTAL_IMAGES= ooo_crystal_images-1.tar.gz diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo index e82003a098de..4e3b3e70de91 100644 --- a/editors/ooo-build/distinfo +++ b/editors/ooo-build/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/ooo-build-ood680-m4.tar.gz) = 400590f308afd5189bfceaca9eb75878 -SHA256 (openoffice.org2.0/ooo-build-ood680-m4.tar.gz) = 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d -SIZE (openoffice.org2.0/ooo-build-ood680-m4.tar.gz) = 4349611 +MD5 (openoffice.org2.0/ooo-build-2.0.4.1.tar.gz) = 38a82068e85ca4bc96d088f13e3bedc3 +SHA256 (openoffice.org2.0/ooo-build-2.0.4.1.tar.gz) = 7be9022682bc65f77f995f33c91938f2fd83f819377851f77a71790e243d1ae9 +SIZE (openoffice.org2.0/ooo-build-2.0.4.1.tar.gz) = 4453648 MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020 SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740 @@ -10,9 +10,9 @@ SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 1068060 MD5 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619 SHA256 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a SIZE (openoffice.org2.0/openclipart-0.18-full.tar.gz) = 126709000 -MD5 (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = bbc1786e29f4b8de8e70d347b7bfc812 -SHA256 (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = e5ae257bdead899ac369bab3f8d8b7ce902d45013175ee5827745256fb156e45 -SIZE (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = 333859530 +MD5 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197 +SHA256 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 98551d4574586c5a9e26635be758cf05a0315ee9eb44ad7c5ac7c7b983933ea6 +SIZE (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 333861883 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 @@ -22,9 +22,3 @@ SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366 -MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6 -SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4 -SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106 -MD5 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = c61131dbbf63fead9477ad8445388dc4 -SHA256 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 0eacc02d33741189f849035a872c70c908aad01f799d28b9ef9c73aadea994ef -SIZE (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 5090024 diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch index 6d0a6a146025..86b13278d40f 100644 --- a/editors/ooo-build/files/ooo-build-patch +++ b/editors/ooo-build/files/ooo-build-patch @@ -22,16 +22,16 @@ gnu patch is gpatch for FreeBSD. --- patches/src680/apply.orig Thu Aug 31 02:44:39 2006 +++ patches/src680/apply Sat Sep 2 14:50:24 2006 -@@ -80,6 +80,8 @@ +@@ -81,6 +81,8 @@ # Novell - NovellWin32: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver - NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver + NovellWin32: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas + NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas +# FreeBSD +FreeBSD : LinuxCommon, NotDebian, Lockdown, CalcSolver # -------- [ Tag [ >= etc. ], ] patch sets -------- -@@ -727,7 +729,7 @@ +@@ -755,7 +757,7 @@ autodoc-add-missing-stdio-h.diff, rengelha # do not pack any potential .orig files with ppds @@ -40,7 +40,7 @@ gnu patch is gpatch for FreeBSD. # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list # of files does not conflict with the main package, i#64802 -@@ -821,7 +823,7 @@ +@@ -848,7 +850,7 @@ buildfix-gcc41-pointers-icu.diff, pmladek # Don't re-define NULL @@ -49,4 +49,3 @@ gnu patch is gpatch for FreeBSD. # Fix warnings that appear on x86-64 & are considered dangerous # FIXME file up-stream -