From bcbabd11679f76bae5abbf818fc17f9248b5e903 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Tue, 26 Jun 2007 11:52:15 +0000 Subject: Update to SRC680_m217. --- editors/openoffice-3-devel/Makefile | 4 +-- editors/openoffice-3-devel/distinfo | 6 ++--- editors/openoffice-3-devel/files/patch-i78875 | 31 ++++++++++++++++++++++ editors/openoffice.org-2-devel/Makefile | 4 +-- editors/openoffice.org-2-devel/distinfo | 6 ++--- editors/openoffice.org-2-devel/files/patch-i78875 | 31 ++++++++++++++++++++++ editors/openoffice.org-3-devel/Makefile | 4 +-- editors/openoffice.org-3-devel/distinfo | 6 ++--- editors/openoffice.org-3-devel/files/patch-i78875 | 31 ++++++++++++++++++++++ editors/openoffice.org-vcltesttool/Makefile | 4 +-- editors/openoffice.org-vcltesttool/distinfo | 6 ++--- .../openoffice.org-vcltesttool/files/patch-i78875 | 31 ++++++++++++++++++++++ 12 files changed, 144 insertions(+), 20 deletions(-) create mode 100644 editors/openoffice-3-devel/files/patch-i78875 create mode 100644 editors/openoffice.org-2-devel/files/patch-i78875 create mode 100644 editors/openoffice.org-3-devel/files/patch-i78875 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i78875 (limited to 'editors') diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 49e66b5f073d..300a1de9d6ef 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 216 +MILESTONE?= 217 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070614 +SNAPDATE= 20070622 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index a7025be4cd52..983b5d1a81ac 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = fe38c4ca273ae2c9df0546ac034932f2 -SHA256 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 6f474ea6626b91d46c83d7eec288822565d5e98c1b5bae17b98731d5fc301171 -SIZE (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 270359988 +MD5 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 8eb0c803e976225a05a08febd5131e3d +SHA256 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 4e31392476ff6f1b31ea289d226743d7c7a30092ef21cc3053e6f377d8e94bd7 +SIZE (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 271505785 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-i78875 b/editors/openoffice-3-devel/files/patch-i78875 new file mode 100644 index 000000000000..aff1f83eead5 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i78875 @@ -0,0 +1,31 @@ +Index: libtextcat/libtextcat-2.2.patch +=================================================================== +RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v +retrieving revision 1.3 +diff -u -r1.3 libtextcat-2.2.patch +--- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3 ++++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000 +@@ -18,6 +18,23 @@ + # when you set need_version to no, make sure it does not cause -set_version + # flags to be left without arguments + archive_cmds= ++*************** ++*** 6280,6286 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 6281,6287 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) + *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003 + --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007 + *************** diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 49e66b5f073d..300a1de9d6ef 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 216 +MILESTONE?= 217 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070614 +SNAPDATE= 20070622 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index a7025be4cd52..983b5d1a81ac 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = fe38c4ca273ae2c9df0546ac034932f2 -SHA256 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 6f474ea6626b91d46c83d7eec288822565d5e98c1b5bae17b98731d5fc301171 -SIZE (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 270359988 +MD5 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 8eb0c803e976225a05a08febd5131e3d +SHA256 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 4e31392476ff6f1b31ea289d226743d7c7a30092ef21cc3053e6f377d8e94bd7 +SIZE (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 271505785 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2-devel/files/patch-i78875 b/editors/openoffice.org-2-devel/files/patch-i78875 new file mode 100644 index 000000000000..aff1f83eead5 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i78875 @@ -0,0 +1,31 @@ +Index: libtextcat/libtextcat-2.2.patch +=================================================================== +RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v +retrieving revision 1.3 +diff -u -r1.3 libtextcat-2.2.patch +--- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3 ++++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000 +@@ -18,6 +18,23 @@ + # when you set need_version to no, make sure it does not cause -set_version + # flags to be left without arguments + archive_cmds= ++*************** ++*** 6280,6286 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 6281,6287 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) + *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003 + --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007 + *************** diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 49e66b5f073d..300a1de9d6ef 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 216 +MILESTONE?= 217 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070614 +SNAPDATE= 20070622 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index a7025be4cd52..983b5d1a81ac 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = fe38c4ca273ae2c9df0546ac034932f2 -SHA256 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 6f474ea6626b91d46c83d7eec288822565d5e98c1b5bae17b98731d5fc301171 -SIZE (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 270359988 +MD5 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 8eb0c803e976225a05a08febd5131e3d +SHA256 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 4e31392476ff6f1b31ea289d226743d7c7a30092ef21cc3053e6f377d8e94bd7 +SIZE (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 271505785 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-devel/files/patch-i78875 b/editors/openoffice.org-3-devel/files/patch-i78875 new file mode 100644 index 000000000000..aff1f83eead5 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i78875 @@ -0,0 +1,31 @@ +Index: libtextcat/libtextcat-2.2.patch +=================================================================== +RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v +retrieving revision 1.3 +diff -u -r1.3 libtextcat-2.2.patch +--- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3 ++++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000 +@@ -18,6 +18,23 @@ + # when you set need_version to no, make sure it does not cause -set_version + # flags to be left without arguments + archive_cmds= ++*************** ++*** 6280,6286 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 6281,6287 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) + *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003 + --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007 + *************** diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 49e66b5f073d..300a1de9d6ef 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 216 +MILESTONE?= 217 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070614 +SNAPDATE= 20070622 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index a7025be4cd52..983b5d1a81ac 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = fe38c4ca273ae2c9df0546ac034932f2 -SHA256 (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 6f474ea6626b91d46c83d7eec288822565d5e98c1b5bae17b98731d5fc301171 -SIZE (openoffice.org2/OOo_SRC680_m216_source.tar.bz2) = 270359988 +MD5 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 8eb0c803e976225a05a08febd5131e3d +SHA256 (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 4e31392476ff6f1b31ea289d226743d7c7a30092ef21cc3053e6f377d8e94bd7 +SIZE (openoffice.org2/OOo_SRC680_m217_source.tar.bz2) = 271505785 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-vcltesttool/files/patch-i78875 b/editors/openoffice.org-vcltesttool/files/patch-i78875 new file mode 100644 index 000000000000..aff1f83eead5 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i78875 @@ -0,0 +1,31 @@ +Index: libtextcat/libtextcat-2.2.patch +=================================================================== +RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v +retrieving revision 1.3 +diff -u -r1.3 libtextcat-2.2.patch +--- libtextcat/libtextcat-2.2.patch 21 Jun 2007 16:05:43 -0000 1.3 ++++ libtextcat/libtextcat-2.2.patch 25 Jun 2007 11:12:26 -0000 +@@ -18,6 +18,23 @@ + # when you set need_version to no, make sure it does not cause -set_version + # flags to be left without arguments + archive_cmds= ++*************** ++*** 6280,6286 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 6281,6287 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) + *** misc/libtextcat-2.2/src/Makefile.in Thu May 22 13:39:52 2003 + --- misc/build/libtextcat-2.2/src/Makefile.in Thu Jun 21 17:44:15 2007 + *************** -- cgit v1.2.3