Fix build with firefox. Problem reported by abs@.

3 files changed, 30 insertions, 12 deletions

diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index be23316952c..36f99ab2789 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2008/04/09 09:03:59 hira Exp $
+$NetBSD: distinfo,v 1.38 2008/04/13 20:32:43 hira Exp $
 
 SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
 RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
@@ -17,7 +17,7 @@ SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-ak) = 1d498a6f1c68d8c91576ea7cf7891faeefc02f7a
+SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -43,7 +43,7 @@ SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
 SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
 SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
 SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
-SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12
+SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak
index e86ee4787b5..f1e0fcb8ec9 100644
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.7 2008/04/07 16:24:51 hira Exp $
+$NetBSD: patch-ak,v 1.8 2008/04/13 20:32:43 hira Exp $
 
---- config_office/set_soenv.in.orig	2008-01-24 02:07:28.000000000 +0900
-+++ config_office/set_soenv.in	2008-04-07 17:46:40.000000000 +0900
+--- config_office/set_soenv.in.orig	2008-01-23 17:07:28.000000000 +0000
++++ config_office/set_soenv.in	2008-04-14 04:39:32.000000000 +0000
 @@ -40,7 +40,7 @@
  #
  my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
@@ -87,7 +87,15 @@ $NetBSD: patch-ak,v 1.7 2008/04/07 16:24:51 hira Exp $
  ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
  ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
  ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-@@ -1967,6 +1988,7 @@
+@@ -1942,6 +1963,7 @@
+ ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
+ ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
+ ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
++ToFile( "MOZ_NSS_LIBS",      "@MOZ_NSS_LIBS@",     "e" );
+ ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
+ ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
+ ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
+@@ -1967,6 +1989,7 @@
  ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
  ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
  ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
diff --git a/misc/openoffice2/patches/patch-bs b/misc/openoffice2/patches/patch-bs
index 08664bac702..669630ee74e 100644
--- a/misc/openoffice2/patches/patch-bs
+++ b/misc/openoffice2/patches/patch-bs
@@ -1,8 +1,8 @@
-$NetBSD: patch-bs,v 1.2 2007/03/04 13:11:20 hira Exp $
+$NetBSD: patch-bs,v 1.3 2008/04/13 20:32:43 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
-@@ -106,6 +106,7 @@
+--- xmlsecurity/util/makefile.mk.orig	2008-04-14 05:03:09.000000000 +0000
++++ xmlsecurity/util/makefile.mk	2008-04-14 05:10:23.000000000 +0000
+@@ -101,6 +101,7 @@
  	$(TOOLSLIB)			\
  	$(COMPHELPERLIB)	\
  	$(CPPUHELPERLIB)	\
@@ -10,7 +10,17 @@ $NetBSD: patch-bs,v 1.2 2007/03/04 13:11:20 hira Exp $
  	$(XMLOFFLIB)
  
  .IF "$(SYSTEM_MOZILLA)" == "YES"
-@@ -164,11 +165,12 @@
+@@ -110,6 +111,9 @@
+ .IF "$(NSS_LIB)" != ""
+ SHL2STDLIBS += $(NSS_LIB)
+ .ENDIF
++.IF "$(MOZ_NSS_LIBS)" != ""
++SHL2STDLIBS += $(MOZ_NSS_LIBS)
++.ENDIF
+ .ENDIF
+ 
+ .IF "$(CRYPTO_ENGINE)" == "mscrypto"
+@@ -159,11 +163,12 @@
  				$(SOTLIB)			\
  				$(SVLLIB)			\
  				$(SFXLIB)			\