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

23 files changed, 313 insertions, 373 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index caaca28c578..8c2752e78d4 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -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_binfilter.tar.bz2
 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
 HOMEPAGE=		http://www.openoffice.org/
@@ -27,9 +23,11 @@ BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
 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+=	--with-use-shell=bash
 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 @@ PLIST_SRC+=		${WRKDIR}/.PLIST_SRC
 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 @@ post-build:
 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 @@ do-install:
 
 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 @@ ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .  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 --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 84c73f57ebe..d8f908c2b59 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -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-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
 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 --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 7e0e4edee60..a565551ee4f 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -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+=	${l:S/^lang-//1}
 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 --git a/misc/openoffice2/patches/patch-aa b/misc/openoffice2/patches/patch-aa
index adc5058b2ac..acc2ad4fd6e 100644
--- a/misc/openoffice2/patches/patch-aa
+++ b/misc/openoffice2/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.3 2007/03/12 10:21:20 hira Exp $
 +		rtl_cache_free;
 +} UDK_3.4;
 +
++UDK_3.6 { # OOo 2.3
++    global:
++        osl_getAsciiFunctionSymbol;
++        osl_getModuleHandle;
++        rtl_uString_intern;
++        rtl_uString_internConvert;
++        rtl_ustr_indexOfAscii_WithLength;
++        rtl_ustr_lastIndexOfAscii_WithLength;
++        rtl_uString_iterateCodePoints;
++        rtl_uString_newFromCodePoints;
++} UDK_3.5;
++
 +PRIVATE_1.0 {
 +    global:
 +        osl_detail_ObjectRegistry_storeAddresses;
diff --git a/misc/openoffice2/patches/patch-ad b/misc/openoffice2/patches/patch-ad
index 950a41ff537..64465cadcbf 100644
--- a/misc/openoffice2/patches/patch-ad
+++ b/misc/openoffice2/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2007/03/04 13:11:18 hira Exp $
+$NetBSD: patch-ad,v 1.3 2007/10/06 20:02:22 hira Exp $
 
---- sal/osl/unx/system.c.orig	2007-02-17 23:06:23.000000000 +0900
-+++ sal/osl/unx/system.c	2007-02-17 23:08:46.000000000 +0900
+--- sal/osl/unx/system.c.orig	2007-07-05 18:05:56.000000000 +0900
++++ sal/osl/unx/system.c	2007-09-26 17:14:54.000000000 +0900
 @@ -71,8 +71,11 @@
  struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
  #endif /* BUILD_OS_APPLEOSX */
@@ -21,20 +21,20 @@ $NetBSD: patch-ad,v 1.2 2007/03/04 13:11:18 hira Exp $
 +#endif
  
 -#if defined(NETBSD) || defined(MACOSX)
-+#if defined(NETBSD) && (__NetBSD_Version__ < 299001000) || defined(MACOSX)
++#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined(MACOSX)
  int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
             size_t buflen, struct passwd **result)
  {
-@@ -437,7 +441,7 @@
+@@ -432,7 +436,7 @@
  }
