diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-07-22 08:19:01 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-07-22 08:19:01 +0000 |
| commit | f0a1975eadb332447a42d2fc6942cabd883c1636 (patch) | |
| tree | 01d0a0f396ed80f8c8ca81a6ab5533045dc07436 | |
| parent | * Update to 1.2.1 (diff) | |
Update to OOO310_m16.
Funded by: OpenOffice.org community.
| -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-i102679 | 30 |
3 files changed, 5 insertions, 35 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 0c40a767429c..3fce53862a61 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?= 15 +MILESTONE?= 16 OOOTAG?= OOO310_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20090704 +SNAPDATE= 20090722 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 d815697fe7ee..3e128a1c82db 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_OOO310_m15_source.tar.bz2) = ce06166dedb75663e2fa47106ab048c6 -SHA256 (openoffice.org3/OOo_OOO310_m15_source.tar.bz2) = da871c66781aac442e4ced9b0d0a183993c32c4f2897e2caffc97d2f1da2a5c8 -SIZE (openoffice.org3/OOo_OOO310_m15_source.tar.bz2) = 407391767 +MD5 (openoffice.org3/OOo_OOO310_m16_source.tar.bz2) = 59075a76752024c098b9075429b75983 +SHA256 (openoffice.org3/OOo_OOO310_m16_source.tar.bz2) = 30ae284a2a8b1d3333c46c9f1a801055cc52d6b892ee5c00e9cdb4b2f5ed16bb +SIZE (openoffice.org3/OOo_OOO310_m16_source.tar.bz2) = 407433051 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-i102679 b/editors/openoffice.org-3-RC/files/patch-i102679 deleted file mode 100644 index bfeb707f2e02..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-i102679 +++ /dev/null @@ -1,30 +0,0 @@ -will be fixed in OOO310_m14 - ---- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig 2009-06-11 18:24:02.000000000 +0100 -+++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx 2009-06-11 18:24:13.000000000 +0100 -@@ -30,7 +30,11 @@ - - #include "pnghelper.hxx" - --#include "zlib/zlib.h" -+#ifdef SYSTEM_ZLIB -+#include "zlib.h" -+#else -+#include <zlib/zlib.h> -+#endif - - using namespace pdfi; - ---- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig 2009-06-11 18:24:29.000000000 +0100 -+++ sdext/source/pdfimport/xpdfwrapper/makefile.mk 2009-06-11 18:24:46.000000000 +0100 -@@ -41,6 +41,10 @@ - - .INCLUDE: settings.mk - -+.IF "$(SYSTEM_ZLIB)" == "YES" -+CFLAGS+=-DSYSTEM_ZLIB -+.ENDIF -+ - .IF "$(ENABLE_PDFIMPORT)" == "NO" - @all: - @echo "PDF Import extension disabled." |