Update to 2.2.0. OK'd by wiz@ for update during freeze.

Release Notes:
 http://development.openoffice.org/releases/2.2.0.html

Changes:
 - Fix CVE-2007-0002, CVE-2007-0238, CVE-2007-0239.
 - field lengths of bibliography database changed.
 - UTF-8 encoding for dBase databases.
 - "Edit in SQL View..." command for database queries.
 - forms: date and time fields do not default to "Today" and "Now" anymore.
 - query/relation design: visual marker indicating the type of table/query.
 - advanced database setting: "Use keyword AS before table alias names".
 - Annoying focus behavior of OOo was fixed.
 - scaling in spadmin page property page deleted.
 - Additional options for pdf export.
 - Desktop-Integration package for slackware.
 - Show/Hide Slide menu entry split into two entries.
 - Support for NetBSD, Linux 64 bit, Linux SPARC in TestTool Environment.
 - New behavior of "Insert - Sheet From File".
 - Import MS Excel files with PivotTables based on external data.
 - Insert/Delete Note in cell context menu.
 - some UNO Remote Protocol (URP) changes.
 - Extension Dependency OpenOffice.org-minimal-version.
 - Export COT, ACOT, COTH, and ACOTH to MS Excel files.
 - System integration for extensions.
 - Online Update for Extensions.
 - Localization of UNO Dialogs.
 - OOo no longer generates sensitive UUIDs.
 - Autokerning enabled by default.
 - CVS import dialog for unformatted clipboard text.
 - Ordinal suffix in AutoFill.
 - simple protocolhandler add-on support in uno-skeletonmaker.
 - Autokerning enabled by default.
 - Create Tango icon set for OO.o.
 - Add localisation support to UNO dialogs and IDE Dialog Editor.
 - extend add-on support in the uno-skeletonmaker.
 - Upgrade icu to latest version.
 - Implement an optional help section in the ObjectInspector.
 - additional PDF export features
 - makes localize.sdf files optional.
 - Add/update Slovenian templates for 2.1.
 - update of icons.
 - changes for soffice script.
 - implement shaped system windows.
 - Updates of OOo <-> ATK bridge.
 - #139464# use #REF! errors in formulas using cells from missing
   external linked sheets.
 - Tooling fixes for CWS and MWS handling.
 - Remove SISSL from module filter.
 - make the 'automatic update check' more consistent.
 - code only cws, adds infrastructure for vba interop project.
 - Prepare framework code to support inplace active objects that are
   not UIactive.
 - Some bugs, some very minor UNO runtime features.
 - Changed context menu (insert/delete note) for Calc cells.
 - new buildsystem features.
 - Improve line height compatibility on UNX platforms while keeping
   the layout backwards compatible.
 - Preparing installation of extensions in installation sets.
 - osl[in|de]crementInterlockedCount(): don't use "lock" prefix on
   single processor, single core, non HT machines.
 - Clean up obsolete files in binfilter.
 - Bug fixes.

17 files changed, 142 insertions, 438 deletions

diff --git a/misc/openoffice2/patches/patch-ah b/misc/openoffice2/patches/patch-ah
index 11bab537a19..e8ceabb278e 100644
--- a/misc/openoffice2/patches/patch-ah
+++ b/misc/openoffice2/patches/patch-ah
@@ -1,94 +1,94 @@
-$NetBSD: patch-ah,v 1.2 2007/03/04 13:11:18 hira Exp $
+$NetBSD: patch-ah,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- solenv/inc/_tg_app.mk.orig	2007-02-17 17:28:18.000000000 +0900
-+++ solenv/inc/_tg_app.mk	2007-02-17 17:35:58.000000000 +0900
+--- 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)$/$(@:b).cmd
+ 	@+-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
  	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -255,7 +255,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -423,7 +423,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -591,7 +591,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -759,7 +759,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -927,7 +927,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -1095,7 +1095,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -1263,7 +1263,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP8LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -1431,7 +1431,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP9LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