- #endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
+ #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
 -#if defined(MACOSX)
 +#if defined(MACOSX) || defined(NETBSD)
  /*
   * This section works around calls that are missing or broken
   * in MacOS X 10.1.x and earlier.
-@@ -481,6 +485,10 @@
+@@ -476,6 +480,10 @@
      return nRet;
  }
  
diff --git a/misc/openoffice2/patches/patch-ae b/misc/openoffice2/patches/patch-ae
index 65d08dd9253..b9191877171 100644
--- a/misc/openoffice2/patches/patch-ae
+++ b/misc/openoffice2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2007/03/04 13:11:18 hira Exp $
+$NetBSD: patch-ae,v 1.3 2007/10/06 20:02:22 hira Exp $
 
---- sal/util/makefile.mk.orig	2007-02-17 17:25:20.000000000 +0900
-+++ sal/util/makefile.mk	2007-02-17 17:26:16.000000000 +0900
-@@ -97,7 +97,11 @@
+--- sal/util/makefile.mk.orig	2007-08-18 02:47:11.000000000 +0900
++++ sal/util/makefile.mk	2007-09-26 17:19:33.000000000 +0900
+@@ -100,7 +100,11 @@
  .ENDIF
  SHL1IMPLIB= i$(TARGET)
  
@@ -14,4 +14,4 @@ $NetBSD: patch-ae,v 1.2 2007/03/04 13:11:18 hira Exp $
 +.ENDIF
  
  .IF "$(GUI)"=="WNT"
- .IF "$(COM)"!="GCC"
+ UWINAPILIB=     $(LB)$/uwinapi.lib
diff --git a/misc/openoffice2/patches/patch-ah b/misc/openoffice2/patches/patch-ah
index e8ceabb278e..7058817e1fc 100644
--- a/misc/openoffice2/patches/patch-ah
+++ b/misc/openoffice2/patches/patch-ah
@@ -1,94 +1,94 @@
-$NetBSD: patch-ah,v 1.3 2007/04/05 23:24:01 hira Exp $
+$NetBSD: patch-ah,v 1.4 2007/10/06 20:02:22 hira Exp $
 
---- solenv/inc/_tg_app.mk.orig	2007-01-19 21:53:03.000000000 +0900
-+++ solenv/inc/_tg_app.mk	2007-04-01 21:51:19.000000000 +0900
-@@ -87,7 +87,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
+--- solenv/inc/_tg_app.mk.orig	2007-06-27 23:01:57.000000000 +0900
++++ solenv/inc/_tg_app.mk	2007-09-26 19:50:23.000000000 +0900
+@@ -94,7 +94,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
  	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
 -	@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
 +	@cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
  	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_1.cmd
-@@ -256,7 +256,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+@@ -292,7 +292,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
  	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
 -	@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
 +	@cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
  	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_2.cmd
-@@ -425,7 +425,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+@@ -490,7 +490,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
  	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
 -	@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
 +	@cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
  	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_3.cmd
-@@ -594,7 +594,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+@@ -688,7 +688,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
  	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
 -	@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
 +	@cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
  	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_4.cmd
-@@ -763,7 +763,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+@@ -886,7 +886,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
  	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
 -	@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
 +	@cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
  	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_5.cmd
-@@ -932,7 +932,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+@@ -1084,7 +1084,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
  	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
 -	@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
 +	@cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
  	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_6.cmd
-@@ -1101,7 +1101,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+@@ -1282,7 +1282,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
  	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
 -	@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
 +	@cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
  	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_7.cmd
-@@ -1270,7 +1270,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+@@ -1480,7 +1480,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
  	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_8.cmd
 -	@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
 +	@cat $(mktmp /dev/null $(APP8LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
  	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_8.cmd
-@@ -1439,7 +1439,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+@@ -1678,7 +1678,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
  	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_9.cmd
 -	@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
 +	@cat $(mktmp /dev/null $(APP9LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
  	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_9.cmd
-@@ -1608,7 +1608,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+@@ -1876,7 +1876,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
  	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_10.cmd
 -	@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
 +	@cat $(mktmp /dev/null $(APP10LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
  	@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
diff --git a/misc/openoffice2/patches/patch-ai b/misc/openoffice2/patches/patch-ai
index cb2c905dafb..e97275a976d 100644
--- a/misc/openoffice2/patches/patch-ai
+++ b/misc/openoffice2/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.3 2007/04/05 23:24:01 hira Exp $
+$NetBSD: patch-ai,v 1.4 2007/10/06 20:02:22 hira Exp $
 
---- solenv/inc/tg_app.mk.orig	2007-01-19 21:53:59.000000000 +0900
-+++ solenv/inc/tg_app.mk	2007-04-01 21:35:49.000000000 +0900
-@@ -124,7 +124,7 @@
- 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+--- solenv/inc/tg_app.mk.orig	2007-07-02 18:23:33.000000000 +0900
++++ solenv/inc/tg_app.mk	2007-09-26 17:53:57.000000000 +0900
+@@ -131,7 +131,7 @@
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
  	@echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
  	$(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
 -	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
 +	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
  	@echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
  	cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- 	@source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
diff --git a/misc/openoffice2/patches/patch-aj b/misc/openoffice2/patches/patch-aj
index 920be58e79c..7955b069995 100644
--- a/misc/openoffice2/patches/patch-aj
+++ b/misc/openoffice2/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.3 2007/04/21 05:40:27 hira Exp $
+$NetBSD: patch-aj,v 1.4 2007/10/06 20:02:22 hira Exp $
 
---- solenv/inc/unxbsdi2.mk.orig	2006-07-06 07:00:41.000000000 +0900
-+++ solenv/inc/unxbsdi2.mk	2007-04-21 03:20:50.000000000 +0900
+--- solenv/inc/unxbsdi2.mk.orig	2007-03-09 18:07:33.000000000 +0900
++++ solenv/inc/unxbsdi2.mk	2007-09-26 19:56:27.000000000 +0900
 @@ -37,7 +37,7 @@
  ASM=
  AFLAGS=
@@ -20,7 +20,7 @@ $NetBSD: patch-aj,v 1.3 2007/04/21 05:40:27 hira Exp $
  
  # this is a platform with JAVA support
  .IF "$(SOLAR_JAVA)"!=""
-@@ -123,7 +123,8 @@
+@@ -119,7 +119,8 @@
  DYNAMIC		= -Wl,-Bdynamic
  
  # name of linker
@@ -30,7 +30,7 @@ $NetBSD: patch-aj,v 1.3 2007/04/21 05:40:27 hira Exp $
  
  # default linker flags
  LINKFLAGSDEFS*=-z defs
-@@ -141,7 +142,7 @@
+@@ -137,7 +138,7 @@
  LINKFLAGSTACK=
  LINKFLAGSPROF=
  LINKFLAGSDEBUG=-g
@@ -39,30 +39,22 @@ $NetBSD: patch-aj,v 1.3 2007/04/21 05:40:27 hira Exp $
  
  # linker flags for optimization (symbol hashtable)
  # for now, applied to symbol scoped libraries, only
-@@ -159,17 +160,18 @@
+@@ -155,13 +156,14 @@
  STDSLOGUI=
  STDOBJCUI=
  STDSLOCUI=
 +STDOBJVCL=$(L)$/salmain.o
  
  # libraries for linking applications
--STDLIBCUIST=-lm
 -STDLIBGUIMT=-lX11 -lpthread -lm
 -STDLIBCUIMT=-lpthread -lm
--STDLIBGUIST=-lX11 -lm
-+STDLIBCUIST=-lm -lc
 +STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc
 +STDLIBCUIMT=-lpthread -lm -lc
-+STDLIBGUIST=${X11_LDFLAGS} -lX11 -lm -lc
  # libraries for linking shared libraries
 -STDSHLGUIMT=-lX11 -lXext -lpthread -lm
 -STDSHLCUIMT=-lpthread -lm
--STDSHLGUIST=-lX11 -lXext -lm
--STDSHLCUIST=-lm
 +STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc
 +STDSHLCUIMT=-lpthread -lm -lc
-+STDSHLGUIST=${X11_LDFLAGS} -lX11 -lXext -lm -lc
-+STDSHLCUIST=-lm -lc
  
  LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
  
diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak
index 8d75d713a41..bfd77ec0137 100644
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@@ -1,16 +1,25 @@
-$NetBSD: patch-ak,v 1.4 2007/04/21 05:40:27 hira Exp $
+$NetBSD: patch-ak,v 1.5 2007/10/06 20:02:22 hira Exp $
 
---- config_office/set_soenv.in.orig	2007-01-19 21:55:33.000000000 +0900
-+++ config_office/set_soenv.in	2007-04-21 03:17:35.000000000 +0900
+--- config_office/set_soenv.in.orig	2007-08-03 22:09:48.000000000 +0900
++++ config_office/set_soenv.in	2007-10-06 13:09:26.000000000 +0900
 @@ -39,7 +39,7 @@
  #--------------------------------------------------------
  #
- my ( $outfile, $outfile_sh, $outfile_bat, $outfile_jam, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, 
--     $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, $platform,
-+     $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, $platform,
+ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, 
+-     $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, $USE_MINGW, $platform,
++     $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, $USE_MINGW, $platform,
       $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, 
-      $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $unsetvarsjam, $exportvars, $win_format_var, $perl_os);
+      $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
  #
+@@ -86,7 +86,7 @@
+      $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
+      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
+ 	 $PROEXT,
+-     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA);
++     $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA);
+ #
+ #-------------------------------------------
+ # IId. Declaring the aliases.
 @@ -111,6 +111,7 @@
  $par_dir        = "..";             # parrent directory
  $I              = " -I";            # include search path
@@ -36,7 +45,7 @@ $NetBSD: patch-ak,v 1.4 2007/04/21 05:40:27 hira Exp $
     # General NetBSD settings:
        $BIG_SVX        = "TRUE";
        $COM            = "GCC";
-@@ -1253,7 +1260,8 @@
+@@ -1243,7 +1250,8 @@
                          $L.$JRETOOLKITDIR.
                          $L.$JRETHREADDIR.
                          $L_STLPORT_LIB.
@@ -46,7 +55,15 @@ $NetBSD: patch-ak,v 1.4 2007/04/21 05:40:27 hira Exp $
  }
  elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
  {  $SOLARLIB          = $L.$par_dir.$LIB.
-@@ -1531,6 +1539,8 @@
+@@ -1400,6 +1408,7 @@
+ 
+ if ($SYSTEM_PYTHON eq "NO")
+ {
++	$PYTHON               = python
+ 	$PYTHONPATH           = '.'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'pyuno'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'bin'.$ds.'pyuno';
+ 	$PYTHONHOME           = '$SOLARVER'.$ds.'$INPATH';
+ }
+@@ -1539,6 +1548,8 @@
  ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
  }
  ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
@@ -55,3 +72,11 @@ $NetBSD: patch-ak,v 1.4 2007/04/21 05:40:27 hira Exp $
  ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
  ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
  ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
+@@ -1785,6 +1796,7 @@
+ ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
+ ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
+ ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
++ToFile( "PYTHON",            "@PYTHON@",           "e" );
+ ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
+ ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
+ ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
diff --git a/misc/openoffice2/patches/patch-ap b/misc/openoffice2/patches/patch-ap
index 3141a543bf5..7c92fd6f386 100644
--- a/misc/openoffice2/patches/patch-ap
+++ b/misc/openoffice2/patches/patch-ap
@@ -1,22 +1,21 @@
-$NetBSD: patch-ap,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-ap,v 1.3 2007/10/06 20:02:22 hira Exp $
 
---- stlport/STLport-4.5.patch.orig	2006-12-02 02:57:09.000000000 +0900
-+++ stlport/STLport-4.5.patch	2007-02-17 23:38:22.000000000 +0900
-@@ -847,6 +847,82 @@
- ! # if defined (__sun)
-   # define _STLP_MUTEX_INITIALIZER
-   # endif
-+
-+*** misc/STLport-4.5/src/gcc-3.0-netbsd.mak    Thu Oct 16 10:00:50 2003
-+--- misc/build/STLport-4.5/src/gcc-3.0-netbsd.mak      Thu Oct 16 09:49:57 2003
+--- stlport/STLport-4.5.patch.orig	2007-09-27 00:35:49.000000000 +0900
++++ stlport/STLport-4.5.patch	2007-09-27 01:38:51.000000000 +0900
+@@ -1068,3 +1068,77 @@
+   #ifndef _STLP_CMATH
+   #include <cmath>
+   #endif
++*** misc/STLport-4.5/src/gcc-3.0-netbsd.mak	Wed Sep 26 22:26:07 2007
++--- misc/build/STLport-4.5/src/gcc-3.0-netbsd.mak	Wed Sep 26 22:23:39 2007
 +***************
 +*** 1 ****
 +! dummy
-+--- 1,69 ----
++--- 1,68 ----
 +! #
 +! # Note : this makefile is for gcc-3 !
 +! #
-+!
++! 
 +! #
 +! # compiler
 +! #
@@ -27,14 +26,14 @@ $NetBSD: patch-ap,v 1.2 2007/03/04 13:11:19 hira Exp $
 +! # Basename for libraries
 +! #
 +! LIB_BASENAME = libstlport_gcc
-+!
++! 
 +! #
 +! # guts for common stuff
 +! #
 +! #
 +! LINK=ar cr
 +! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -fexceptions -shared -o
-+!
++! 
 +! OBJEXT=o
 +! DYNEXT=so
 +! STEXT=a
@@ -43,45 +42,41 @@ $NetBSD: patch-ap,v 1.2 2007/03/04 13:11:19 hira Exp $
 +! MKDIR=mkdir -p
 +! COMP=GCC$(ARCH)
 +! INSTALL_STEP = install_unix
-+!
++! 
 +! all:  all_dynamic all_static symbolic_links
-+!
++! 
 +! include common_macros.mak
-+!
++! 
 +! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+!
++! 
 +! CXXFLAGS_COMMON =  -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} $(CXXFLAGS)
 +! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+!
++! 
 +! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
 +! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+!
++! 
 +! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
 +! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+!
++! 
 +! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
 +! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+!
++! 
 +! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
 +! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+!
++! 
 +! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
 +! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+!
++! 
 +! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
 +! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+!
++! 
 +! include common_percent_rules.mak
 +! include common_rules.mak
-+!
-+!
++! 
++! 
 +! #install: all
 +! #    cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+!
++! 
 +! #%.s: %.cpp
 +! #    $(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+!
-+!
-   
- *** misc/build/STLport-4.5/stlport/stl/_rope.h	Mon Aug  6 04:21:25 2001
- --- misc/modified/STLport-4.5/stlport/stl/_rope.h	Thu Jul 27 15:19:10 2006
++! 
diff --git a/misc/openoffice2/patches/patch-aq b/misc/openoffice2/patches/patch-aq
index 9458d440199..b2d3528d6d7 100644
--- a/misc/openoffice2/patches/patch-aq
+++ b/misc/openoffice2/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-aq,v 1.3 2007/10/06 20:02:22 hira Exp $
 
---- stlport/makefile.mk.orig	2006-12-02 02:57:09.000000000 +0900
-+++ stlport/makefile.mk	2007-02-17 17:51:36.000000000 +0900
+--- stlport/makefile.mk.orig	2007-07-31 22:10:28.000000000 +0900
++++ stlport/makefile.mk	2007-09-27 00:26:24.000000000 +0900
 @@ -111,7 +111,7 @@
  TAR_EXCLUDES=*/SC5/*
  .ENDIF          # "$(USE_SHELL)"=="4nt"
  
--ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak
-+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/gcc-3.0-netbsd.mak
+-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
++ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/gcc-3.0-netbsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
  
  
  CONFIGURE_ACTION=none
@@ -19,11 +19,4 @@ $NetBSD: patch-aq,v 1.2 2007/03/04 13:11:19 hira Exp $
 +			BUILD_FLAGS=-f gcc-3.0-netbsd.mak
  		.ELIF "$(OS)"=="MACOSX"
  			BUILD_FLAGS=-f gcc-3.0-macosx.mak
- 		.ELSE
-@@ -238,4 +240,4 @@
- $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
- .ENDIF			# "$(USE_NEW_SDK)"!=""
- .ENDIF			# COMVER<=001300000000
--.ENDIF          # "$(GUI)"=="WNT"
-\ No newline at end of file
-+.ENDIF          # "$(GUI)"=="WNT"
+ 		.ELIF "$(GUI)"=="WNT"
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index 0af1a8f3568..388a56edc07 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.6 2007/04/20 14:44:11 hira Exp $
+$NetBSD: patch-ba,v 1.7 2007/10/06 20:02:22 hira Exp $
 
---- config_office/configure.orig	2007-01-19 22:01:19.000000000 +0900
-+++ config_office/configure	2007-04-20 06:56:17.000000000 +0900
-@@ -2975,11 +2975,11 @@
+--- config_office/configure.orig	2007-08-24 21:31:18.000000000 +0900
++++ config_office/configure	2007-09-27 10:52:53.000000000 +0900
+@@ -3010,11 +3010,11 @@
  		test_cups=no
  		_os=OSF1
  		;;
@@ -16,7 +16,7 @@ $NetBSD: patch-ba,v 1.6 2007/04/20 14:44:11 hira Exp $
  		PTHREAD_CFLAGS="-pthread"
  		PTHREAD_LIBS="-pthread -lpthread"
  		_os=NetBSD
-@@ -8261,7 +8261,7 @@
+@@ -9544,7 +9544,7 @@
           echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
           echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
           echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
@@ -25,7 +25,41 @@ $NetBSD: patch-ba,v 1.6 2007/04/20 14:44:11 hira Exp $
               echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
           fi
        fi
-@@ -21383,7 +21383,7 @@
+@@ -12477,7 +12477,7 @@
+ if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
+    test "$with_system_libxslt" != "no"; then
+     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
+-      test "$with_system_libxml" == "no"; then
++      test "$with_system_libxml" = "no"; then
+       # somehow AC_MSG_WARN won't work...
+        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
+        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
+@@ -12487,7 +12487,7 @@
+ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
+    test "$with_system_libxml" != "no"; then
+     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
+-      test "$with_system_libxslt" == "no"; then
++      test "$with_system_libxslt" = "no"; then
+       # somehow AC_MSG_WARN won't work...
+        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
+        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
+@@ -12970,13 +12970,13 @@
+ 
+ 
+    python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
++   python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"`
+    python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
+    PYTHON_CFLAGS="-I$python_include"
+-
+    if test "$_os" = "Darwin"; then
+       PYTHON_LIBS="-framework Python"
+    else
+-      PYTHON_LIBS="-lpython$python_version"
++      PYTHON_LIBS="-lpython$python_version $python_ldflags"
+    fi
+ 
+       save_CPPFLAGS="$CPPFLAGS"
+@@ -22818,7 +22818,7 @@
      fi
  
          KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/misc/openoffice2/patches/patch-be b/misc/openoffice2/patches/patch-be
deleted file mode 100644
index 395e7f1d764..00000000000
--- a/misc/openoffice2/patches/patch-be
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-be,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- python/Python-2.3.4.patch.orig	2007-02-23 02:52:48.000000000 +0900
-+++ python/Python-2.3.4.patch	2007-02-23 03:03:12.000000000 +0900
-@@ -1,5 +1,5 @@
--*** misc/Python-2.3.4/Makefile.pre.in	Tue Nov 18 20:54:00 2003
----- misc/build/Python-2.3.4/Makefile.pre.in	Thu Jun 29 11:02:18 2006
-+*** misc/Python-2.3.4/Makefile.pre.in	Wed Nov 19 04:54:00 2003
-+--- misc/build/Python-2.3.4/Makefile.pre.in	Fri Feb 23 02:56:31 2007
- ***************
- *** 114,123 ****
-   RUNSHARED=       @RUNSHARED@
-@@ -65,6 +65,23 @@
-   
-   # Install the manual page
-   maninstall:
-+***************
-+*** 729,735 ****
-+  	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
-+  	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
-+  	export EXE; EXE="$(BUILDEXE)"; \
-+! 	cd $(srcdir)/Lib/$(PLATDIR); ./regen
-+  
-+  # Install the include files
-+  INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-+--- 735,741 ----
-+  	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
-+  	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
-+  	export EXE; EXE="$(BUILDEXE)"; \
-+! 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-+  
-+  # Install the include files
-+  INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
- *** misc/Python-2.3.4/configure	Fri May  7 21:13:40 2004
- --- misc/build/Python-2.3.4/configure	Thu Jun 29 11:02:18 2006
- ***************
diff --git a/misc/openoffice2/patches/patch-bh b/misc/openoffice2/patches/patch-bh
index 2c45c487b1b..81c10cf1418 100644
--- a/misc/openoffice2/patches/patch-bh
+++ b/misc/openoffice2/patches/patch-bh
@@ -1,10 +1,10 @@
-$NetBSD: patch-bh,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-bh,v 1.3 2007/10/06 20:02:23 hira Exp $
 
---- psprint/util/makefile.mk.orig	2007-02-23 18:34:44.000000000 +0900
-+++ psprint/util/makefile.mk	2007-02-23 18:35:16.000000000 +0900
-@@ -77,6 +77,7 @@
- 			$(I18NISOLANGLIB) 	\
- 			$(TOOLSLIB) 		\
+--- psprint/util/makefile.mk.orig	2007-06-27 22:51:57.000000000 +0900
++++ psprint/util/makefile.mk	2007-09-26 17:42:01.000000000 +0900
+@@ -75,6 +75,7 @@
+             $(COMPHELPERLIB)    \
+             $(CPPULIB)          \
  			$(SALLIB)			\
 +			$(X11_LDFLAGS)			\
  			-lX11
diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq
index ffb04875135..c2d3af6baa3 100644
--- a/misc/openoffice2/patches/patch-bq
+++ b/misc/openoffice2/patches/patch-bq
@@ -1,7 +1,7 @@
-$NetBSD: patch-bq,v 1.3 2007/04/05 23:24:01 hira Exp $
+$NetBSD: patch-bq,v 1.4 2007/10/06 20:02:23 hira Exp $
 
---- instsetoo_native/util/makefile.mk.orig	2007-03-01 20:46:53.000000000 +0900
-+++ instsetoo_native/util/makefile.mk	2007-04-01 21:59:49.000000000 +0900
+--- instsetoo_native/util/makefile.mk.orig	2007-08-03 20:23:21.000000000 +0900
++++ instsetoo_native/util/makefile.mk	2007-09-26 17:40:48.000000000 +0900
 @@ -61,6 +61,9 @@
  ENABLE_DOWNLOADSETS=TRUE
  .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
@@ -12,10 +12,10 @@ $NetBSD: patch-bq,v 1.3 2007/04/05 23:24:01 hira Exp $
  .EXPORT: ENABLE_DOWNLOADSETS
  .EXPORT: LAST_MINOR
  .EXPORT: PRJ
-@@ -410,11 +413,11 @@
- 	+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
- 	+-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
- 	+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+@@ -511,11 +514,11 @@
+ 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+ 	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
+ 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
 -	$(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
 -	$(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
 -	$(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
@@ -26,6 +26,6 @@ $NetBSD: patch-bq,v 1.3 2007/04/05 23:24:01 hira Exp $
 +	$(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
 +	$(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
 +	$(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
- 	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
- 	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- 	+$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+ 	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+ 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
diff --git a/misc/openoffice2/patches/patch-bu b/misc/openoffice2/patches/patch-bu
deleted file mode 100644
index b25dc4fba67..00000000000
--- a/misc/openoffice2/patches/patch-bu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bu,v 1.2 2007/03/04 13:11:20 hira Exp $
-
---- epm/makefile.mk.orig	2007-02-28 09:29:28.000000000 +0900
-+++ epm/makefile.mk	2007-02-28 20:00:46.000000000 +0900
-@@ -49,7 +49,7 @@
- 
- .IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO"
- 
--CONFIGURE_ACTION=.$/configure
-+CONFIGURE_ACTION=.$/configure --disable-fltk
- BUILD_ACTION=make
- OUT2BIN=epm epminstall mkepmlist
- 
diff --git a/misc/openoffice2/patches/patch-bx b/misc/openoffice2/patches/patch-bx
index 6f8f80efb93..91af6cb3206 100644
--- a/misc/openoffice2/patches/patch-bx
+++ b/misc/openoffice2/patches/patch-bx
@@ -1,12 +1,14 @@
-$NetBSD: patch-bx,v 1.1 2007/03/19 16:51:15 hira Exp $
+$NetBSD: patch-bx,v 1.2 2007/10/06 20:02:23 hira Exp $
 
---- filter/source/config/fragments/makefile.mk.orig	2007-03-19 22:39:17.000000000 +0900
-+++ filter/source/config/fragments/makefile.mk	2007-03-19 22:40:40.000000000 +0900
-@@ -154,6 +154,7 @@
+--- filter/source/config/fragments/makefile.mk.orig	2007-05-10 22:13:05.000000000 +0900
++++ filter/source/config/fragments/makefile.mk	2007-10-06 13:06:37.000000000 +0900
+@@ -153,7 +153,8 @@
+ 
  .IF "$(SOLAR_JAVA)"==""
  #cmc, hack to workaround the java build requirement
- MERGE:=python ../tools/merge/pyAltFCFGMerge
+-MERGE:=python ../tools/merge/pyAltFCFGMerge
++MERGE:=$(PYTHON) ../tools/merge/pyAltFCFGMerge
 +PACKLANG:=$(PERL) langfilter.pl
  .ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
- XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
+ .ENDIF
diff --git a/misc/openoffice2/patches/patch-ch b/misc/openoffice2/patches/patch-ch
index e76dc1d80c1..4aac2150ae1 100644
--- a/misc/openoffice2/patches/patch-ch
+++ b/misc/openoffice2/patches/patch-ch
@@ -1,8 +1,8 @@
-$NetBSD: patch-ch,v 1.2 2007/04/21 05:40:27 hira Exp $
+$NetBSD: patch-ch,v 1.3 2007/10/06 20:02:23 hira Exp $
 
---- solenv/inc/unxbsdi3.mk.orig	2007-04-21 03:03:25.000000000 +0900
-+++ solenv/inc/unxbsdi3.mk	2007-04-21 03:21:29.000000000 +0900
-@@ -0,0 +1,179 @@
+--- solenv/inc/unxbsdi3.mk.orig	2007-10-05 10:11:25.000000000 +0900
++++ solenv/inc/unxbsdi3.mk	2007-10-05 10:14:03.000000000 +0900
+@@ -0,0 +1,178 @@
 +#
 +# mk file for NetBSD/i386 with gcc 3.4.x and higher.
 +#
@@ -46,6 +46,13 @@ $NetBSD: patch-ch,v 1.2 2007/04/21 05:40:27 hira Exp $
 +# flags for C and C++ Compiler
 +CFLAGS+=-fmessage-length=0 -c
 +
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
++.ELSE  # "$(PRODUCT)"!=""
++CFLAGSOPT=                                     # no optimizing for non products
++.ENDIF # "$(PRODUCT)"!=""
++
 +# flags to enable build with symbols; required for crashdump feature
 +.IF "$(ENABLE_SYMBOLS)"=="SMALL"
 +CFLAGSENABLESYMBOLS=-g1
@@ -66,10 +73,6 @@ $NetBSD: patch-ch,v 1.2 2007/04/21 05:40:27 hira Exp $
 +CFLAGSCXX += -fvisibility-inlines-hidden
 +.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 +
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
 +# Compiler flags for compiling static object in multi threaded environment with graphical user interface
 +CFLAGSOBJGUIMT=
 +# Compiler flags for compiling static object in multi threaded environment with character user interface
@@ -144,15 +147,11 @@ $NetBSD: patch-ch,v 1.2 2007/04/21 05:40:27 hira Exp $
 +STDOBJVCL=$(L)$/salmain.o
 +
 +# libraries for linking applications
-+STDLIBCUIST=-lm -lc -lgcc_s -lstdc++
 +STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc -lgcc_s -lstdc++
 +STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+STDLIBGUIST=${X11_LDFLAGS} -lX11 -lm -lc -lgcc_s -lstdc++
 +# libraries for linking shared libraries
 +STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
 +STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+STDSHLGUIST=${X11_LDFLAGS} -lX11 -lXext -lm -lc -lgcc_s -lstdc++
-+STDSHLCUIST=-lm -lc -lgcc_s -lstdc++
 +
 +LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 +
diff --git a/misc/openoffice2/patches/patch-cj b/misc/openoffice2/patches/patch-cj
index 62c8352d5b8..1162f13ab01 100644
--- a/misc/openoffice2/patches/patch-cj
+++ b/misc/openoffice2/patches/patch-cj
@@ -1,7 +1,7 @@
-$NetBSD: patch-cj,v 1.1 2007/04/05 23:26:14 hira Exp $
+$NetBSD: patch-cj,v 1.2 2007/10/06 20:02:23 hira Exp $
 
---- tools/inc/inetdef.hxx.orig	2006-07-19 18:27:54.000000000 +0900
-+++ tools/inc/inetdef.hxx	2007-04-06 08:11:38.000000000 +0900
+--- tools/inc/tools/inetdef.hxx.orig	2007-09-26 17:35:00.000000000 +0900
++++ tools/inc/tools/inetdef.hxx	2007-09-26 17:36:01.000000000 +0900
 @@ -51,11 +51,11 @@
  #elif defined SCO
  #define TOOLS_INETDEF_OS "SCO"
diff --git a/misc/openoffice2/patches/patch-co b/misc/openoffice2/patches/patch-co
deleted file mode 100644
index c1ce51857e5..00000000000
--- a/misc/openoffice2/patches/patch-co
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-co,v 1.2 2007/10/04 12:16:26 abs Exp $
-
-NOTE: This patch fixes CVE-2007-2834.  It's already fixed in OOo 2.3.0.
-
---- goodies/source/filter.vcl/itiff/itiff.cxx.orig	2006-11-14 16:17:15.000000000 +0000
-+++ goodies/source/filter.vcl/itiff/itiff.cxx
-@@ -132,7 +132,7 @@ private:
- 	double	ReadDoubleData();
- 
- 	void	ReadHeader();
--	void	ReadTagData( USHORT nTagType, ULONG nDataLen );
-+	void	ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
- 
- 	BOOL	ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
- 		// Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
-@@ -290,7 +290,7 @@ double TIFFReader::ReadDoubleData()
- 
- // ---------------------------------------------------------------------------------
- 
--void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
-+void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
- {
- 	if ( bStatus == FALSE )
- 		return;
-@@ -353,16 +353,25 @@ void TIFFReader::ReadTagData( USHORT nTa
- 		case 0x0111: { // Strip Offset(s)
- 			ULONG nOldNumSO, i, * pOldSO;
- 			pOldSO = pStripOffsets;
--			if ( pOldSO == NULL ) nNumStripOffsets = 0;	// Sicherheitshalber
-+			if ( pOldSO == NULL )
-+				nNumStripOffsets = 0;
- 			nOldNumSO = nNumStripOffsets;
--			nNumStripOffsets += nDataLen;
--			pStripOffsets = new ULONG[ nNumStripOffsets ];
--			for ( i = 0; i < nOldNumSO; i++ )
--				pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
--			for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
--				pStripOffsets[ i ] = ReadIntData() + nOrigPos;
--			if ( pOldSO != NULL )
-+			nDataLen += nOldNumSO;
-+			if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
-+			{
-+				nNumStripOffsets = nDataLen;
-+				pStripOffsets = new ULONG[ nNumStripOffsets ];
-+				if ( !pStripOffsets )
-+					nNumStripOffsets = 0;
-+				else
-+				{
-+					for ( i = 0; i < nOldNumSO; i++ )
-+						pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
-+					for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
-+						pStripOffsets[ i ] = ReadIntData() + nOrigPos;
-+				}
- 				delete[] pOldSO;
-+			}
- 			OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
- 			break;
- 		}
-@@ -384,16 +393,25 @@ void TIFFReader::ReadTagData( USHORT nTa
- 		case 0x0117: { // Strip Byte Counts
- 			ULONG nOldNumSBC, i, * pOldSBC;
- 			pOldSBC = pStripByteCounts;
--			if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
-+			if ( pOldSBC == NULL )
-+				nNumStripByteCounts = 0; // Sicherheitshalber
- 			nOldNumSBC = nNumStripByteCounts;
--			nNumStripByteCounts += nDataLen;
--			pStripByteCounts = new ULONG[ nNumStripByteCounts ];
--			for ( i = 0; i < nOldNumSBC; i++ )
--				pStripByteCounts[ i ] = pOldSBC[ i ];
--			for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
--				pStripByteCounts[ i ] = ReadIntData();
--			if ( pOldSBC != NULL )
-+			nDataLen += nOldNumSBC;
-+			if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
-+			{		
-+				nNumStripByteCounts = nDataLen;
-+				pStripByteCounts = new ULONG[ nNumStripByteCounts ];
-+				if ( !nNumStripByteCounts )
-+					nNumStripByteCounts = 0;
-+				else
-+				{
-+					for ( i = 0; i < nOldNumSBC; i++ )
-+						pStripByteCounts[ i ] = pOldSBC[ i ];
-+					for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
-+						pStripByteCounts[ i ] = ReadIntData();
-+				}
- 				delete[] pOldSBC;
-+			}
- 			OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
- 			break;
- 		}
diff --git a/misc/openoffice2/patches/patch-cp b/misc/openoffice2/patches/patch-cp
new file mode 100644
index 00000000000..067e2c38f9f
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cp
@@ -0,0 +1,12 @@
+$NetBSD: patch-cp,v 1.1 2007/10/06 20:02:24 hira Exp $
+
+--- pyuno/source/module/makefile.mk.orig	2007-09-27 01:51:03.000000000 +0900
++++ pyuno/source/module/makefile.mk	2007-09-27 01:52:52.000000000 +0900
+@@ -91,6 +91,7 @@
+ 		$(CPPULIB)		\
+ 		$(CPPUHELPERLIB)	\
+ 		$(SALLIB)		\
++		$(PYTHON_LIBS)		\
+ 		$(PYTHONLIB)
+ 
+ SHL1DEPN=
diff --git a/misc/openoffice2/patches/patch-cq b/misc/openoffice2/patches/patch-cq
new file mode 100644
index 00000000000..4847fd93371
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cq
@@ -0,0 +1,13 @@
+$NetBSD: patch-cq,v 1.1 2007/10/06 20:02:24 hira Exp $
+
+--- bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk.orig	2007-10-06 03:53:00.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk	2007-10-06 03:53:08.000000000 +0900
+@@ -46,7 +46,7 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
+-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
++.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3"
+ 
+ .IF "$(cppu_no_leak)" == ""
+ CFLAGS += -DLEAK_STATIC_DATA