pkgsrc/misc/openoffice2/patches/patch-bs

36 lines
912 B
Text

$NetBSD: patch-bs,v 1.3 2008/04/13 20:32:43 hira Exp $
--- 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) \
+ $(LIBXML_LIBS) \
$(XMLOFFLIB)
.IF "$(SYSTEM_MOZILLA)" == "YES"
@@ -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) \
+ $(LIBXML_LIBS) \
$(XMLOFFLIB) \
$(SVXLIB)
#MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
-SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
+SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB)
SHL4VERSIONMAP = xmlsecurity.map
SHL4DEPN=