summaryrefslogtreecommitdiff
path: root/misc/openoffice2/patches/patch-bs
diff options
context:
space:
mode:
Diffstat (limited to 'misc/openoffice2/patches/patch-bs')
-rw-r--r--misc/openoffice2/patches/patch-bs20
1 files changed, 15 insertions, 5 deletions
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) \