Sun Apr 13 20:32:43 2008 UTC ()
Fix build with firefox.  Problem reported by abs@.


(hira)
diff -r1.37 -r1.38 pkgsrc/misc/openoffice2/distinfo
diff -r1.7 -r1.8 pkgsrc/misc/openoffice2/patches/patch-ak
diff -r1.2 -r1.3 pkgsrc/misc/openoffice2/patches/patch-bs
cvs diff -r1.37 -r1.38 pkgsrc/misc/openoffice2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/distinfo 2008/04/09 09:03:59 1.37
+++ pkgsrc/misc/openoffice2/Attic/distinfo 2008/04/13 20:32:43 1.38
@@ -1,59 +1,59 @@ @@ -1,59 +1,59 @@
1$NetBSD: distinfo,v 1.37 2008/04/09 09:03:59 hira Exp $ 1$NetBSD: distinfo,v 1.38 2008/04/13 20:32:43 hira Exp $
2 2
3SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8 3SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
4RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1 4RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
5Size (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120 bytes 5Size (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120 bytes
6SHA1 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 1f775a0f2b755ad1c4cb7d14df93d86948424e7f 6SHA1 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 1f775a0f2b755ad1c4cb7d14df93d86948424e7f
7RMD160 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = f8be874225a4f8a90bf20d563db175f3381e224e 7RMD160 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = f8be874225a4f8a90bf20d563db175f3381e224e
8Size (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 153590855 bytes 8Size (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 153590855 bytes
9SHA1 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e 9SHA1 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e
10RMD160 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = a52ed9e7a7511ad12cf6cef98e64a3ef384dd383 10RMD160 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = a52ed9e7a7511ad12cf6cef98e64a3ef384dd383
11Size (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 81193819 bytes 11Size (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 81193819 bytes
12SHA1 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = cbefb4655987fb70b929b6922c2b27beb1e5db18 12SHA1 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = cbefb4655987fb70b929b6922c2b27beb1e5db18
13RMD160 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = ad25cb334f59154db36da8346c47805013f0f6fe 13RMD160 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = ad25cb334f59154db36da8346c47805013f0f6fe
14Size (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = 44072779 bytes 14Size (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = 44072779 bytes
15SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d 15SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
16SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98 16SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
17SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 17SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
18SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012 18SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
19SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1 19SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
20SHA1 (patch-ak) = 1d498a6f1c68d8c91576ea7cf7891faeefc02f7a 20SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
21SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5 21SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
22SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6 22SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
23SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c 23SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
24SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431 24SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431
25SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5 25SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
26SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 26SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
27SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec 27SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
28SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad 28SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
29SHA1 (patch-ba) = 0134e4055ebe01134029881c3f4d961f7efe8db6 29SHA1 (patch-ba) = 0134e4055ebe01134029881c3f4d961f7efe8db6
30SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 30SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
31SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077 31SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
32SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5 32SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
33SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de 33SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
34SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a 34SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
35SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218 35SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
36SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464 36SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
37SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6 37SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
38SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c 38SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
39SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d 39SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
40SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa 40SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
41SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27 41SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
42SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc 42SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
43SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e 43SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
44SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b 44SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
45SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca 45SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
46SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12 46SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
47SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661 47SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
48SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 48SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
49SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093 49SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
50SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c 50SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
51SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 51SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
52SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0 52SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0
53SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e 53SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
54SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 54SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
55SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190 55SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
56SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 56SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
57SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d 57SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
58SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd 58SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
59SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643 59SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
cvs diff -r1.7 -r1.8 pkgsrc/misc/openoffice2/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/patches/Attic/patch-ak 2008/04/07 16:24:51 1.7
+++ pkgsrc/misc/openoffice2/patches/Attic/patch-ak 2008/04/13 20:32:43 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ak,v 1.7 2008/04/07 16:24:51 hira Exp $ 1$NetBSD: patch-ak,v 1.8 2008/04/13 20:32:43 hira Exp $
2 2
3--- config_office/set_soenv.in.orig 2008-01-24 02:07:28.000000000 +0900 3--- config_office/set_soenv.in.orig 2008-01-23 17:07:28.000000000 +0000
4+++ config_office/set_soenv.in 2008-04-07 17:46:40.000000000 +0900 4+++ config_office/set_soenv.in 2008-04-14 04:39:32.000000000 +0000
5@@ -40,7 +40,7 @@ 5@@ -40,7 +40,7 @@
6 # 6 #
7 my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, 7 my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
8 $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, 8 $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
9- $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, 9- $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
10+ $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, 10+ $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW,
11 $USE_MINGW, $platform, $NOWRAPCMD, 11 $USE_MINGW, $platform, $NOWRAPCMD,
12 $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,  12 $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
13 $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path); 13 $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
14@@ -90,7 +90,7 @@ 14@@ -90,7 +90,7 @@
15 $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, 15 $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
16 $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, 16 $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
17 $PROEXT, 17 $PROEXT,
@@ -77,21 +77,29 @@ $NetBSD: patch-ak,v 1.7 2008/04/07 16:24 @@ -77,21 +77,29 @@ $NetBSD: patch-ak,v 1.7 2008/04/07 16:24
77 if ($SYSTEM_PYTHON eq "NO") { 77 if ($SYSTEM_PYTHON eq "NO") {
78+ $PYTHON = python 78+ $PYTHON = python
79 $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno'; 79 $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
80 $PYTHONHOME = $SOLARVER.$ds.$INPATH; 80 $PYTHONHOME = $SOLARVER.$ds.$INPATH;
81 if ($GUIBASE eq "WIN") { 81 if ($GUIBASE eq "WIN") {
82@@ -1693,6 +1713,7 @@ 82@@ -1693,6 +1713,7 @@
83 ToFile( "JITC_PROCESSOR_TYPE","6", "e" ); 83 ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
84 } 84 }
85 ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" ); 85 ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
86+ToFile( "X11_LDFLAGS", "@X_LIBS@", "e" ); 86+ToFile( "X11_LDFLAGS", "@X_LIBS@", "e" );
87 ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" ); 87 ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
88 ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" ); 88 ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
89 ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" ); 89 ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
90@@ -1967,6 +1988,7 @@ 90@@ -1942,6 +1963,7 @@
 91 ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" );
 92 ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" );
 93 ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" );
 94+ToFile( "MOZ_NSS_LIBS", "@MOZ_NSS_LIBS@", "e" );
 95 ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
 96 ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
 97 ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
 98@@ -1967,6 +1989,7 @@
91 ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); 99 ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
92 ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); 100 ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
93 ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); 101 ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
94+ToFile( "PYTHON", "@PYTHON@", "e" ); 102+ToFile( "PYTHON", "@PYTHON@", "e" );
95 ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); 103 ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
96 ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" ); 104 ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
97 if ($SYSTEM_PYTHON eq "NO") { 105 if ($SYSTEM_PYTHON eq "NO") {
cvs diff -r1.2 -r1.3 pkgsrc/misc/openoffice2/patches/Attic/patch-bs (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/patches/Attic/patch-bs 2007/03/04 13:11:20 1.2
+++ pkgsrc/misc/openoffice2/patches/Attic/patch-bs 2008/04/13 20:32:43 1.3
@@ -1,26 +1,36 @@ @@ -1,26 +1,36 @@
1$NetBSD: patch-bs,v 1.2 2007/03/04 13:11:20 hira Exp $ 1$NetBSD: patch-bs,v 1.3 2008/04/13 20:32:43 hira Exp $
2 2
3--- xmlsecurity/util/makefile.mk.orig 2007-02-27 08:39:08.000000000 +0900 3--- xmlsecurity/util/makefile.mk.orig 2008-04-14 05:03:09.000000000 +0000
4+++ xmlsecurity/util/makefile.mk 2007-02-27 08:40:08.000000000 +0900 4+++ xmlsecurity/util/makefile.mk 2008-04-14 05:10:23.000000000 +0000
5@@ -106,6 +106,7 @@ 5@@ -101,6 +101,7 @@
6 $(TOOLSLIB) \ 6 $(TOOLSLIB) \
7 $(COMPHELPERLIB) \ 7 $(COMPHELPERLIB) \
8 $(CPPUHELPERLIB) \ 8 $(CPPUHELPERLIB) \
9+ $(LIBXML_LIBS) \ 9+ $(LIBXML_LIBS) \
10 $(XMLOFFLIB) 10 $(XMLOFFLIB)
11  11
12 .IF "$(SYSTEM_MOZILLA)" == "YES" 12 .IF "$(SYSTEM_MOZILLA)" == "YES"
13@@ -164,11 +165,12 @@ 13@@ -110,6 +111,9 @@
 14 .IF "$(NSS_LIB)" != ""
 15 SHL2STDLIBS += $(NSS_LIB)
 16 .ENDIF
 17+.IF "$(MOZ_NSS_LIBS)" != ""
 18+SHL2STDLIBS += $(MOZ_NSS_LIBS)
 19+.ENDIF
 20 .ENDIF
 21
 22 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 23@@ -159,11 +163,12 @@
14 $(SOTLIB) \ 24 $(SOTLIB) \
15 $(SVLLIB) \ 25 $(SVLLIB) \
16 $(SFXLIB) \ 26 $(SFXLIB) \
17+ $(LIBXML_LIBS) \ 27+ $(LIBXML_LIBS) \
18 $(XMLOFFLIB) \ 28 $(XMLOFFLIB) \
19 $(SVXLIB) 29 $(SVXLIB)
20  30
21 #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings 31 #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
22-SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB) 32-SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
23+SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB) 33+SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB)
24  34
25 SHL4VERSIONMAP = xmlsecurity.map 35 SHL4VERSIONMAP = xmlsecurity.map
26 SHL4DEPN= 36 SHL4DEPN=