-@@ -1599,7 +1599,7 @@
- 	@+-$(RM) $(MISC)$/$(@:b).cmd
+ 	$(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
  	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- 	$(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+	@cat $(mktmp /dev/null $(APP10LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
- 	@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
+ 	$(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
diff --git a/misc/openoffice2/patches/patch-ai b/misc/openoffice2/patches/patch-ai
index 9fee2f5812b..cb2c905dafb 100644
--- a/misc/openoffice2/patches/patch-ai
+++ b/misc/openoffice2/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-ai,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- solenv/inc/tg_app.mk.orig	2007-02-17 17:36:28.000000000 +0900
-+++ solenv/inc/tg_app.mk	2007-02-17 17:37:00.000000000 +0900
+--- 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)$/$(@:b).cmd
+ 	@+-$(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)$/$(@:b).cmd
--	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).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)$/$(@:b).cmd
- 	@echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(@:b).cmd
- 	cat $(MISC)$/$(@:b).cmd
- 	@source $(MISC)$/$(@:b).cmd
+ 	$(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
diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak
index 8701a1c6eaa..4ecb985e3e7 100644
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-ak,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- config_office/set_soenv.in.orig	2007-02-17 17:38:22.000000000 +0900
-+++ config_office/set_soenv.in	2007-02-17 17:40:50.000000000 +0900
+--- config_office/set_soenv.in.orig	2007-01-19 21:55:33.000000000 +0900
++++ config_office/set_soenv.in	2007-04-06 08:14:02.000000000 +0900
 @@ -39,7 +39,7 @@
  #--------------------------------------------------------
  #
@@ -19,7 +19,24 @@ $NetBSD: patch-ak,v 1.2 2007/03/04 13:11:19 hira Exp $
  $D              = " -D";            # define search path
  $empty          = "";               # used as argument
  $no_stl         = "NO_STLPORT4";    # possible argument
-@@ -1263,7 +1264,8 @@
+@@ -296,8 +297,14 @@
+      exit 1;
+    }
+    #Conditional setting depending on gcc3:
+-      $CVER           = "C300";
+-      $OUTPATH        = $OUTPATH."2";
++      if( @GCCVER@ >= 30401 ) {
++         $CVER           = "C341";
++         $OUTPATH        = $OUTPATH."3";
++      }
++      else {
++         $CVER           = "C300";
++         $OUTPATH        = $OUTPATH."2";
++      }
+    # General NetBSD settings:
+       $BIG_SVX        = "TRUE";
+       $COM            = "GCC";
+@@ -1253,7 +1260,8 @@
                          $L.$JRETOOLKITDIR.
                          $L.$JRETHREADDIR.
                          $L_STLPORT_LIB.
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index 78553aacc4e..9d669d38fdd 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,14 +1,13 @@
-$NetBSD: patch-ba,v 1.3 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-ba,v 1.4 2007/04/05 23:24:01 hira Exp $
 
---- config_office/configure.orig	2006-12-02 02:52:35.000000000 +0900
-+++ config_office/configure	2007-02-28 22:37:24.000000000 +0900
-@@ -2940,12 +2940,12 @@
+--- config_office/configure.orig	2007-01-19 22:01:19.000000000 +0900
++++ config_office/configure	2007-04-01 21:32:20.000000000 +0900
+@@ -2975,11 +2975,11 @@
  		test_cups=no
  		_os=OSF1
  		;;
 -	netbsd)
 +	*netbsd*)
- 		test_x=yes
  		test_gtk=yes
  		build_cairo=yes
  		test_kde=yes
diff --git a/misc/openoffice2/patches/patch-bg b/misc/openoffice2/patches/patch-bg
index 102800550d6..acb33851edd 100644
--- a/misc/openoffice2/patches/patch-bg
+++ b/misc/openoffice2/patches/patch-bg
@@ -1,35 +1,8 @@
-$NetBSD: patch-bg,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-bg,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- vcl/util/makefile.mk.orig	2006-12-02 02:58:04.000000000 +0900
-+++ vcl/util/makefile.mk	2007-02-23 18:56:11.000000000 +0900
-@@ -187,7 +187,7 @@
- SHL1LIBS=   $(LIB1TARGET)
- .IF "$(GUI)"!="UNX"
- SHL1OBJS=   $(SLO)$/salshl.obj
--.ELIF "$(OS)"!="FREEBSD"
-+.ELIF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
- SHL1STDLIBS+=-ldl
- .ENDIF
- 
-@@ -227,7 +227,7 @@
- 
- .IF "$(GUI)"=="UNX"
- 
--.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
- SHL1STDLIBS+= -ldl
- .ENDIF
- 
-@@ -235,7 +235,7 @@
- SHL1STDLIBS += -framework Cocoa
- .ENDIF
- 
--SHL1STDLIBS += -lX11
-+SHL1STDLIBS += $(X11_LDFLAGS) -lX11
- 
- .IF "$(OS)"=="MACOSX"
- SHL1STDLIBS += -framework Foundation -framework CoreFoundation
-@@ -315,8 +315,8 @@
+--- vcl/util/makefile.mk.orig	2007-01-19 21:56:23.000000000 +0900
++++ vcl/util/makefile.mk	2007-04-01 21:30:29.000000000 +0900
+@@ -300,8 +300,8 @@
  SHL2STDLIBS+=$(LIBSN_LIBS)
  .ENDIF
  
@@ -40,31 +13,3 @@ $NetBSD: patch-bg,v 1.2 2007/03/04 13:11:19 hira Exp $
  # needed by salprnpsp.cxx
  SHL2STDLIBS+= -ldl
  .ENDIF
-@@ -372,10 +372,10 @@
- 
- 
- SHL4STDLIBS+=-l$(SHL2TARGET)
--.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
--SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
-+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
-+SHL4STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11
- .ELSE
--SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
-+SHL4STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11 -ldl
- .ENDIF # "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
- .ENDIF # "$(ENABLE_GTK)" != ""
- 
-@@ -390,10 +390,10 @@
- # libs for KDE plugin
- SHL5STDLIBS=$(KDE_LIBS)
- SHL5STDLIBS+=-l$(SHL2TARGET)
--.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
--SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
-+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
-+SHL5STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11
- .ELSE
--SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
-+SHL5STDLIBS+=$(SHL3STDLIBS) $(X11_LDFLAGS) -lX11 -ldl
- .ENDIF # "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
- .ENDIF # "$(ENABLE_KDE)" != ""
- 
diff --git a/misc/openoffice2/patches/patch-bo b/misc/openoffice2/patches/patch-bo
index a7eeb694ee6..84497cb3252 100644
--- a/misc/openoffice2/patches/patch-bo
+++ b/misc/openoffice2/patches/patch-bo
@@ -1,13 +1,13 @@
-$NetBSD: patch-bo,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-bo,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- extensions/source/plugin/unx/makefile.mk.orig	2007-02-24 01:01:46.000000000 +0900
-+++ extensions/source/plugin/unx/makefile.mk	2007-02-24 01:02:08.000000000 +0900
-@@ -74,7 +74,7 @@
- APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
- .ELSE
+--- extensions/source/plugin/unx/makefile.mk.orig	2006-12-01 23:19:00.000000000 +0900
++++ extensions/source/plugin/unx/makefile.mk	2007-04-01 22:05:33.000000000 +0900
+@@ -81,7 +81,7 @@
+ APP1STDLIBS+=-lXaw 
+ .ENDIF
  .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
--APP1STDLIBS+=-lXaw -lXt -lXext -lX11
-+APP1STDLIBS+=$(X11_LDFLAGS) -lXaw -lXt -lXext -lX11
+-APP1STDLIBS+= -lXt -lXext -lX11
++APP1STDLIBS+=$(X11_LDFLAGS) -lXt -lXext -lX11
  .ELSE
- APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl
+ APP1STDLIBS+= -lXt -lXext -lX11 -ldl
  .ENDIF
diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq
index 35924775108..ffb04875135 100644
--- a/misc/openoffice2/patches/patch-bq
+++ b/misc/openoffice2/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-bq,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- instsetoo_native/util/makefile.mk.orig	2006-12-02 02:55:09.000000000 +0900
-+++ instsetoo_native/util/makefile.mk	2007-02-27 15:45:28.000000000 +0900
-@@ -60,6 +60,9 @@
+--- 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
+@@ -61,6 +61,9 @@
  ENABLE_DOWNLOADSETS=TRUE
  .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
  
@@ -12,25 +12,7 @@ $NetBSD: patch-bq,v 1.2 2007/03/04 13:11:19 hira Exp $
  .EXPORT: ENABLE_DOWNLOADSETS
  .EXPORT: LAST_MINOR
  .EXPORT: PRJ
-@@ -194,14 +197,14 @@
- .ELSE			# "$(PKGFORMAT)"!=""
- openoffice_% :
- .ENDIF			# "$(PKGFORMAT)"!=""
--.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable"
-+.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!=""
- 	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
- .ELSE                   # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!=""
- 	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging
- 	+$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_*
-     +-$(MKDIR) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background
--    +$(GNUCOPY) -u $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png
--    +$(GNUCOPY) -u $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store
-+    +$(GNUCOPY) $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png
-+    +$(GNUCOPY) $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store
- 	+cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b)) && hdiutil makehybrid -hfs -hfs-openfolder staging staging \
-     -hfs-volume-name OpenOffice.org -ov -o tmp && hdiutil convert -ov -format UDZO tmp.dmg \
-     -o $(subst,$(@:s/_/ /:1),OpenOffice.org-$(shell sed -n '/^OpenOffice$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) && $(RM) tmp.dmg
-@@ -403,11 +406,11 @@
+@@ -410,11 +413,11 @@
  	+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
  	+-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
  	+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
diff --git a/misc/openoffice2/patches/patch-bw b/misc/openoffice2/patches/patch-bw
index 0abbefddf40..4a67c314e12 100644
--- a/misc/openoffice2/patches/patch-bw
+++ b/misc/openoffice2/patches/patch-bw
@@ -1,9 +1,9 @@
-$NetBSD: patch-bw,v 1.1 2007/03/17 02:24:36 hira Exp $
+$NetBSD: patch-bw,v 1.2 2007/04/05 23:24:01 hira Exp $
 
---- canvas/source/cairo/makefile.mk.orig	2007-03-17 10:59:33.000000000 +0900
-+++ canvas/source/cairo/makefile.mk	2007-03-17 10:59:55.000000000 +0900
-@@ -110,9 +110,9 @@
- SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB)
+--- canvas/source/cairo/makefile.mk.orig	2007-02-02 03:59:18.000000000 +0900
++++ canvas/source/cairo/makefile.mk	2007-04-01 22:07:07.000000000 +0900
+@@ -83,9 +83,9 @@
+ SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB)
  
  .IF "$(SYSTEM_CAIRO)" == "YES"
 -SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 -lXrender
diff --git a/misc/openoffice2/patches/patch-by b/misc/openoffice2/patches/patch-by
index 19a0443d57c..4da708b7675 100644
--- a/misc/openoffice2/patches/patch-by
+++ b/misc/openoffice2/patches/patch-by
@@ -1,4 +1,4 @@
-$NetBSD: patch-by,v 1.1 2007/03/19 16:51:15 hira Exp $
+$NetBSD: patch-by,v 1.2 2007/04/05 23:24:02 hira Exp $
 
 --- filter/source/config/fragments/langfilter.pl.orig	2007-03-19 22:40:51.000000000 +0900
 +++ filter/source/config/fragments/langfilter.pl	2007-03-19 22:41:34.000000000 +0900
@@ -9,7 +9,7 @@ $NetBSD: patch-by,v 1.1 2007/03/19 16:51:15 hira Exp $
 +
 +# XXX
 +my $infile = $ARGV[1];
-+my $lang=$ARGV[4];
++my $lang = $ARGV[4];
 +
 +open(IN, $infile) || die "cannot open: $!";
 +
diff --git a/misc/openoffice2/patches/patch-bz b/misc/openoffice2/patches/patch-bz
deleted file mode 100644
index 8790cf96fd1..00000000000
--- a/misc/openoffice2/patches/patch-bz
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-bz,v 1.2 2007/04/02 01:25:49 hira Exp $
-
-Security fixes for CVE-2007-0238.  This has been fixed in OOo 2.2.
-
---- sc/source/filter/starcalc/scflt.cxx.orig	2006-12-02 02:56:27.000000000 +0900
-+++ sc/source/filter/starcalc/scflt.cxx	2007-04-02 10:07:28.000000000 +0900
-@@ -1770,12 +1770,13 @@
- 			rStream >> NoteLen;
- 			if (NoteLen != 0)
- 			{
--				sal_Char Note[4096];
--				rStream.Read(Note, NoteLen);
--				Note[NoteLen] = 0;
--			        String aText( SC10TOSTRING(Note));
--			        ScPostIt aNote(aText, pDoc);
-+				sal_Char* pNote = new sal_Char[NoteLen+1];
-+				rStream.Read(pNote, NoteLen);
-+				pNote[NoteLen] = 0;
-+				String aText( SC10TOSTRING(pNote));
-+				ScPostIt aNote(aText, pDoc);
- 				pDoc->SetNote(Col, static_cast<SCROW> (Row), Tab, aNote );
-+				delete [] pNote;
- 			}
- 		}
- 		pPrgrsBar->Progress();
diff --git a/misc/openoffice2/patches/patch-ca b/misc/openoffice2/patches/patch-ca
deleted file mode 100644
index 2fb04fbf0c4..00000000000
--- a/misc/openoffice2/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2007/04/01 23:50:59 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- shell/source/unix/misc/cde-open-url.sh.orig	2006-12-02 02:57:03.000000000 +0900
-+++ shell/source/unix/misc/cde-open-url.sh	2007-01-19 22:07:09.000000000 +0900
-@@ -58,5 +58,5 @@
- fi
- 
- if [ -z "$TMPFILE" ]; then exit 1; fi
--( echo $1 > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) &
-+( echo "$1" > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) &
- exit 0
diff --git a/misc/openoffice2/patches/patch-cb b/misc/openoffice2/patches/patch-cb
deleted file mode 100644
index 8aad04ea9b6..00000000000
--- a/misc/openoffice2/patches/patch-cb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2007/04/01 23:50:59 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- shell/source/unix/misc/gnome-open-url.sh.orig	2006-12-02 02:57:03.000000000 +0900
-+++ shell/source/unix/misc/gnome-open-url.sh	2007-01-19 22:07:22.000000000 +0900
-@@ -50,6 +50,6 @@
- esac
- 
- # use gnome-open utility coming with libgnome if available
--gnome-open $1 2>/dev/null || "$0.bin" $1
-+gnome-open "$1" 2>/dev/null || "$0.bin" $1
- 
- exit 0
diff --git a/misc/openoffice2/patches/patch-cc b/misc/openoffice2/patches/patch-cc
deleted file mode 100644
index 9c98d421895..00000000000
--- a/misc/openoffice2/patches/patch-cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2007/04/01 23:50:59 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- shell/source/unix/misc/kde-open-url.sh.orig	2006-12-02 02:57:03.000000000 +0900
-+++ shell/source/unix/misc/kde-open-url.sh	2007-01-19 22:07:36.000000000 +0900
-@@ -51,9 +51,9 @@
- 
- # special handling for mailto: uris
- if echo $1 | grep '^mailto:' > /dev/null; then
--  kmailservice $1 &
-+  kmailservice "$1" &
- else
--  kfmclient openURL $1 &
-+  kfmclient openURL "$1" &
- fi
- 
- exit 0
diff --git a/misc/openoffice2/patches/patch-cd b/misc/openoffice2/patches/patch-cd
deleted file mode 100644
index 94e0b57bd5b..00000000000
--- a/misc/openoffice2/patches/patch-cd
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2007/04/01 23:50:59 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- shell/source/unix/misc/open-url.sh.orig	2006-12-02 02:57:03.000000000 +0900
-+++ shell/source/unix/misc/open-url.sh	2007-01-19 22:07:49.000000000 +0900
-@@ -96,15 +96,15 @@
- # special handling for mailto: uris
- if echo $1 | grep '^mailto:' > /dev/null; then
-   # check $MAILER variable
--  if [ $MAILER ]; then
--    $MAILER $1 &
-+  if [ ! -z "$MAILER" ]; then
-+    $MAILER "$1" &
-     exit 0
-   else
-     # mozilla derivates may need -remote semantics
-     for i in thunderbird mozilla netscape; do
-       mailer=`which $i`
-       if [ ! -z "$mailer" ]; then
--        run_mozilla $mailer $1
-+        run_mozilla "$mailer" "$1"
-         exit 0
-       fi
-     done
-@@ -113,15 +113,15 @@
-   fi
- else
-   # check $BROWSER variable
--  if [ $BROWSER ]; then
--    $BROWSER $1 &
-+  if [ ! -z "$BROWSER" ]; then
-+    $BROWSER "$1" &
-     exit 0
-   else
-     # mozilla derivates may need -remote semantics
-     for i in firefox mozilla netscape; do
-       browser=`which $i`
-       if [ ! -z "$browser" ]; then
--        run_mozilla $browser $1
-+        run_mozilla "$browser" "$1"
-         exit 0
-       fi
-     done
diff --git a/misc/openoffice2/patches/patch-ce b/misc/openoffice2/patches/patch-ce
deleted file mode 100644
index 084dbfdc197..00000000000
--- a/misc/openoffice2/patches/patch-ce
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2007/04/01 23:50:59 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- scp2/source/ooo/file_ooo.scp.orig	2007-04-02 07:02:55.000000000 +0900
-+++ scp2/source/ooo/file_ooo.scp	2007-04-02 07:05:41.000000000 +0900
-@@ -347,7 +347,7 @@
-     BIN_FILE_BODY;
-     Dir = gid_Dir_Program;
-     Name = "gnome-open-url";
--    Styles = (PACKED);
-+    Styles = (PACKED, PATCH);
- End
- 
- File gid_File_Bin_Gnome_Open_Url_Bin
-@@ -361,7 +361,7 @@
-     BIN_FILE_BODY;
-     Dir = gid_Dir_Program;
-     Name = "kde-open-url";
--    Styles = (PACKED);
-+    Styles = (PACKED, PATCH);
- End
- 
- File gid_File_Bin_Cde_Open_Url
diff --git a/misc/openoffice2/patches/patch-cf b/misc/openoffice2/patches/patch-cf
deleted file mode 100644
index afa6363c0fd..00000000000
--- a/misc/openoffice2/patches/patch-cf
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-cf,v 1.2 2007/04/02 01:25:49 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- shell/source/unix/exec/shellexec.hxx.orig	2006-12-02 02:57:03.000000000 +0900
-+++ shell/source/unix/exec/shellexec.hxx	2007-04-02 10:07:28.000000000 +0900
-@@ -44,6 +44,10 @@
- #include <osl/mutex.hxx>
- #endif
- 
-+#ifndef _RTL_STRBUF_HXX_
-+#include <rtl/strbuf.hxx>
-+#endif
-+
- #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #endif
-@@ -90,4 +94,8 @@
-         throw(::com::sun::star::uno::RuntimeException);    
- }; 
- 
-+
-+// helper function - needed for urltest
-+void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL);
-+
- #endif 
diff --git a/misc/openoffice2/patches/patch-cg b/misc/openoffice2/patches/patch-cg
deleted file mode 100644
index aac4db54f77..00000000000
--- a/misc/openoffice2/patches/patch-cg
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-cg,v 1.2 2007/04/02 01:25:49 hira Exp $
-
-Security fixes for CVE-2007-0239.  This has been fixed in OOo 2.2.
-
---- shell/source/unix/exec/shellexec.cxx.orig	2006-12-02 02:57:03.000000000 +0900
-+++ shell/source/unix/exec/shellexec.cxx	2007-04-02 10:07:28.000000000 +0900
-@@ -52,10 +52,6 @@
- #include <osl/file.hxx>
- #endif
- 
--#ifndef _RTL_STRBUF_HXX_
--#include <rtl/strbuf.hxx>
--#endif
--
- #ifndef _RTL_USTRBUF_HXX_
- #include <rtl/ustrbuf.hxx>
- #endif
-@@ -124,6 +120,20 @@
-     }
- }
- 
-+void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL)
-+{
-+    sal_Int32 nmax = rURL.getLength();
-+    for(sal_Int32 n=0; n < nmax; ++n)
-+    {
-+        // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\'
-+        sal_Char c = rURL[n];
-+        if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' )  && c != '/' && c != '.' )
-+            rBuffer.append( '\\' );
-+        
-+        rBuffer.append( c );
-+    }
-+}
-+
- //-----------------------------------------------------------------------------------------
- // 
- //-----------------------------------------------------------------------------------------
-@@ -208,7 +218,7 @@
-         OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding());
-         nIndex = aTmp.lastIndexOf('/');
-         if (nIndex > 0)
--            aBuffer.append(aTmp.copy(0, nIndex+1));
-+            escapeForShell(aBuffer, aTmp.copy(0, nIndex+1));
-             
-         // Respect the desktop environment - if there is an executable named 
-         // <desktop-environement-is>-open-url, pass the url to this one instead
-@@ -236,21 +246,19 @@
-              
-         aBuffer.append("open-url");
- #endif
--        aBuffer.append(" \'");
--        aBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding()));
--        aBuffer.append("\'");
-+        aBuffer.append(" ");
-+        escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));
-         
-         if ( pDesktopLaunch && *pDesktopLaunch )
-         {
-             aLaunchBuffer.append( pDesktopLaunch );
--            aLaunchBuffer.append( " \'" );
--            aLaunchBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding()));
--            aLaunchBuffer.append( "\'" );
-+            aLaunchBuffer.append(" ");
-+            escapeForShell(aLaunchBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));
-         }
-     } else {
--        aBuffer.append(OUStringToOString(aCommand, osl_getThreadTextEncoding()));
-+        escapeForShell(aBuffer, OUStringToOString(aCommand, osl_getThreadTextEncoding()));
-         aBuffer.append(" ");
--        aBuffer.append(OUStringToOString(aParameter, osl_getThreadTextEncoding()));
-+        escapeForShell(aBuffer, OUStringToOString(aParameter, osl_getThreadTextEncoding()));
-     }
-     
-     // Prefer DESKTOP_LAUNCH when available