update to svn 1391327

4 files changed, 5 insertions, 33 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 93ab8c17d201..db6014bde6c6 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -72,7 +72,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
 EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SVNREVISION=		1388426
+SVNREVISION=		1391327
 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 3aaee15e6a98..15322cf2e6e4 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1388426.tar.bz2) = 12c6355089ade5b11b7f79a0e2dcc7ce347e5f89ad2618a407ba925b8b25212b
-SIZE (openoffice/ApacheOpenOffice.r1388426.tar.bz2) = 292171157
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1388426.tar.bz2) = 7f83593ff35f81cd29eeaae70ad0e9a4c9038c217c233c8203507e051a8f749b
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1388426.tar.bz2) = 175972011
+SHA256 (openoffice/ApacheOpenOffice.r1391327.tar.bz2) = f75e6f6843e94314689724b4bf7aed42b1608280282bbba8427a63ca0fe7cb95
+SIZE (openoffice/ApacheOpenOffice.r1391327.tar.bz2) = 273952802
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1391327.tar.bz2) = 4df5bad2bd5aac0ddb67a6100f1e261c63a90566605fdc98e669792ce5e4bf40
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1391327.tar.bz2) = 174433246
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-configure.in b/editors/openoffice-3-devel/files/patch-configure.in
deleted file mode 100644
index 8594ed9b1174..000000000000
--- a/editors/openoffice-3-devel/files/patch-configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in~	2012-09-21 20:42:22.000000000 +0900
-+++ configure.in	2012-09-26 13:32:06.000000000 +0900
-@@ -52,6 +52,9 @@
- AC_ARG_WITH(system-graphite,
- [  --with-system-graphite    use graphite library already installed on system
- ],,)
-+AC_ARG_WITH(system-apache-commons,
-+[  --with-system-apache-commons    use apache-commons jar files already installed on system
-+],,)
- AC_ARG_ENABLE(online-update,
- [  --disable-online-update Disables the Online Update feature.
- ],,enable_online_update=yes)
diff --git a/editors/openoffice-3-devel/files/patch-sed b/editors/openoffice-3-devel/files/patch-sed
deleted file mode 100644
index 0907725277fe..000000000000
--- a/editors/openoffice-3-devel/files/patch-sed
+++ /dev/null
@@ -1,16 +0,0 @@
---- swext/mediawiki/makefile.mk	2012-09-21 20:36:58.000000000 +0900
-+++ swext/mediawiki/makefile.mk	2012-09-26 16:36:38.000000000 +0900
-@@ -50,10 +50,10 @@
- 
- fix_system_commons:
- 	@echo "Fix Java Class-Path entry for Apache Commons libraries from system."
--	@$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) file://$(COMMONS_LANG_JAR) \
--file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
-+	@$(SED) -i.bak -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) file://$(COMMONS_LANG_JAR) \
-+file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" build.xml
- 	@echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
--	@$(SED) '/file="..commons/d' -i build.xml
-+	@$(SED) -i.bak '/file="..commons/d' build.xml
- 
- .ELSE
- @all: