- Use CONFIGURE_DIR.

 - Fix "test ==".

From wiz@ in private e-mail.

41 files changed, 192 insertions, 160 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index e2ae48506fa..bc1b5a7e428 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/03/04 12:51:27 abs Exp $
+# $NetBSD: Makefile,v 1.7 2007/03/04 13:11:18 hira Exp $
 #
 
 OO_VER=			2.1.0
@@ -30,10 +30,11 @@ BUILD_DEPENDS+=		p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=			${WRKDIR}/OOE680_m6/config_office
+WRKSRC=			${WRKDIR}/OOE680_m6
+CONFIGURE_DIRS=		config_office
+
 USE_LANGUAGES+=		c c++
 GCC_REQD+=		3.0
-
 .if !empty(MACHINE_PLATFORM:MNetBSD-4*)
 USE_PKGSRC_GCC=		YES
 .endif
@@ -79,19 +80,19 @@ INSTALLATION_DIRS=	bin
 SUBST_CLASSES+=			X11_LDFLAGS
 SUBST_MESSAGE.X11_LDFLAGS=	Adding X11_LDFLAGS.
 SUBST_STAGE.X11_LDFLAGS=	post-patch
-SUBST_FILES.X11_LDFLAGS=	../solenv/inc/${OPENOFFICE_OUTPATH:Q}.mk
+SUBST_FILES.X11_LDFLAGS=	solenv/inc/${OPENOFFICE_OUTPATH:Q}.mk
 SUBST_SED.X11_LDFLAGS=		-e 's|@X11_LDFLAGS@|${X11_LDFLAGS}|g'
 
-OO_PKGPATH=	${WRKSRC}/../instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
+OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
 OO_PKGROOT=	/opt/openoffice.org2.1
 OO_PROGRAMS=	scalc sdraw simpress soffice swriter
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/bridge.h		\
-		${WRKSRC}/../bridges/inc/bridges/cpp_uno/
+		${WRKSRC}/bridges/inc/bridges/cpp_uno/
 
 do-build:
-	${_ULIMIT_CMD} tcsh -c "setenv PTHREAD_DIAGASSERT Ael && cd ${WRKSRC}/.. && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set && dmake build_all"
+	${_ULIMIT_CMD} tcsh -c "setenv PTHREAD_DIAGASSERT Ael && cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set && dmake build_all"
 
 post-build:
 	cd ${WRKDIR} &&				\
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 4ff22f1c636..6fa0aa2e6d4 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/03/02 13:17:48 hira Exp $
+$NetBSD: distinfo,v 1.5 2007/03/04 13:11:18 hira Exp $
 
 SHA1 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc
 RMD160 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a
