pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Update to 2.3.0.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5c308725bdd
branches:  trunk
changeset: 533917:d5c308725bdd
user:      hira <hira%pkgsrc.org@localhost>
date:      Sat Oct 06 20:02:21 2007 +0000

description:
Update to 2.3.0.

Security fix:
 - Fix CVE-2007-2834 (it has already fixed in 2.2.1nb3).

New features:
 - separated UI/configuration for database forms and database reports.
 - keyboard shortcuts for database record navigation.
 - Show filter options dialog before file dialog in case of pdf-export.
 - Selection of stylist filter now persistent.
 - The title for the broken signature dialog has been changed.
 - Extension Identifiers, unopkg, pkgchk.
 - Export COT, ACOT, COTH, and ACOTH to MS Excel files.
 - Centered document view.
 - separated UI/configuration for XML Form Documents.
 - New locale data:
        Hausa_Ghana (ha_GH)
        Ewe_Ghana (ee_GH)
        Frisian_Netherlands (fy_NL)
        Uzbek_Uzbekistan (uz_UZ)
        Occitan_France (oc_FR)
        Lingala_Congo (ln_CD)
        Sango _ Central African Republic (sg_CF)
        English_Ghana (en_GH),
        Ganda_Uganda (lg_UG)
        Armenian_Armenia (hy_AM)
 - Tagalog_Philippines (tl_PH) added to language list box.
 - Jewish calendar dates for en_US locale.
 - Uzbek (Cyrillic) removed from language list box.
 - Currency Bolivar Fuerte, VEF, for Spanish_Venezuela (es_VE) locale.
 - Default currency Ghana Cedi, GHS, for *_Ghana (ak_GH, ee_GH, en_GH, ha_GH)
   locales.
 - com.sun.star.io.SequenceInputStream service.
 - Insert/Title Dialog Layout Changed.
 - offer to switch to a Simple 3d look in charts.
 - exploded 3D pies and donuts.
 - more easy creation of charts / new wizard.
 - Strings for Undo in Charts.
 - enhanced logarithmic scales.
 - Automatic axis scaling.
 - Flexible Source-Range Selection.
 - enhanced selection handling.
 - Export donut charts according to spec.
 - Export manual scales for percent charts correctly.
 - Menu for Charts.
 - Chart Data Editor improved.
 - Right-angled axes for 3D Charts.
 - New Default Colors for Charts
 - Chart-Specific Toolbars.
 - Terms for Chart Elements.
 - simplified 3D dialog for charts.
 - Right-angled axes for 3D Charts.
 - Show formula and R^2 for regression curves in Status Bar and Extended Tip
   Help.
 - keyboard shortcuts for task pane entries.
 - / in database object names not allowed anymore.
 - New Report Designer.
 - HTML export for draw and presentation documents now supports png.
 - Alternative text for non-text image map.
 - Alternative text for layers in drawings.
 - Alternative text for layers in drawings (now with issue number).
 - Preview Document in Web Browser.
 - Extension can integrate options pages in the options dialog.
 - New option: Load printer settings with the document.
 - Single dialog export in dialog editor.
 - Link to extensions.services.openoffice.org in Extension Manager.
 - Editing of path animations is possible again.
 - testtool: new commands to request webpages.
 - testtool: new implementation for typekeys and mouse*.
 - testtool: new methods to access EditBrowseBox.
 - testtool: config tabpage for Crashreport configuration.
 - testtool: New option in options dialog to set OOo program path.
 - testtool: method to get state of menu entry if expandable.
 - testtool: add new methods for ORoadmap e.g. in wizards.
 - testtool: new method to get slot execution status.
 - Default print options in Calc.
 - Support of inline matrix/array constants in formulas.
 - Keyboard shortcut "Ctrl-1" is now "Format Cells".
 - Keyboard shortcuts Ctrl-Plus and Ctrl-Minus for Insert/Delete Cells.
 - GETPIVOTDATA formula function.
 - Division by zero #DIV/0! error displayed for certain functions, #NUM!
   displayed for illegal floating-point operation errors.
 - Cell context menu entry changed.
 - Renamed checkbox in Paste Special dialog.
 - Checkbox in Delete Contents dialog renamed.
 - Extend AutoSum Capabilities in Calc.
 - Renamed "Set Input Mode" to "Toggle Edit Mode".
 - Shortcut for Format->Cells menu entry changed.
 - Ctrl + ~ (Ctrl + `) toggles formula view.
 - Dynamic ranges as formula results in validation lists.
 - Drawing objects support Basic macro calls.
 - JIS and ASC Spreadsheet Functions.
 - "Form Objects" toolbar removed.
 - Toolbars "Insert" and "Insert Object" merged.
 - Changed menu entry Data->Outline.
 - Default print options in Calc.
 - Intro and about bitmap location changed, configure script extended.
 - Selectable FixedTexts.Changed shortcut for "Object" in the Edit menu.
 - Standard Color Palette Extended by new Chart Default Colors.
 - Automatic update for charts in Writer.
 - Language Guessing.
 - Ctrl-click to execute hyperlinks.
 - New Smart Tag API and UI.
 - 'Old' mail merge dialog now supports output to single file.
 - Soft page break.
 - Shortcut for "Repeat".
 - New writer compatibility option.
 - Password of a document is asked untill the correct one is entered or the
   dialog is cancelled.
 - Menu and toolbar merging support for extensions.
 - Default Macro Security Level changed.
 - First word in a Calc cell will no longer be capitalized by auto-correction.
 - Customize Keyboard tabpage.
 - Compatibility option "Expand word space..." added.
 - New export filter: MediaWiki.
 - Spell checking one letter words.

Please see the following URL for more detail of changes.

  http://development.openoffice.org/releases/2.3.0.html

diffstat:

 misc/openoffice2/Makefile         |  44 +++++++++++-------
 misc/openoffice2/distinfo         |  64 ++++++++++++--------------
 misc/openoffice2/options.mk       |  26 +++++-----
 misc/openoffice2/patches/patch-aa |  20 ++++++-
 misc/openoffice2/patches/patch-ad |  14 ++--
 misc/openoffice2/patches/patch-ae |  10 ++--
 misc/openoffice2/patches/patch-ah |  66 +++++++++++++-------------
 misc/openoffice2/patches/patch-ai |  12 ++--
 misc/openoffice2/patches/patch-aj |  20 ++-----
 misc/openoffice2/patches/patch-ak |  43 ++++++++++++++---
 misc/openoffice2/patches/patch-ap |  61 +++++++++++-------------
 misc/openoffice2/patches/patch-aq |  19 ++-----
 misc/openoffice2/patches/patch-ba |  46 ++++++++++++++++--
 misc/openoffice2/patches/patch-be |  36 ---------------
 misc/openoffice2/patches/patch-bh |  12 ++--
 misc/openoffice2/patches/patch-bq |  20 ++++----
 misc/openoffice2/patches/patch-bu |  13 -----
 misc/openoffice2/patches/patch-bx |  14 +++--
 misc/openoffice2/patches/patch-ch |  23 ++++-----
 misc/openoffice2/patches/patch-cj |   6 +-
 misc/openoffice2/patches/patch-co |  92 ---------------------------------------
 misc/openoffice2/patches/patch-cp |  12 +++++
 misc/openoffice2/patches/patch-cq |  13 +++++
 23 files changed, 313 insertions(+), 373 deletions(-)

diffs (truncated from 1220 to 300 lines):

diff -r 65d01c8710ea -r d5c308725bdd misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Sat Oct 06 15:39:21 2007 +0000
+++ b/misc/openoffice2/Makefile Sat Oct 06 20:02:21 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2007/09/30 12:27:40 hira Exp $
+# $NetBSD: Makefile,v 1.25 2007/10/06 20:02:21 hira Exp $
 #
 
-OO_VER=                        2.2.1
+OO_VER=                        2.3.0
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
-PKGREVISION=           3
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=           ${DISTNAME}
@@ -14,9 +13,6 @@
 DISTFILES+=            OOo_${OO_VER}_src_l10n.tar.bz2
 #DISTFILES+=           OOo_${OO_VER}_src_sdk.tar.bz2
 DISTFILES+=            OOo_${OO_VER}_src_system.tar.bz2
-# Missing file from tarball...
-DISTFILES+=            bridge.h
-SITES.bridge.h=                http://www.openoffice.org/source/browse/%2Acheckout%2A/udk/bridges/inc/bridges/cpp_uno/Attic/
 
 MAINTAINER=            hira%NetBSD.org@localhost
 HOMEPAGE=              http://www.openoffice.org/
@@ -27,9 +23,11 @@
 BUILD_DEPENDS+=                unzip-[0-9]*:../../archivers/unzip
 BUILD_DEPENDS+=                p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 
+DEPENDS+=              libpaper-[0-9]*:../../print/libpaper
+
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/OOF680_m18
+WRKSRC=                        ${WRKDIR}/OOG680_m5
 CONFIGURE_DIRS=                config_office
 
 # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -54,7 +52,12 @@
 CONFIGURE_ARGS+=       --enable-binfilter
 CONFIGURE_ARGS+=       --enable-cairo
 CONFIGURE_ARGS+=       --disable-ldap
+CONFIGURE_ARGS+=       --with-system-stdlibs
 CONFIGURE_ARGS+=       --with-system-freetype
+CONFIGURE_ARGS+=       --with-system-libxml2
+CONFIGURE_ARGS+=       --with-system-libxslt
+CONFIGURE_ARGS+=       --with-system-python
+CONFIGURE_ARGS+=       --with-system-zlib
 
 # `portable' supports all platforms.
 CONFIGURE_ARGS+=       --enable-epm --with-package-format=portable
@@ -81,24 +84,25 @@
 MESSAGE_SUBST+=                OO_RELEASE=${OO_RELEASE}
 INSTALLATION_DIRS=     bin
 
-OO_UNXNAME=    openoffice.org2.2
+OO_UNXNAME=    openoffice.org2.3
 OO_PKGPATH=    ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
 OO_PKGROOT=    /opt/${OO_UNXNAME}
 OO_PROGRAMS=   scalc sdraw simpress soffice swriter unopkg
 
 post-extract:
-       ${CP} ${DISTDIR}/${DIST_SUBDIR}/bridge.h                \
-               ${WRKSRC}/bridges/inc/bridges/cpp_uno/
+       cd ${WRKSRC}/bridges/source/cpp_uno &&                  \
+       mv gcc3_netbsd_intel gcc3_netbsd_intel.orig &&          \
+       cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel
 
 do-build:
        ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
 
 post-build:
        cd ${WRKDIR} &&                                         \
-       ${RM} -fr opt &&                                        \
+       rm -fr opt &&                                           \
        for l in ${OO_LANGS}; do                                \
                for f in ${OO_PKGPATH:Q}/$${l}/*/*.sw; do       \
-                       ${TAR} xpfk $$f;                        \
+                       tar xpfk $$f;                           \
                done;                                           \
        done
        ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
@@ -111,9 +115,9 @@
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/${OO_RELEASE}
        cd ${WRKDIR}${OO_PKGROOT} &&                            \
-       ${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OO_RELEASE} -
+       tar cf - . | tar Cxpf ${PREFIX}/${OO_RELEASE} -
        for f in ${OO_PROGRAMS}; do                             \
-               ${LN} -sf ${PREFIX}/${OO_RELEASE}/program/$$f   \
+               ln -sf ${PREFIX}/${OO_RELEASE}/program/$$f      \
                        ${PREFIX}/bin/$$f;                      \
        done
        ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${PREFIX}/bin
@@ -122,10 +126,10 @@
 
 post-install:
        cd ${PREFIX} &&                                         \
-       ${FIND} ${OO_RELEASE} \! -type d -print |               \
-       ${SORT} > ${PLIST_SRC} &&                               \
-       ${FIND} ${OO_RELEASE} -type d -print | ${SORT} -r |     \
-       ${AWK} '{print("@dirrm "$$1)}' >> ${PLIST_SRC}
+       find ${OO_RELEASE} \! -type d -print |                  \
+       sort > ${PLIST_SRC} &&                                  \
+       find ${OO_RELEASE} -type d -print | sort -r |           \
+       awk '{print("@dirrm "$$1)}' >> ${PLIST_SRC}
        for f in ${OO_PROGRAMS}; do                             \
                ${ECHO} bin/$$f >> ${PLIST_SRC};                \
        done
@@ -141,6 +145,10 @@
 .  include "Makefile.${OPSYS}.${ARCH}"
 .endif
 
+PYTHON_VERSIONS_ACCEPTED=      24 23 22
+.include "../../lang/python/application.mk"
+
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff -r 65d01c8710ea -r d5c308725bdd misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Sat Oct 06 15:39:21 2007 +0000
+++ b/misc/openoffice2/distinfo Sat Oct 06 20:02:21 2007 +0000
@@ -1,45 +1,41 @@
-$NetBSD: distinfo,v 1.23 2007/10/04 12:16:26 abs Exp $
+$NetBSD: distinfo,v 1.24 2007/10/06 20:02:21 hira Exp $
 
-SHA1 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = aa2c316e0fab13a25c07c2cfd0eafb7a50c96678
-RMD160 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = a6194849bb8e2130709a7ff769a8e751a43f86c6
-Size (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = 7756778 bytes
-SHA1 (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = dad86ea3e8ed2805986c82333cf7a12040696269
-RMD160 (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = fa6775f397bf093ad5be19c28c18d179bb1057b8
-Size (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = 123479583 bytes
-SHA1 (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = f7c1592210c60313464b7f2cec88cb850578aec1
-RMD160 (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = 58f56faab079f179348f4c64cdbe176e296345f7
-Size (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = 76560727 bytes
-SHA1 (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 295c70a94d37b811c4ad3f437c58e564c979ad51
-RMD160 (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 0487071a7f2cb92122984e5d928b2d7b4b55b85f
-Size (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 31149966 bytes
-SHA1 (openoffice-2.2.1/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
-RMD160 (openoffice-2.2.1/bridge.h) = 191fb56e56df85d49651988290d20db914670951
-Size (openoffice-2.2.1/bridge.h) = 6734 bytes
-SHA1 (patch-aa) = 352774b0e509f41787573594b8f8f8bbe72d6824
+SHA1 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = a45b356092fc61aba68d0b7536bb3f723cd62937
+RMD160 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 441a43c2a2d5418c9d3b55a89790f31598000bde
+Size (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 6477306 bytes
+SHA1 (openoffice-2.3.0/OOo_2.3.0_src_core.tar.bz2) = 339453f169e63f531e24f3d5774e6a5da65b26c1
+RMD160 (openoffice-2.3.0/OOo_2.3.0_src_core.tar.bz2) = 67c7a97aac4652f8a9cfb3019b9649689977b076
+Size (openoffice-2.3.0/OOo_2.3.0_src_core.tar.bz2) = 145104450 bytes
+SHA1 (openoffice-2.3.0/OOo_2.3.0_src_l10n.tar.bz2) = ca7dcd4d19d1f5df21fb931fe31cdd779128f49c
+RMD160 (openoffice-2.3.0/OOo_2.3.0_src_l10n.tar.bz2) = a84678c0bf786869464814b0fa21137acb3250a9
+Size (openoffice-2.3.0/OOo_2.3.0_src_l10n.tar.bz2) = 78634672 bytes
+SHA1 (openoffice-2.3.0/OOo_2.3.0_src_system.tar.bz2) = a6c2af424f7ac26adf75b384572fe19975ef355d
+RMD160 (openoffice-2.3.0/OOo_2.3.0_src_system.tar.bz2) = 5b557b49eec915127515c76ad921eea3580a893c
+Size (openoffice-2.3.0/OOo_2.3.0_src_system.tar.bz2) = 36640242 bytes
+SHA1 (patch-aa) = bbbd684c158cddb8aabf9c232257a997950f6119
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
-SHA1 (patch-ad) = 10d348282a4e5e6907e4e2cd828997f4549be58c
-SHA1 (patch-ae) = eec39a887ad19d3a8ff0a26fab7ea6981915eadd
+SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
+SHA1 (patch-ae) = 6fb03e29c5368f26e7187516354858df127d388b
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
-SHA1 (patch-ah) = 1d54fe3fd237ff053d14626f9a45ef393c90323f
-SHA1 (patch-ai) = eb985085a36647675e3f436e192847f67b5dec8c
-SHA1 (patch-aj) = f18266821545da2d37e589a0a7137d14cd19d87e
-SHA1 (patch-ak) = 7775257ed056f608da3b43b0d9bb146f61e2a438
+SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
+SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
+SHA1 (patch-aj) = f0a38928938ba18d32b1e9007dbb8e36e54381bc
+SHA1 (patch-ak) = 8b05a11b24d5a69e2dcc0b1863606c7d8e272149
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
-SHA1 (patch-ap) = cc7b39a28d80bdd27b459d9388cd770d08927b0e
-SHA1 (patch-aq) = 41fab8bdc5bc611fd01623ac222189646e42bf22
+SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431
+SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 0726d1331395646e2800f04d05f6dc7ec598d630
+SHA1 (patch-ba) = c56c8d5a04b172701992bad841795c24d0dd31fa
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
-SHA1 (patch-be) = 0aaa31523743f5cc9339c125fc93f32902b90151
 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
 SHA1 (patch-bg) = c050b8fa384a187fbf846f78c884c98840046a86
-SHA1 (patch-bh) = 25546cd8fb636a9e0fb0983b83b667567be415e6
+SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
 SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
 SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
 SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
@@ -48,17 +44,17 @@
 SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
 SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
-SHA1 (patch-bq) = dedb5791d5246408d6dfcc4565e75b54666fb1b6
+SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
 SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
 SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12
 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
-SHA1 (patch-bu) = 246771afac29432adbe479e5be3b3c032ad49413
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
-SHA1 (patch-bx) = 9d01592c69f0ba734ff488980c475a1b768bc229
+SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = bcfeb99318a16e83f2e54fb94d275224c67182fb
+SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0
 SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
-SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
+SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-co) = 9c4f2b9d50830df4bd6f81a06591bccc638c78e0
+SHA1 (patch-cp) = 7c6007d18cc4f1b5d1c8e16c9170ec0e8211a040
+SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
diff -r 65d01c8710ea -r d5c308725bdd misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk       Sat Oct 06 15:39:21 2007 +0000
+++ b/misc/openoffice2/options.mk       Sat Oct 06 20:02:21 2007 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.10 2007/09/25 10:16:08 hira Exp $
+# $NetBSD: options.mk,v 1.11 2007/10/06 20:02:21 hira Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde
 PKG_OPTIONS_REQUIRED_GROUPS=   browser
-PKG_OPTIONS_GROUP.browser=     firefox # seamonkey firefox-gtk1 seamonkey-gtk1
-OO_SUPPORTED_LANGUAGES=                en-US af as-IN be-BY bg br bs ca cs cy da de \
-                               el en-GB en-ZA eo es et fa fi fr ga gu-IN he \
-                               hi-IN hr hu it ja ka km ko ku lt mk ml-IN    \
-                               mr-IN nb ne nl nn nr ns or-IN pa-IN pl pt    \
-                               pt-BR ru rw sh-YU sk sl sr-CS ss st sv sw-TZ \
-                               ta-IN te-IN tg th ti-ER tn tr ts uk ur-IN ve \
-                               vi xh zh-CN zh-TW zu
+PKG_OPTIONS_GROUP.browser=     firefox seamonkey # firefox-gtk1 seamonkey-gtk1
+# The list from instsetoo_native/util/pack.lst:OpenOfficeLanguagepack.
+OO_SUPPORTED_LANGUAGES=                en-US af as-IN be-BY bg br bs ca cs da de dz \
+                               el en-GB en-ZA es et fi fr ga gl gu he hi-IN \
+                               hr hu it ja ka km ko lt mk ml-IN mr-IN nb ne \
+                               nl nn nr ns or-IN pa-IN pl pt ru rw sh-YU sk \
+                               sl sr-CS ss st sv sw-TZ ta te-IN tg th ti-ER \
+                               tr ts uk ur-IN ve vi xh zh-CN zh-TW zu
 .for l in ${OO_SUPPORTED_LANGUAGES}
 PKG_SUPPORTED_OPTIONS+=                lang-${l}
 .endfor
@@ -26,22 +26,22 @@
 OO_LANGS?=     en-US
 
 .if !empty(PKG_OPTIONS:Mfirefox)
-CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
+CONFIGURE_ARGS+=       --with-system-mozilla=firefox
 .include "../../www/firefox/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mfirefox-gtk1)
-CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
+CONFIGURE_ARGS+=       --with-system-mozilla=firefox
 .include "../../www/firefox-gtk1/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mseamonkey)
-CONFIGURE_ARGS+=       --with-system-mozilla
+CONFIGURE_ARGS+=       --with-system-mozilla=seamonkey
 .include "../../www/seamonkey/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mseamonkey-gtk1)
-CONFIGURE_ARGS+=       --with-system-mozilla
+CONFIGURE_ARGS+=       --with-system-mozilla=seamonkey
 .include "../../www/seamonkey-gtk1/buildlink3.mk"
 .endif
 
diff -r 65d01c8710ea -r d5c308725bdd misc/openoffice2/patches/patch-aa
--- a/misc/openoffice2/patches/patch-aa Sat Oct 06 15:39:21 2007 +0000
+++ b/misc/openoffice2/patches/patch-aa Sat Oct 06 20:02:21 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/03/12 10:21:20 hira Exp $
+$NetBSD: patch-aa,v 1.4 2007/10/06 20:02:22 hira Exp $
 
---- sal/util/sal_netbsd.map.orig       2007-03-10 18:12:29.000000000 +0900
-+++ sal/util/sal_netbsd.map    2007-03-10 18:24:52.000000000 +0900
-@@ -0,0 +1,568 @@
+--- sal/util/sal_netbsd.map.orig       2007-09-27 06:14:49.000000000 +0900
++++ sal/util/sal_netbsd.map    2007-09-27 08:16:30.000000000 +0900
+@@ -0,0 +1,580 @@
 +UDK_3_0_0 {
 +    global:
 +        GetVersionInfo;
@@ -562,6 +562,18 @@
 +              rtl_cache_free;
 +} UDK_3.4;
 +
++UDK_3.6 { # OOo 2.3
++    global:
++        osl_getAsciiFunctionSymbol;
++        osl_getModuleHandle;
++        rtl_uString_intern;
++        rtl_uString_internConvert;



Home | Main Index | Thread Index | Old Index