diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-07-03 07:13:12 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-07-03 07:13:12 +0000 |
| commit | 11c919cf32c32bf22a7bec02ce32caaa1af051ff (patch) | |
| tree | b82bc4815b5523f099a37607695c9d54f6eab47d /editors/openoffice.org-3-devel | |
| parent | 9cfd9abc84febe6b14b3a30fd597aeb6990d107d (diff) | |
| download | ports-11c919cf32c32bf22a7bec02ce32caaa1af051ff.tar.gz ports-11c919cf32c32bf22a7bec02ce32caaa1af051ff.zip | |
Notes
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-i102679 | 30 |
3 files changed, 35 insertions, 5 deletions
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index f490a5b05a9e..115bc301c8a7 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?= 50 +MILESTONE?= 51 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20090611 +SNAPDATE= 20090630 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 67701d345ec4..f7b55646fde1 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -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/OOo_DEV300_m51_source.tar.bz2) = 7edb79cbb34f5701e3fd20709dfd6651 +SHA256 (openoffice.org3/OOo_DEV300_m51_source.tar.bz2) = 14f3b00cfcb8b495a7275999ba9412a0ddeca458bcf17f4441eba23b8ca71393 +SIZE (openoffice.org3/OOo_DEV300_m51_source.tar.bz2) = 420077068 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-i102679 b/editors/openoffice.org-3-devel/files/patch-i102679 new file mode 100644 index 000000000000..bfeb707f2e02 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i102679 @@ -0,0 +1,30 @@ +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." |