@@ -15,41 +15,42 @@ Size (openoffice-2.1.0/OOo_2.1.0_src_system.tar.bz2) = 29761970 bytes
 SHA1 (openoffice-2.1.0/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
 RMD160 (openoffice-2.1.0/bridge.h) = 191fb56e56df85d49651988290d20db914670951
 Size (openoffice-2.1.0/bridge.h) = 6734 bytes
-SHA1 (patch-aa) = 249c36051fc5edd7276c32dea7a5a15d0ea4dc50
-SHA1 (patch-ac) = 6471e643054d7a61d167231dd4a3759e201a7c1e
-SHA1 (patch-ad) = 33f7adb9a6a4d4cea3d15f1ae68fd173ec076ac7
-SHA1 (patch-ae) = d61393a7f130becd01fee86a5179d5822bde395f
-SHA1 (patch-ag) = 5b11f305df91f1649a98710d6a5eda7867bc6507
-SHA1 (patch-ah) = 3b0fa214e39e9384fd219341f225dedf5a387152
-SHA1 (patch-ai) = 07824298abac9364017f4d32adcf00adb13b47ad
-SHA1 (patch-aj) = 0c0b5517c2c8cad77c03b0f9444b3a344c8975fb
-SHA1 (patch-ak) = 5a95571bdaba5d5f7086ab58affe918708031a44
-SHA1 (patch-am) = 0a9ff9308755d1a3d6e0239800488fad0d11f861
-SHA1 (patch-an) = 5c01ab9883bfe651fd76d3fbe49761f2e4be86fe
-SHA1 (patch-ao) = c1f21d862ace7506f7e1759c7b6fcabf8cec99fe
-SHA1 (patch-ap) = 76303026e5eec2273e5e24418a9c40334847765b
-SHA1 (patch-aq) = 5ffffe1deb79f587d1b51891d80b92c516099f43
-SHA1 (patch-ar) = 96648cd9a75a35adbabc1f20b80f2b21e6a16788
-SHA1 (patch-as) = f6f5f938769fc594024355a0cc20259d488ba61e
-SHA1 (patch-aw) = c4497fa2a6e346cfabfeddd0c714fdb857a032f7
-SHA1 (patch-ba) = c7017c52d4b85333f0596dbe68a629a36f4efb4e
-SHA1 (patch-bb) = 23b94a5f5729c1f7436102c472285bc9ce78e343
-SHA1 (patch-bc) = f5b768e16f3ba31f02ba1c19cf91f23012fcf225
-SHA1 (patch-bd) = 7f5330b48906d5252f24d75793f878119d24500d
-SHA1 (patch-be) = f68e2e87cc2a8e24702418bd80670cffcfe393ba
-SHA1 (patch-bf) = f16412054d1d41368fbd0b390b3f7dd562cdb95b
-SHA1 (patch-bg) = edc6d4753fc055c24f381a396c649888a8c0f250
-SHA1 (patch-bh) = b0419d2280364c45e98823379eb71ff6bbd48c2a
-SHA1 (patch-bi) = 666bfb1eada470873d8603ccc6d40c7c0feb128f
-SHA1 (patch-bj) = ee034ff27f28b91b39d1c424638a35a142a8c4b5
-SHA1 (patch-bk) = 17e9953e474517b8d379461695e50a01982ae71f
-SHA1 (patch-bl) = 2eda757d55b9c44631a8b37a0a41361e26eb1477
-SHA1 (patch-bm) = 05566d99f7579b39c8c85c959b1f184932bf551d
-SHA1 (patch-bn) = 26518693aadd6afdc2b7e48163d2366134b0f19a
-SHA1 (patch-bo) = f42c866649dc8758e6cd48942e014e4a7afd7914
-SHA1 (patch-bp) = 4e5c31629ede238671aabeb1a08e3553739d0aa8
-SHA1 (patch-bq) = 27b8895fba343f2a98cbb46462edec19cc5f5f7c
-SHA1 (patch-br) = 63b33773923c6644f342813c6e07764e0da6b3e0
-SHA1 (patch-bs) = cdb0e6f1fa5fa49e99c264996205dcd8cf8f9b66
-SHA1 (patch-bt) = 55073cbacfdab7a0af71ef65b94457534ac794c3
-SHA1 (patch-bu) = d183549a349745000aff270b8ede592d85bc5155
+SHA1 (patch-aa) = bafba12d0421c5119cdf7122e8430af93dd41dac
+SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
+SHA1 (patch-ad) = 10d348282a4e5e6907e4e2cd828997f4549be58c
+SHA1 (patch-ae) = eec39a887ad19d3a8ff0a26fab7ea6981915eadd
+SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
+SHA1 (patch-ah) = eec95ecb6833fb7b791b13c54d991f06a40207f1
+SHA1 (patch-ai) = 6a70a013243a5585651d5acebcc3bb8c883885f5
+SHA1 (patch-aj) = 740b8829c4f480db0989302231b5c031e2c141e7
+SHA1 (patch-ak) = 227423f0c8303cc5f5ac6f99a0338504bf234c20
+SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
+SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
+SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
+SHA1 (patch-ap) = cc7b39a28d80bdd27b459d9388cd770d08927b0e
+SHA1 (patch-aq) = 41fab8bdc5bc611fd01623ac222189646e42bf22
+SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
+SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
+SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
+SHA1 (patch-ba) = 4ab5d321f84a1026660be92f7b1050059099a0cb
+SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
+SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
+SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
+SHA1 (patch-be) = 0aaa31523743f5cc9339c125fc93f32902b90151
+SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
+SHA1 (patch-bg) = 06b12ec243ee3222d444178235cee0f383a2e58f
+SHA1 (patch-bh) = 25546cd8fb636a9e0fb0983b83b667567be415e6
+SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
+SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
+SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
+SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
+SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
+SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
+SHA1 (patch-bo) = 276093206a06a66e46f156ef9f7ff360b31b532b
+SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
+SHA1 (patch-bq) = 90b064150ec3cda4fce4e08f5bdd4504d19218ef
+SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
+SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12
+SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
+SHA1 (patch-bu) = 246771afac29432adbe479e5be3b3c032ad49413
+SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
diff --git a/misc/openoffice2/patches/patch-aa b/misc/openoffice2/patches/patch-aa
index f5cbe8270eb..0903d210c6a 100644
--- a/misc/openoffice2/patches/patch-aa
+++ b/misc/openoffice2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
 
---- ../sal/util/sal_netbsd.map.orig	2007-02-18 01:17:57.000000000 +0900
-+++ ../sal/util/sal_netbsd.map	2007-02-18 01:46:52.000000000 +0900
+--- sal/util/sal_netbsd.map.orig	2007-02-18 01:17:57.000000000 +0900
++++ sal/util/sal_netbsd.map	2007-02-18 01:46:52.000000000 +0900
 @@ -0,0 +1,569 @@
 +UDK_3_0_0 {
 +    global:
diff --git a/misc/openoffice2/patches/patch-ac b/misc/openoffice2/patches/patch-ac
index 321d71fb4df..71e358f64c4 100644
--- a/misc/openoffice2/patches/patch-ac
+++ b/misc/openoffice2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ac,v 1.2 2007/03/04 13:11:18 hira Exp $
 
---- ../sal/inc/osl/endian.h.orig	2007-02-17 23:15:28.000000000 +0900
-+++ ../sal/inc/osl/endian.h	2007-02-17 23:16:59.000000000 +0900
+--- sal/inc/osl/endian.h.orig	2007-02-17 23:15:28.000000000 +0900
++++ sal/inc/osl/endian.h	2007-02-17 23:16:59.000000000 +0900
 @@ -76,11 +76,14 @@
  #ifdef NETBSD
  #   include <machine/endian.h>
diff --git a/misc/openoffice2/patches/patch-ad b/misc/openoffice2/patches/patch-ad
index b57f2a32ea1..950a41ff537 100644
--- a/misc/openoffice2/patches/patch-ad
+++ b/misc/openoffice2/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ad,v 1.2 2007/03/04 13:11:18 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-02-17 23:06:23.000000000 +0900
++++ sal/osl/unx/system.c	2007-02-17 23:08:46.000000000 +0900
 @@ -71,8 +71,11 @@
  struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
  #endif /* BUILD_OS_APPLEOSX */
diff --git a/misc/openoffice2/patches/patch-ae b/misc/openoffice2/patches/patch-ae
index f3338957aa1..65d08dd9253 100644
--- a/misc/openoffice2/patches/patch-ae
+++ b/misc/openoffice2/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ae,v 1.2 2007/03/04 13:11:18 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
+--- 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 @@
  .ENDIF
  SHL1IMPLIB= i$(TARGET)
diff --git a/misc/openoffice2/patches/patch-ag b/misc/openoffice2/patches/patch-ag
index 85bf9bb241d..156f1e34a4d 100644
--- a/misc/openoffice2/patches/patch-ag
+++ b/misc/openoffice2/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ag,v 1.2 2007/03/04 13:11:18 hira Exp $
 
---- ../solenv/bin/checkdll.sh.orig	2007-02-17 17:27:21.000000000 +0900
-+++ ../solenv/bin/checkdll.sh	2007-02-17 17:27:43.000000000 +0900
+--- solenv/bin/checkdll.sh.orig	2007-02-17 17:27:21.000000000 +0900
++++ solenv/bin/checkdll.sh	2007-02-17 17:27:43.000000000 +0900
 @@ -37,7 +37,7 @@
  # checkdll.sh - execute checkdll with all -L arguments to this script
  #               prepended to LD_LIBRARY_PATH
diff --git a/misc/openoffice2/patches/patch-ah b/misc/openoffice2/patches/patch-ah
index 1e6489b333c..11bab537a19 100644
--- a/misc/openoffice2/patches/patch-ah
+++ b/misc/openoffice2/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ah,v 1.2 2007/03/04 13:11:18 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-02-17 17:28:18.000000000 +0900
++++ solenv/inc/_tg_app.mk	2007-02-17 17:35:58.000000000 +0900
 @@ -87,7 +87,7 @@
  	@+-$(RM) $(MISC)$/$(@:b).cmd
  	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
diff --git a/misc/openoffice2/patches/patch-ai b/misc/openoffice2/patches/patch-ai
index 96a73e7f542..9fee2f5812b 100644
--- a/misc/openoffice2/patches/patch-ai
+++ b/misc/openoffice2/patches/patch-ai
@@ -1,6 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2007/02/27 11:55:57 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
+$NetBSD: patch-ai,v 1.2 2007/03/04 13:11:19 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
 @@ -124,7 +124,7 @@
  	@+-$(RM) $(MISC)$/$(@:b).cmd
  	@echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
diff --git a/misc/openoffice2/patches/patch-aj b/misc/openoffice2/patches/patch-aj
index cc75266d36c..d82581c28fe 100644
--- a/misc/openoffice2/patches/patch-aj
+++ b/misc/openoffice2/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-aj,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../solenv/inc/unxbsdi2.mk.orig	2006-12-02 02:57:07.000000000 +0900
-+++ ../solenv/inc/unxbsdi2.mk	2007-02-23 20:49:52.000000000 +0900
+--- solenv/inc/unxbsdi2.mk.orig	2006-12-02 02:57:07.000000000 +0900
++++ solenv/inc/unxbsdi2.mk	2007-02-23 20:49:52.000000000 +0900
 @@ -37,7 +37,7 @@
  ASM=
  AFLAGS=
diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak
index 3f7ff188279..8701a1c6eaa 100644
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ak,v 1.2 2007/03/04 13:11:19 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-02-17 17:38:22.000000000 +0900
++++ config_office/set_soenv.in	2007-02-17 17:40:50.000000000 +0900
 @@ -39,7 +39,7 @@
  #--------------------------------------------------------
  #
diff --git a/misc/openoffice2/patches/patch-am b/misc/openoffice2/patches/patch-am
index 7dd13921f1a..34fbc66599e 100644
--- a/misc/openoffice2/patches/patch-am
+++ b/misc/openoffice2/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-am,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../soltools/checkdll/makefile.mk.orig	2007-02-17 17:42:05.000000000 +0900
-+++ ../soltools/checkdll/makefile.mk	2007-02-17 17:42:44.000000000 +0900
+--- soltools/checkdll/makefile.mk.orig	2007-02-17 17:42:05.000000000 +0900
++++ soltools/checkdll/makefile.mk	2007-02-17 17:42:44.000000000 +0900
 @@ -57,7 +57,7 @@
  STDLIB += -ldl
  .ENDIF
diff --git a/misc/openoffice2/patches/patch-an b/misc/openoffice2/patches/patch-an
index b43eaea241e..7db1f9f5745 100644
--- a/misc/openoffice2/patches/patch-an
+++ b/misc/openoffice2/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-an,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../psprint/source/printergfx/printerjob.cxx.orig	2007-02-17 17:43:14.000000000 +0900
-+++ ../psprint/source/printergfx/printerjob.cxx	2007-02-17 17:43:55.000000000 +0900
+--- psprint/source/printergfx/printerjob.cxx.orig	2007-02-17 17:43:14.000000000 +0900
++++ psprint/source/printergfx/printerjob.cxx	2007-02-17 17:43:55.000000000 +0900
 @@ -82,6 +82,17 @@
  
  #include "glyphset.hxx"
diff --git a/misc/openoffice2/patches/patch-ao b/misc/openoffice2/patches/patch-ao
index 4494d0b288f..82b48258d2c 100644
--- a/misc/openoffice2/patches/patch-ao
+++ b/misc/openoffice2/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ao,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../i18npool/source/breakiterator/gendict.cxx.orig	2007-02-17 23:18:38.000000000 +0900
-+++ ../i18npool/source/breakiterator/gendict.cxx	2007-02-17 23:20:08.000000000 +0900
+--- i18npool/source/breakiterator/gendict.cxx.orig	2007-02-17 23:18:38.000000000 +0900
++++ i18npool/source/breakiterator/gendict.cxx	2007-02-17 23:20:08.000000000 +0900
 @@ -74,8 +74,12 @@
  	fprintf(cfp, "extern \"C\" {\n");
  
diff --git a/misc/openoffice2/patches/patch-ap b/misc/openoffice2/patches/patch-ap
index 78f0ebab926..3141a543bf5 100644
--- a/misc/openoffice2/patches/patch-ap
+++ b/misc/openoffice2/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ap,v 1.2 2007/03/04 13:11:19 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
+--- 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
diff --git a/misc/openoffice2/patches/patch-aq b/misc/openoffice2/patches/patch-aq
index eb5c65bddf4..9458d440199 100644
--- a/misc/openoffice2/patches/patch-aq
+++ b/misc/openoffice2/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-aq,v 1.2 2007/03/04 13:11:19 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	2006-12-02 02:57:09.000000000 +0900
++++ stlport/makefile.mk	2007-02-17 17:51:36.000000000 +0900
 @@ -111,7 +111,7 @@
  TAR_EXCLUDES=*/SC5/*
  .ENDIF          # "$(USE_SHELL)"=="4nt"
diff --git a/misc/openoffice2/patches/patch-ar b/misc/openoffice2/patches/patch-ar
index 7b6fb2cff5b..6999e6220de 100644
--- a/misc/openoffice2/patches/patch-ar
+++ b/misc/openoffice2/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-ar,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../sal/osl/unx/tempfile.c.orig	2007-02-17 23:20:56.000000000 +0900
-+++ ../sal/osl/unx/tempfile.c	2007-02-17 23:22:45.000000000 +0900
+--- sal/osl/unx/tempfile.c.orig	2007-02-17 23:20:56.000000000 +0900
++++ sal/osl/unx/tempfile.c	2007-02-17 23:22:45.000000000 +0900
 @@ -38,6 +38,9 @@
  /*****************************************************************/
  
diff --git a/misc/openoffice2/patches/patch-as b/misc/openoffice2/patches/patch-as
index fed2790bb85..784e905f1a3 100644
--- a/misc/openoffice2/patches/patch-as
+++ b/misc/openoffice2/patches/patch-as
@@ -1,7 +1,7 @@
-$NetBSD: patch-as,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-as,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../sal/osl/unx/file.cxx.orig	2007-02-17 23:02:10.000000000 +0900
-+++ ../sal/osl/unx/file.cxx	2007-02-17 23:04:04.000000000 +0900
+--- sal/osl/unx/file.cxx.orig	2007-02-17 23:02:10.000000000 +0900
++++ sal/osl/unx/file.cxx	2007-02-17 23:04:04.000000000 +0900
 @@ -1424,7 +1424,7 @@
  
  #ifdef HAVE_STATFS_H
diff --git a/misc/openoffice2/patches/patch-aw b/misc/openoffice2/patches/patch-aw
index 1214dd53dea..334752a3c93 100644
--- a/misc/openoffice2/patches/patch-aw
+++ b/misc/openoffice2/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-aw,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../sal/osl/unx/system.h.orig	2007-02-17 23:26:16.000000000 +0900
-+++ ../sal/osl/unx/system.h	2007-02-17 22:59:36.000000000 +0900
+--- sal/osl/unx/system.h.orig	2007-02-17 23:26:16.000000000 +0900
++++ sal/osl/unx/system.h	2007-02-17 22:59:36.000000000 +0900
 @@ -136,7 +136,10 @@
  #endif
  
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index d8a1745c051..78553aacc4e 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.2 2007/03/01 08:37:32 hira Exp $
+$NetBSD: patch-ba,v 1.3 2007/03/04 13:11:19 hira Exp $
 
---- configure.orig	2006-12-02 02:52:35.000000000 +0900
-+++ configure	2007-02-28 22:37:24.000000000 +0900
+--- 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 @@
  		test_cups=no
  		_os=OSF1
diff --git a/misc/openoffice2/patches/patch-bb b/misc/openoffice2/patches/patch-bb
index 5465c231670..37fd0dbd08b 100644
--- a/misc/openoffice2/patches/patch-bb
+++ b/misc/openoffice2/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bb,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../sal/osl/unx/backtrace.h.orig	2007-02-17 22:54:13.000000000 +0900
-+++ ../sal/osl/unx/backtrace.h	2007-02-17 22:57:00.000000000 +0900
+--- sal/osl/unx/backtrace.h.orig	2007-02-17 22:54:13.000000000 +0900
++++ sal/osl/unx/backtrace.h	2007-02-17 22:57:00.000000000 +0900
 @@ -34,7 +34,7 @@
   ************************************************************************/
  
diff --git a/misc/openoffice2/patches/patch-bc b/misc/openoffice2/patches/patch-bc
index 002ae00513a..66cba7377a0 100644
--- a/misc/openoffice2/patches/patch-bc
+++ b/misc/openoffice2/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bc,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../portaudio/portaudio_v18_1.patch.orig	2007-02-19 01:22:02.000000000 +0900
-+++ ../portaudio/portaudio_v18_1.patch	2007-02-19 01:22:28.000000000 +0900
+--- portaudio/portaudio_v18_1.patch.orig	2007-02-19 01:22:02.000000000 +0900
++++ portaudio/portaudio_v18_1.patch	2007-02-19 01:22:28.000000000 +0900
 @@ -98,7 +98,7 @@
    
    #ifdef __linux__
diff --git a/misc/openoffice2/patches/patch-bd b/misc/openoffice2/patches/patch-bd
index beb08b6ef37..e1ba4d2c971 100644
--- a/misc/openoffice2/patches/patch-bd
+++ b/misc/openoffice2/patches/patch-bd
@@ -1,7 +1,7 @@
-$NetBSD: patch-bd,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bd,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../sal/rtl/source/makefile.mk.orig	2007-02-22 20:55:50.000000000 +0900
-+++ ../sal/rtl/source/makefile.mk	2007-02-22 20:56:44.000000000 +0900
+--- sal/rtl/source/makefile.mk.orig	2007-02-22 20:55:50.000000000 +0900
++++ sal/rtl/source/makefile.mk	2007-02-22 20:56:44.000000000 +0900
 @@ -135,6 +135,10 @@
  
  .ENDIF # .IF "$(OS)"=="LINUX"
diff --git a/misc/openoffice2/patches/patch-be b/misc/openoffice2/patches/patch-be
index cc5e51e949a..395e7f1d764 100644
--- a/misc/openoffice2/patches/patch-be
+++ b/misc/openoffice2/patches/patch-be
@@ -1,7 +1,7 @@
-$NetBSD: patch-be,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$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
+--- 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
diff --git a/misc/openoffice2/patches/patch-bf b/misc/openoffice2/patches/patch-bf
index c7d7f2804fa..72ff4d7a2f4 100644
--- a/misc/openoffice2/patches/patch-bf
+++ b/misc/openoffice2/patches/patch-bf
@@ -1,7 +1,7 @@
-$NetBSD: patch-bf,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bf,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../soltools/cpp/cpp.h.orig	2007-02-23 12:14:25.000000000 +0900
-+++ ../soltools/cpp/cpp.h	2007-02-23 12:14:59.000000000 +0900
+--- soltools/cpp/cpp.h.orig	2007-02-23 12:14:25.000000000 +0900
++++ soltools/cpp/cpp.h	2007-02-23 12:14:59.000000000 +0900
 @@ -2,7 +2,7 @@
         
  #define	INS			32768	/* input buffer								*/
diff --git a/misc/openoffice2/patches/patch-bg b/misc/openoffice2/patches/patch-bg
index ba5f90445a6..102800550d6 100644
--- a/misc/openoffice2/patches/patch-bg
+++ b/misc/openoffice2/patches/patch-bg
@@ -1,7 +1,7 @@
-$NetBSD: patch-bg,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bg,v 1.2 2007/03/04 13:11:19 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
+--- 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"
diff --git a/misc/openoffice2/patches/patch-bh b/misc/openoffice2/patches/patch-bh
index 33c8042c751..2c45c487b1b 100644
--- a/misc/openoffice2/patches/patch-bh
+++ b/misc/openoffice2/patches/patch-bh
@@ -1,7 +1,7 @@
-$NetBSD: patch-bh,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bh,v 1.2 2007/03/04 13:11:19 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
+--- 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) 		\
diff --git a/misc/openoffice2/patches/patch-bi b/misc/openoffice2/patches/patch-bi
index dc3244b022a..cc9f915ebbf 100644
--- a/misc/openoffice2/patches/patch-bi
+++ b/misc/openoffice2/patches/patch-bi
@@ -1,7 +1,7 @@
-$NetBSD: patch-bi,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bi,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../shell/source/unix/misc/makefile.mk.orig	2007-02-23 18:59:47.000000000 +0900
-+++ ../shell/source/unix/misc/makefile.mk	2007-02-23 19:00:19.000000000 +0900
+--- shell/source/unix/misc/makefile.mk.orig	2007-02-23 18:59:47.000000000 +0900
++++ shell/source/unix/misc/makefile.mk	2007-02-23 19:00:19.000000000 +0900
 @@ -59,7 +59,7 @@
  APP1OBJS = \
  	$(OBJ)$/gnome-open-url.obj
diff --git a/misc/openoffice2/patches/patch-bj b/misc/openoffice2/patches/patch-bj
index 44b58464c22..b799015cbbd 100644
--- a/misc/openoffice2/patches/patch-bj
+++ b/misc/openoffice2/patches/patch-bj
@@ -1,7 +1,7 @@
-$NetBSD: patch-bj,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bj,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../toolkit/util/makefile.mk.orig	2007-02-23 19:08:23.000000000 +0900
-+++ ../toolkit/util/makefile.mk	2007-02-23 19:09:14.000000000 +0900
+--- toolkit/util/makefile.mk.orig	2007-02-23 19:08:23.000000000 +0900
++++ toolkit/util/makefile.mk	2007-02-23 19:09:14.000000000 +0900
 @@ -84,13 +84,13 @@
  
  .IF "$(GUIBASE)"=="unx"
diff --git a/misc/openoffice2/patches/patch-bk b/misc/openoffice2/patches/patch-bk
index dc51b11fe57..60a87776709 100644
--- a/misc/openoffice2/patches/patch-bk
+++ b/misc/openoffice2/patches/patch-bk
@@ -1,7 +1,7 @@
-$NetBSD: patch-bk,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bk,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../forms/util/makefile.mk.orig	2007-02-23 19:13:29.000000000 +0900
-+++ ../forms/util/makefile.mk	2007-02-23 19:13:44.000000000 +0900
+--- forms/util/makefile.mk.orig	2007-02-23 19:13:29.000000000 +0900
++++ forms/util/makefile.mk	2007-02-23 19:13:44.000000000 +0900
 @@ -111,11 +111,11 @@
  .IF "$(OS)"=="MACOSX"
  .IF "$(GUIBASE)"=="unx"
diff --git a/misc/openoffice2/patches/patch-bl b/misc/openoffice2/patches/patch-bl
index 97b45cd8836..2bf215cde4f 100644
--- a/misc/openoffice2/patches/patch-bl
+++ b/misc/openoffice2/patches/patch-bl
@@ -1,7 +1,7 @@
-$NetBSD: patch-bl,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bl,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../padmin/source/makefile.mk.orig	2007-02-23 19:14:40.000000000 +0900
-+++ ../padmin/source/makefile.mk	2007-02-23 19:14:51.000000000 +0900
+--- padmin/source/makefile.mk.orig	2007-02-23 19:14:40.000000000 +0900
++++ padmin/source/makefile.mk	2007-02-23 19:14:51.000000000 +0900
 @@ -103,6 +103,7 @@
  	$(CPPUHELPERLIB)	\
  	$(CPPULIB)			\
diff --git a/misc/openoffice2/patches/patch-bm b/misc/openoffice2/patches/patch-bm
index 5f5619829a7..f8c68a0d9ae 100644
--- a/misc/openoffice2/patches/patch-bm
+++ b/misc/openoffice2/patches/patch-bm
@@ -1,7 +1,7 @@
-$NetBSD: patch-bm,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bm,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../binfilter/bf_forms/util/makefile.mk.orig	2007-02-24 00:55:39.000000000 +0900
-+++ ../binfilter/bf_forms/util/makefile.mk	2007-02-24 00:56:10.000000000 +0900
+--- binfilter/bf_forms/util/makefile.mk.orig	2007-02-24 00:55:39.000000000 +0900
++++ binfilter/bf_forms/util/makefile.mk	2007-02-24 00:56:10.000000000 +0900
 @@ -109,11 +109,11 @@
  .IF "$(OS)"=="MACOSX"
  .IF "$(GUIBASE)"=="unx"
diff --git a/misc/openoffice2/patches/patch-bn b/misc/openoffice2/patches/patch-bn
index 86bf523fded..901626523d2 100644
--- a/misc/openoffice2/patches/patch-bn
+++ b/misc/openoffice2/patches/patch-bn
@@ -1,7 +1,7 @@
-$NetBSD: patch-bn,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bn,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../crashrep/source/unx/makefile.mk.orig	2007-02-24 00:59:23.000000000 +0900
-+++ ../crashrep/source/unx/makefile.mk	2007-02-24 00:59:55.000000000 +0900
+--- crashrep/source/unx/makefile.mk.orig	2007-02-24 00:59:23.000000000 +0900
++++ crashrep/source/unx/makefile.mk	2007-02-24 00:59:55.000000000 +0900
 @@ -70,8 +70,8 @@
  APP1TARGET=$(TARGET)
  APP1OBJS=$(OBJFILES)
diff --git a/misc/openoffice2/patches/patch-bo b/misc/openoffice2/patches/patch-bo
index 6e832ed5862..a7eeb694ee6 100644
--- a/misc/openoffice2/patches/patch-bo
+++ b/misc/openoffice2/patches/patch-bo
@@ -1,7 +1,7 @@
-$NetBSD: patch-bo,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bo,v 1.2 2007/03/04 13:11:19 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
+--- 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
diff --git a/misc/openoffice2/patches/patch-bp b/misc/openoffice2/patches/patch-bp
index 875b860e02c..73055012f6e 100644
--- a/misc/openoffice2/patches/patch-bp
+++ b/misc/openoffice2/patches/patch-bp
@@ -1,7 +1,7 @@
-$NetBSD: patch-bp,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bp,v 1.2 2007/03/04 13:11:19 hira Exp $
 
---- ../extensions/source/nsplugin/source/makefile.mk.orig	2007-02-24 02:05:26.000000000 +0900
-+++ ../extensions/source/nsplugin/source/makefile.mk	2007-02-24 02:13:01.000000000 +0900
+--- extensions/source/nsplugin/source/makefile.mk.orig	2007-02-24 02:05:26.000000000 +0900
++++ extensions/source/nsplugin/source/makefile.mk	2007-02-24 02:13:01.000000000 +0900
 @@ -115,7 +115,7 @@
  			$(TOOLSLIB)
  
diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq
index 7fb38e93b6c..35924775108 100644
--- a/misc/openoffice2/patches/patch-bq
+++ b/misc/openoffice2/patches/patch-bq
@@ -1,7 +1,7 @@
-$NetBSD: patch-bq,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bq,v 1.2 2007/03/04 13:11:19 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
+--- 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 @@
  ENABLE_DOWNLOADSETS=TRUE
  .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
diff --git a/misc/openoffice2/patches/patch-br b/misc/openoffice2/patches/patch-br
index 7776c0b7757..fe83f392e2e 100644
--- a/misc/openoffice2/patches/patch-br
+++ b/misc/openoffice2/patches/patch-br
@@ -1,7 +1,7 @@
-$NetBSD: patch-br,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-br,v 1.2 2007/03/04 13:11:20 hira Exp $
 
---- ../scp2/source/ooo/file_library_ooo.scp.orig	2006-12-02 02:56:41.000000000 +0900
-+++ ../scp2/source/ooo/file_library_ooo.scp	2007-02-27 03:46:51.000000000 +0900
+--- scp2/source/ooo/file_library_ooo.scp.orig	2006-12-02 02:56:41.000000000 +0900
++++ scp2/source/ooo/file_library_ooo.scp	2007-02-27 03:46:51.000000000 +0900
 @@ -503,6 +503,8 @@
    #ifdef UNX
      #ifdef MACOSX
diff --git a/misc/openoffice2/patches/patch-bs b/misc/openoffice2/patches/patch-bs
index e9dee371a1e..08664bac702 100644
--- a/misc/openoffice2/patches/patch-bs
+++ b/misc/openoffice2/patches/patch-bs
@@ -1,7 +1,7 @@
-$NetBSD: patch-bs,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+$NetBSD: patch-bs,v 1.2 2007/03/04 13:11:20 hira Exp $
 
---- ../xmlsecurity/util/makefile.mk.orig	2007-02-27 08:39:08.000000000 +0900
-+++ ../xmlsecurity/util/makefile.mk	2007-02-27 08:40:08.000000000 +0900
+--- xmlsecurity/util/makefile.mk.orig	2007-02-27 08:39:08.000000000 +0900
++++ xmlsecurity/util/makefile.mk	2007-02-27 08:40:08.000000000 +0900
 @@ -106,6 +106,7 @@
  	$(TOOLSLIB)			\
  	$(COMPHELPERLIB)	\
diff --git a/misc/openoffice2/patches/patch-bt b/misc/openoffice2/patches/patch-bt
index ff2f1cc50d6..ca7fc80396e 100644
--- a/misc/openoffice2/patches/patch-bt
+++ b/misc/openoffice2/patches/patch-bt
@@ -1,7 +1,7 @@
-$NetBSD: patch-bt,v 1.2 2007/03/02 13:17:49 hira Exp $
+$NetBSD: patch-bt,v 1.3 2007/03/04 13:11:20 hira Exp $
 
---- ../epm/epm-3.7.patch.orig	2007-02-28 11:29:52.000000000 +0900
-+++ ../epm/epm-3.7.patch	2007-02-28 20:00:38.000000000 +0900
+--- epm/epm-3.7.patch.orig	2007-02-28 11:29:52.000000000 +0900
++++ epm/epm-3.7.patch	2007-02-28 20:00:38.000000000 +0900
 @@ -697,3 +697,22 @@
    }
    
diff --git a/misc/openoffice2/patches/patch-bu b/misc/openoffice2/patches/patch-bu
index 7458eb5b29e..b25dc4fba67 100644
--- a/misc/openoffice2/patches/patch-bu
+++ b/misc/openoffice2/patches/patch-bu
@@ -1,7 +1,7 @@
-$NetBSD: patch-bu,v 1.1 2007/02/28 12:06:59 hira Exp $
+$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
+--- 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"
diff --git a/misc/openoffice2/patches/patch-bv b/misc/openoffice2/patches/patch-bv
new file mode 100644
index 00000000000..d513856be80
--- /dev/null
+++ b/misc/openoffice2/patches/patch-bv
@@ -0,0 +1,29 @@
+$NetBSD: patch-bv,v 1.1 2007/03/04 13:11:20 hira Exp $
+
+--- setup_native/scripts/linuxpatchscript.sh.orig	2007-03-04 21:42:59.000000000 +0900
++++ setup_native/scripts/linuxpatchscript.sh	2007-03-04 21:43:36.000000000 +0900
+@@ -25,7 +25,7 @@
+ echo
+ read -p "Patching the installation in ${PRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover
+ echo
+-[ "$reply" == "y" ] || exit 1
++[ "$reply" = "y" ] || exit 1
+ 
+ echo
+ echo "About to update the following packages ..."
+@@ -53,13 +53,13 @@
+   # Check, that $RPMLIST does not contain online update rpm (then it is already installed)
+   ONLINEPDATEINSTALLED=`grep onlineupdate ${RPMLIST}`
+ 
+-  if [ "x$ONLINEPDATEINSTALLED" == "x" ]; then
++  if [ "x$ONLINEPDATEINSTALLED" = "x" ]; then
+     # Ask user, if online update shall be installed
+     echo
+     read -p "Do you want to install the new online update feature (y/n) ? " -n 1 reply leftover
+     echo
+     
+-    if [ "$reply" == "y" ]; then
++    if [ "$reply" = "y" ]; then
+       # Install the online update rpm
+       rpm --install -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $ONLINEUPDATERPM
+     fi