From 639a65132bb81175e763933eb613ebf681b4fe72 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Sat, 13 Mar 2010 21:27:03 +0000
Subject: [PATCH] Update to DEV300_m74.

Feature safe:	yes
Funded by: OpenOffice.org community.
---
 editors/openoffice-3-devel/Makefile               |  4 ++--
 editors/openoffice-3-devel/distinfo               |  6 +++---
 editors/openoffice-3-devel/files/patch-i109428    | 15 ++++++++-------
 editors/openoffice.org-3-devel/Makefile           |  4 ++--
 editors/openoffice.org-3-devel/distinfo           |  6 +++---
 .../openoffice.org-3-devel/files/patch-i109428    | 15 ++++++++-------
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 8b912b75db6e..72eb24bdd6c4 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -80,11 +80,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		73
+MILESTONE?=		74
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100304
+SNAPDATE=		20100310
 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 f61561448249..51b98af709eb 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m73_source.tar.bz2) = 9a39a6c2d434d5825c629d7ec17db833
-SHA256 (openoffice.org3/OOo_DEV300_m73_source.tar.bz2) = e0333be54c47905638810e81e86567bdbfe5149dc1c7649b48f65da93de74996
-SIZE (openoffice.org3/OOo_DEV300_m73_source.tar.bz2) = 464032282
+MD5 (openoffice.org3/OOo_DEV300_m74_source.tar.bz2) = 9890ab39f5dfb192b76e2a78e97800f3
+SHA256 (openoffice.org3/OOo_DEV300_m74_source.tar.bz2) = e03b491066f11be9d1e32229f55f9d9a62712b287f7ac34f6cf85a47827b6e8b
+SIZE (openoffice.org3/OOo_DEV300_m74_source.tar.bz2) = 464525221
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i109428 b/editors/openoffice-3-devel/files/patch-i109428
index 447b297cda41..e54a6f45ee7e 100644
--- a/editors/openoffice-3-devel/files/patch-i109428
+++ b/editors/openoffice-3-devel/files/patch-i109428
@@ -9,14 +9,15 @@
      AC_MSG_RESULT([yes])
      ENABLE_GRAPHITE="TRUE"
      AC_MSG_CHECKING([which graphite to use])
---- configure.orig	2010-02-26 08:02:44.000000000 +0900
-+++ configure	2010-03-13 14:09:51.000000000 +0900
-@@ -19036,7 +19036,7 @@
+
+--- configure.orig	2010-03-10 05:08:35.000000000 +0900
++++ configure	2010-03-13 18:48:47.000000000 +0900
+@@ -15913,7 +15913,7 @@
  
- echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
- echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
+ $as_echo_n "checking whether to enable graphite support... " >&6; }
 -if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
 +if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      ENABLE_GRAPHITE="TRUE"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 8b912b75db6e..72eb24bdd6c4 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -80,11 +80,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		73
+MILESTONE?=		74
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100304
+SNAPDATE=		20100310
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index f61561448249..51b98af709eb 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m73_source.tar.bz2) = 9a39a6c2d434d5825c629d7ec17db833
-SHA256 (openoffice.org3/OOo_DEV300_m73_source.tar.bz2) = e0333be54c47905638810e81e86567bdbfe5149dc1c7649b48f65da93de74996
-SIZE (openoffice.org3/OOo_DEV300_m73_source.tar.bz2) = 464032282
+MD5 (openoffice.org3/OOo_DEV300_m74_source.tar.bz2) = 9890ab39f5dfb192b76e2a78e97800f3
+SHA256 (openoffice.org3/OOo_DEV300_m74_source.tar.bz2) = e03b491066f11be9d1e32229f55f9d9a62712b287f7ac34f6cf85a47827b6e8b
+SIZE (openoffice.org3/OOo_DEV300_m74_source.tar.bz2) = 464525221
 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-i109428 b/editors/openoffice.org-3-devel/files/patch-i109428
index 447b297cda41..e54a6f45ee7e 100644
--- a/editors/openoffice.org-3-devel/files/patch-i109428
+++ b/editors/openoffice.org-3-devel/files/patch-i109428
@@ -9,14 +9,15 @@
      AC_MSG_RESULT([yes])
      ENABLE_GRAPHITE="TRUE"
      AC_MSG_CHECKING([which graphite to use])
---- configure.orig	2010-02-26 08:02:44.000000000 +0900
-+++ configure	2010-03-13 14:09:51.000000000 +0900
-@@ -19036,7 +19036,7 @@
+
+--- configure.orig	2010-03-10 05:08:35.000000000 +0900
++++ configure	2010-03-13 18:48:47.000000000 +0900
+@@ -15913,7 +15913,7 @@
  
- echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
- echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
+ $as_echo_n "checking whether to enable graphite support... " >&6; }
 -if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
 +if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      ENABLE_GRAPHITE="TRUE"