summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2010-03-13 07:39:31 +0000
committerMaho Nakata <maho@FreeBSD.org>2010-03-13 07:39:31 +0000
commit207ce60e94b8a8d0ba65afd0ed0d8971d8d1413d (patch)
treed34d3fcc56d34d960b37fcb4cfbd324f4c668764 /editors
parent- Update to 1.3.10 (diff)
Update to DEV300_m72.
Feature safe: yes Funded by: OpenOffice.org community
Notes
Notes: svn path=/head/; revision=250985
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-3-devel/Makefile4
-rw-r--r--editors/openoffice-3-devel/distinfo6
-rw-r--r--editors/openoffice-3-devel/files/patch-i10942814
-rw-r--r--editors/openoffice.org-3-devel/Makefile4
-rw-r--r--editors/openoffice.org-3-devel/distinfo6
-rw-r--r--editors/openoffice.org-3-devel/files/patch-i10942814
6 files changed, 24 insertions, 24 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 933674a99294..a3fccdca2eb9 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?= 71
+MILESTONE?= 72
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
-SNAPDATE= 20100207
+SNAPDATE= 20100301
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 243a1adb967c..511dd1eff114 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m71_source.tar.bz2) = 1138e31f5fdc89e5f24b26fde64ab411
-SHA256 (openoffice.org3/OOo_DEV300_m71_source.tar.bz2) = 22e5e3691d93458ef4b9056758108ae228d3bd11f066bab595ddae3ab8da42ef
-SIZE (openoffice.org3/OOo_DEV300_m71_source.tar.bz2) = 463236459
+MD5 (openoffice.org3/OOo_DEV300_m72_source.tar.bz2) = a28210c30995e14c720384d87e8b2a44
+SHA256 (openoffice.org3/OOo_DEV300_m72_source.tar.bz2) = 2078522d359a29fa39900dfee6d2021a6894ed98ba912d8892af27da06fbf957
+SIZE (openoffice.org3/OOo_DEV300_m72_source.tar.bz2) = 464019183
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 46380e3ca111..447b297cda41 100644
--- a/editors/openoffice-3-devel/files/patch-i109428
+++ b/editors/openoffice-3-devel/files/patch-i109428
@@ -9,14 +9,14 @@
AC_MSG_RESULT([yes])
ENABLE_GRAPHITE="TRUE"
AC_MSG_CHECKING([which graphite to use])
---- configure~ 2010-02-19 10:00:38.000000000 +0900
-+++ configure 2010-02-19 10:14:50.000000000 +0900
-@@ -15617,7 +15617,7 @@
+--- configure.orig 2010-02-26 08:02:44.000000000 +0900
++++ configure 2010-03-13 14:09:51.000000000 +0900
+@@ -19036,7 +19036,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
- $as_echo_n "checking whether to enable graphite support... " >&6; }
+ echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
+ echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&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
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
ENABLE_GRAPHITE="TRUE"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 933674a99294..a3fccdca2eb9 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?= 71
+MILESTONE?= 72
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
-SNAPDATE= 20100207
+SNAPDATE= 20100301
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 243a1adb967c..511dd1eff114 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m71_source.tar.bz2) = 1138e31f5fdc89e5f24b26fde64ab411
-SHA256 (openoffice.org3/OOo_DEV300_m71_source.tar.bz2) = 22e5e3691d93458ef4b9056758108ae228d3bd11f066bab595ddae3ab8da42ef
-SIZE (openoffice.org3/OOo_DEV300_m71_source.tar.bz2) = 463236459
+MD5 (openoffice.org3/OOo_DEV300_m72_source.tar.bz2) = a28210c30995e14c720384d87e8b2a44
+SHA256 (openoffice.org3/OOo_DEV300_m72_source.tar.bz2) = 2078522d359a29fa39900dfee6d2021a6894ed98ba912d8892af27da06fbf957
+SIZE (openoffice.org3/OOo_DEV300_m72_source.tar.bz2) = 464019183
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 46380e3ca111..447b297cda41 100644
--- a/editors/openoffice.org-3-devel/files/patch-i109428
+++ b/editors/openoffice.org-3-devel/files/patch-i109428
@@ -9,14 +9,14 @@
AC_MSG_RESULT([yes])
ENABLE_GRAPHITE="TRUE"
AC_MSG_CHECKING([which graphite to use])
---- configure~ 2010-02-19 10:00:38.000000000 +0900
-+++ configure 2010-02-19 10:14:50.000000000 +0900
-@@ -15617,7 +15617,7 @@
+--- configure.orig 2010-02-26 08:02:44.000000000 +0900
++++ configure 2010-03-13 14:09:51.000000000 +0900
+@@ -19036,7 +19036,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
- $as_echo_n "checking whether to enable graphite support... " >&6; }
+ echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
+ echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&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
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
ENABLE_GRAPHITE="TRUE"