summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2013-01-23 06:54:52 +0000
committerMaho Nakata <maho@FreeBSD.org>2013-01-23 06:54:52 +0000
commit4766fb64a31800ba0ccc10be11b3f778265d24a0 (patch)
treec597edc782b3c1c836cce04c0fabf2566285ffcf /editors
parentUpdate textproc/igor to version 1.355. (diff)
* update to svn 1437264
* remove some unnecessary files [1] Submitted by: pfg@
Notes
Notes: svn path=/head/; revision=310852
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-3-devel/Makefile2
-rw-r--r--editors/openoffice-3-devel/distinfo8
-rw-r--r--editors/openoffice-3-devel/files/patch-bridges12
-rw-r--r--editors/openoffice-3-devel/files/patch-graphite17
-rw-r--r--editors/openoffice-3-devel/files/patch-vcl10
5 files changed, 5 insertions, 44 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index f1d6beafded8..a9eb99bd21a6 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -69,7 +69,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
OOODIR= apache_openoffice3
-SVNREVISION= 1434565
+SVNREVISION= 1437264
INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION}
EXECBASE?= openoffice-r${SVNREVISION}
DIST_SUBDIR= openoffice
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index b040c5bdcb49..6ca4035c81eb 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1434565.tar.bz2) = c574a142b3618e720698a1d6e7e335edd45bb077de6b04d15f884da23756a7cb
-SIZE (openoffice/ApacheOpenOffice.r1434565.tar.bz2) = 252915419
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1434565.tar.bz2) = cb0880f32370479b981c084072b49edd655e77a2cd32c7264bc46a3b46ce38d3
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1434565.tar.bz2) = 80437578
+SHA256 (openoffice/ApacheOpenOffice.r1437264.tar.bz2) = 6a00ef71e020225641f6ae602b214ce09b9fe4469c2b12e65e1ee81dc63d97c8
+SIZE (openoffice/ApacheOpenOffice.r1437264.tar.bz2) = 246969207
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1437264.tar.bz2) = 6261c2bd6103d2285d892abedc9070ab4fb3f5f6ba85d92f88bd75211417d75c
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1437264.tar.bz2) = 80437019
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-bridges b/editors/openoffice-3-devel/files/patch-bridges
deleted file mode 100644
index 9fe7a8c2772a..000000000000
--- a/editors/openoffice-3-devel/files/patch-bridges
+++ /dev/null
@@ -1,12 +0,0 @@
-Build fix for gcc46
-
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx~ 2012-02-19 18:18:25.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2012-02-20 18:03:45.000000000 +0900
-@@ -23,6 +23,7 @@
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_bridges.hxx"
-+#include <exception>
-
- #include <stdio.h>
- #include <string.h>
diff --git a/editors/openoffice-3-devel/files/patch-graphite b/editors/openoffice-3-devel/files/patch-graphite
deleted file mode 100644
index c087ebebf3e4..000000000000
--- a/editors/openoffice-3-devel/files/patch-graphite
+++ /dev/null
@@ -1,17 +0,0 @@
---- graphite/graphite-2.3.1.patch 2012-02-19 18:21:39.000000000 +0900
-+++ graphite/graphite-2.3.1.patch 2012-02-20 08:13:43.000000000 +0900
-@@ -2394,3 +2394,14 @@
- {
- bool fRet = true;
-
-+--- misc/silgraphite-2.3.1/engine/include/graphite/GrFeature.h 2009-01-22 07:36:40.000000000 +0900
-++++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrFeature.h 2012-02-20 08:09:33.000000000 +0900
-+@@ -21,6 +21,8 @@
-+
-+ //:End Ignore
-+
-++#define wstring basic_string<wchar_t> //quick dirty hack for not finding _STL::wstring
-++
-+ #include "GrAppData.h"
-+
-+ namespace gr
diff --git a/editors/openoffice-3-devel/files/patch-vcl b/editors/openoffice-3-devel/files/patch-vcl
deleted file mode 100644
index a74c7647ec44..000000000000
--- a/editors/openoffice-3-devel/files/patch-vcl
+++ /dev/null
@@ -1,10 +0,0 @@
---- vcl/Library_vclplug_gen.mk.orig 2012-05-19 17:17:44.000000000 +0900
-+++ vcl/Library_vclplug_gen.mk 2012-05-20 16:11:53.000000000 +0900
-@@ -124,7 +124,6 @@
- ifeq ($(XRANDR_DLOPEN),FALSE)
- $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
-- $$(XRANDR_CFLAGS) \
- ))
- $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \