Update to DEV300_m103.

http://openoffice.org/projects/www/lists/cws-announce/archive/2011-03/message/47
http://development.openoffice.org/releases/DEV300m103_snapshot.html

3 files changed, 4 insertions, 72 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index cec7b27ad212..fe7e0b723b65 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -76,12 +76,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		102
+MILESTONE?=		103
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20110309
+SNAPDATE=		20110318
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index a599db81c419..21f7dfa9109f 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m102_source.tar.bz2) = e0be8af3001bcf613f71d859330380a424becf762a225bf7d4ad612eff34ddc3
-SIZE (openoffice.org3/OOo_DEV300_m102_source.tar.bz2) = 227172561
+SHA256 (openoffice.org3/OOo_DEV300_m103_source.tar.bz2) = 14546ce5758ad1df592e7088f313c2a351aaa21e8edd77407aaa61d97cf71119
+SIZE (openoffice.org3/OOo_DEV300_m103_source.tar.bz2) = 227193789
 SHA256 (openoffice.org3/ext_sources.20110331.tar.bz2) = 0ffa08f29a13a3d7e9bdcc8feb120b31398c46de4a1ba2be6665258f5caeeac3
 SIZE (openoffice.org3/ext_sources.20110331.tar.bz2) = 260892348
 SHA256 (openoffice.org3/l10n.20110611.tar.bz2) = 4bcbe042fd41f532e2a14f65b27d691af8d66eb402942319090747cfbc526297
diff --git a/editors/openoffice-3-devel/files/patch-i117269 b/editors/openoffice-3-devel/files/patch-i117269
deleted file mode 100644
index 3c52e846687b..000000000000
--- a/editors/openoffice-3-devel/files/patch-i117269
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure.in	2011-06-12 20:29:44.000000000 +0900
-+++ configure.in	2011-06-12 20:31:29.000000000 +0900
-@@ -3482,10 +3482,9 @@
-          AC_MSG_RESULT(yes)
-       fi
-       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
--         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
-+         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi
-       else
--         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`, false)
-+         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/`, false)
-       fi
-       if test "$MINGWSTRIP" = "false"; then
-          AC_MSG_ERROR(MinGW32 binutils needed. Install them.)
-
---- configure	2011-03-28 23:03:11.000000000 +0900
-+++ configure	2011-06-12 20:48:45.000000000 +0900
-@@ -12960,13 +12960,11 @@
- echo "${ECHO_T}yes" >&6
-       fi
-       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
--         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
-+         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi
-       else
-          if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`", so it can be a program name with args.
--set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`; ac_word=$2
-+  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then
-@@ -12982,8 +12980,7 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`"
-+    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -13004,10 +13001,8 @@
- fi
- if test -z "$ac_cv_prog_MINGWSTRIP"; then
-   ac_ct_MINGWSTRIP=$MINGWSTRIP
--  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`", so it can be a program name with args.
--set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`; ac_word=$2
-+  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
-+set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then
-@@ -13023,8 +13018,7 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
--$SED -e s/c++/strip/`"
-+    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi