update to 1299554

Feature safe:	yes

5 files changed, 5 insertions, 58 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 7ad7ed92131b..14bef7a50870 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -56,7 +56,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=		1297411
+SVNREVISION=		1299554
 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 20f937c20b13..da7749b3a82b 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1297411.tar.bz2) = d8f8672ef7619feb5c4c22fb98748f7dc1674d7cda41a481890a3b597fdbbfe4
-SIZE (openoffice/ApacheOpenOffice.r1297411.tar.bz2) = 250885984
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1297411.tar.bz2) = 781c635ca640aadc0207e5698fc4ffa77fa310b78379367fb749632a5561185d
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1297411.tar.bz2) = 215140908
+SHA256 (openoffice/ApacheOpenOffice.r1299554.tar.bz2) = ce4e97e7afcac08b2466beae2cea4c499f75dd6a29b1e2d1e4e0d574b3a3f65c
+SIZE (openoffice/ApacheOpenOffice.r1299554.tar.bz2) = 250878335
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1299554.tar.bz2) = 959339a96a415fe5c6d076fa2a1b25313b8f4cebd37fa6cb5e5459a3d11a5f38
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1299554.tar.bz2) = 215141205
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-apr b/editors/openoffice-3-devel/files/patch-apr
deleted file mode 100644
index 0b13dbdaee82..000000000000
--- a/editors/openoffice-3-devel/files/patch-apr
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../ext_libraries/apr/prj/d.lst	2012-02-27 20:07:36.000000000 +0900
-+++ ../ext_libraries/apr/prj/d.lst	2012-02-27 20:07:44.000000000 +0900
-@@ -16,7 +16,9 @@
- 
- # Linux
- ..\%__SRC%\lib\libapr-1.so.*.* %_DEST%\lib%_EXT%
-+..\%__SRC%\lib\libapr-1.so.* %_DEST%\lib%_EXT%
- linklib: libapr-1.so.*.*
-+linklib: libapr-1.so.*
- 
- # Mac
- ..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%
diff --git a/editors/openoffice-3-devel/files/patch-aprutil b/editors/openoffice-3-devel/files/patch-aprutil
deleted file mode 100644
index 62539965d081..000000000000
--- a/editors/openoffice-3-devel/files/patch-aprutil
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../ext_libraries/apr-util/prj/d.lst	2012-02-27 20:08:44.000000000 +0900
-+++ ../ext_libraries/apr-util/prj/d.lst	2012-02-27 20:08:52.000000000 +0900
-@@ -8,7 +8,9 @@
- 
- # Linux
- ..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
-+..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
- linklib: libaprutil-1.so.*.*
-+linklib: libaprutil-1.so.*
- 
- # Mac
- ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
diff --git a/editors/openoffice-3-devel/files/patch-scp2 b/editors/openoffice-3-devel/files/patch-scp2
deleted file mode 100644
index e464255f697d..000000000000
--- a/editors/openoffice-3-devel/files/patch-scp2
+++ /dev/null
@@ -1,29 +0,0 @@
---- scp2/source/ooo/file_library_ooo.scp	2012-02-26 13:38:09.000000000 +0900
-+++ scp2/source/ooo/file_library_ooo.scp	2012-02-28 21:04:25.000000000 +0900
-@@ -2006,6 +2006,8 @@
- 	// part of the suffix.  An error?
- 	#ifdef MACOSX
-             Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
-+	#elif FREEBSD
-+            Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4));
-         #else
-             Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
-         #endif
-@@ -2021,6 +2023,8 @@
- 	// part of the suffix.  An error?
- 	#ifdef MACOSX
-             Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
-+	#elif FREEBSD
-+            Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4));
- 	#else
-             Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
- 	#endif
-@@ -2036,6 +2040,8 @@
- 	// part of the suffix.  An error?
- 	#ifdef MACOSX
-             Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
-+	#elif FREEBSD
-+            Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
- 	#else
-             Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
- 	#endif