Changes 1.16.34: * Fix compile bug with some compilers on 64 bit. Changes 1.16.33: * Build: Fix prototype/definition mismatch in libwww.cpp with some compilers (e.g. Solaris). * Build: Fix linking of xml-rpc-api2cpp with some linkers (e.g. Solaris). Changes 1.16.32: * Windows Abyss server: properly handle wait for connection. Changes 1.16.31: * CGI XML-RPC server accepts (ignores) parameters after "text/xml" in Content-type header from client.diff -r1.18 -r1.19 pkgsrc/textproc/xmlrpc-c/Makefile
(adam)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.18 2011/02/22 14:23:24 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2011/04/06 07:45:47 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= xmlrpc-c-1.06.42 | 3 | DISTNAME= xmlrpc-c-1.16.34 | |
4 | # the "super stable" branch | 4 | # the "super stable" branch | |
5 | PKGNAME= ${DISTNAME:S/-c-/-c-ss-/} | 5 | PKGNAME= ${DISTNAME:S/-c-/-c-ss-/} | |
6 | CATEGORIES= textproc devel | 6 | CATEGORIES= textproc devel | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} | 7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} | |
8 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://xmlrpc-c.sourceforge.net/ | 11 | HOMEPAGE= http://xmlrpc-c.sourceforge.net/ | |
12 | COMMENT= Library for writing an XML-RPC server or client in C or C++ | 12 | COMMENT= Library for writing an XML-RPC server or client in C or C++ | |
13 | LICENSE= modified-bsd | 13 | LICENSE= modified-bsd | |
14 | 14 | |||
15 | CONFLICTS+= xmlrpc-c-[0-9]* | 15 | CONFLICTS+= xmlrpc-c-[0-9]* | |
16 | SUPERSEDES+= xmlrpc-c-[0-9]* | 16 | SUPERSEDES+= xmlrpc-c-[0-9]* | |
@@ -24,21 +24,21 @@ USE_LANGUAGES= c99 c++ | @@ -24,21 +24,21 @@ USE_LANGUAGES= c99 c++ | |||
24 | USE_LIBTOOL= yes | 24 | USE_LIBTOOL= yes | |
25 | USE_TOOLS+= gmake | 25 | USE_TOOLS+= gmake | |
26 | GNU_CONFIGURE= yes | 26 | GNU_CONFIGURE= yes | |
27 | MAKE_FILE= GNUmakefile | 27 | MAKE_FILE= GNUmakefile | |
28 | MAKE_ENV= CFLAGS_COMMON=${CFLAGS:M*:Q} | 28 | MAKE_ENV= CFLAGS_COMMON=${CFLAGS:M*:Q} | |
29 | MAKE_ENV+= CXXFLAGS_COMMON=${CXXFLAGS:M*:Q} | 29 | MAKE_ENV+= CXXFLAGS_COMMON=${CXXFLAGS:M*:Q} | |
30 | MAKE_ENV+= LADD=${LDFLAGS:M*:Q} | 30 | MAKE_ENV+= LADD=${LDFLAGS:M*:Q} | |
31 | TEST_TARGET= check | 31 | TEST_TARGET= check | |
32 | 32 | |||
33 | PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} | 33 | PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} | |
34 | SUBST_CLASSES+= pthread | 34 | SUBST_CLASSES+= pthread | |
35 | SUBST_STAGE.pthread= pre-configure | 35 | SUBST_STAGE.pthread= pre-configure | |
36 | SUBST_MESSAGE.pthread= Fixing config scripts. | 36 | SUBST_MESSAGE.pthread= Fixing config scripts. | |
37 | SUBST_FILES.pthread= xmlrpc-c-config.in xmlrpc-c-config.test.in | 37 | SUBST_FILES.pthread= xmlrpc-c-config.* xmlrpc-c-config.test.* | |
38 | SUBST_SED.pthread= -e 's/-lpthread/${PTHREAD_LINKFLAGS:Q}/' | 38 | SUBST_SED.pthread= -e 's/-lpthread/${PTHREAD_LINKFLAGS:Q}/' | |
39 | SUBST_SED.pthread+= -e 's/-L\(.\)libdir/-L\1libdir ${COMPILER_RPATH_FLAG}\1libdir/' | 39 | SUBST_SED.pthread+= -e 's/-L\(.\)libdir/-L\1libdir ${COMPILER_RPATH_FLAG}\1libdir/' | |
40 | 40 | |||
41 | .include "../../www/curl/buildlink3.mk" | 41 | .include "../../www/curl/buildlink3.mk" | |
42 | .include "../../www/libwww/buildlink3.mk" | 42 | .include "../../www/libwww/buildlink3.mk" | |
43 | .include "../../mk/pthread.buildlink3.mk" | 43 | .include "../../mk/pthread.buildlink3.mk" | |
44 | .include "../../mk/bsd.pkg.mk" | 44 | .include "../../mk/bsd.pkg.mk" |
@@ -1,63 +1,106 @@ | @@ -1,63 +1,106 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2009/10/27 18:50:39 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2011/04/06 07:45:47 adam Exp $ | |
2 | bin/xmlrpc | |||
3 | bin/xmlrpc-c-config | 2 | bin/xmlrpc-c-config | |
4 | bin/xmlrpc_transport | |||
5 | include/XmlRpcCpp.h | 3 | include/XmlRpcCpp.h | |
6 | include/xmlrpc-c/abyss.h | 4 | include/xmlrpc-c/abyss.h | |
5 | include/xmlrpc-c/abyss_unixsock.h | |||
6 | include/xmlrpc-c/abyss_winsock.h | |||
7 | include/xmlrpc-c/base.h | 7 | include/xmlrpc-c/base.h | |
8 | include/xmlrpc-c/base.hpp | 8 | include/xmlrpc-c/base.hpp | |
9 | include/xmlrpc-c/c_util.h | |||
9 | include/xmlrpc-c/client.h | 10 | include/xmlrpc-c/client.h | |
10 | include/xmlrpc-c/client.hpp | 11 | include/xmlrpc-c/client.hpp | |
11 | include/xmlrpc-c/client_global.h | 12 | include/xmlrpc-c/client_global.h | |
12 | include/xmlrpc-c/client_simple.hpp | 13 | include/xmlrpc-c/client_simple.hpp | |
13 | include/xmlrpc-c/client_transport.hpp | 14 | include/xmlrpc-c/client_transport.hpp | |
14 | include/xmlrpc-c/config.h | 15 | include/xmlrpc-c/config.h | |
15 | include/xmlrpc-c/girerr.hpp | 16 | include/xmlrpc-c/girerr.hpp | |
16 | include/xmlrpc-c/girmem.hpp | 17 | include/xmlrpc-c/girmem.hpp | |
18 | include/xmlrpc-c/inttypes.h | |||
17 | include/xmlrpc-c/oldcppwrapper.hpp | 19 | include/xmlrpc-c/oldcppwrapper.hpp | |
18 | include/xmlrpc-c/oldxmlrpc.h | 20 | include/xmlrpc-c/oldxmlrpc.h | |
21 | include/xmlrpc-c/packetsocket.hpp | |||
19 | include/xmlrpc-c/registry.hpp | 22 | include/xmlrpc-c/registry.hpp | |
20 | include/xmlrpc-c/server.h | 23 | include/xmlrpc-c/server.h | |
21 | include/xmlrpc-c/server_abyss.h | 24 | include/xmlrpc-c/server_abyss.h | |
22 | include/xmlrpc-c/server_abyss.hpp | 25 | include/xmlrpc-c/server_abyss.hpp | |
23 | include/xmlrpc-c/server_cgi.h | 26 | include/xmlrpc-c/server_cgi.h | |
27 | include/xmlrpc-c/server_pstream.hpp | |||
24 | include/xmlrpc-c/server_w32httpsys.h | 28 | include/xmlrpc-c/server_w32httpsys.h | |
25 | include/xmlrpc-c/timeout.hpp | 29 | include/xmlrpc-c/timeout.hpp | |
26 | include/xmlrpc-c/transport.h | 30 | include/xmlrpc-c/transport.h | |
27 | include/xmlrpc-c/util.h | 31 | include/xmlrpc-c/util.h | |
28 | include/xmlrpc-c/xml.hpp | 32 | include/xmlrpc-c/xml.hpp | |
29 | include/xmlrpc.h | 33 | include/xmlrpc.h | |
30 | include/xmlrpc_abyss.h | 34 | include/xmlrpc_abyss.h | |
31 | include/xmlrpc_cgi.h | 35 | include/xmlrpc_cgi.h | |
32 | include/xmlrpc_client.h | 36 | include/xmlrpc_client.h | |
33 | include/xmlrpc_server.h | 37 | include/xmlrpc_server.h | |
34 | include/xmlrpc_server_w32httpsys.h | 38 | include/xmlrpc_server_w32httpsys.h | |
35 | lib/libxmlrpc++.a | 39 | lib/libxmlrpc++.a | |
36 | lib/libxmlrpc++.so | 40 | lib/libxmlrpc++.so | |
37 | lib/libxmlrpc++.so.3 | 41 | lib/libxmlrpc++.so.4 | |
38 | lib/libxmlrpc++.so.3.06 | 42 | lib/libxmlrpc++.so.4.16 | |
39 | lib/libxmlrpc.la | 43 | lib/libxmlrpc.a | |
40 | lib/libxmlrpc_abyss.la | 44 | lib/libxmlrpc.so | |
45 | lib/libxmlrpc.so.3 | |||
46 | lib/libxmlrpc.so.3.16 | |||
47 | lib/libxmlrpc_abyss.a | |||
48 | lib/libxmlrpc_abyss.so | |||
49 | lib/libxmlrpc_abyss.so.3 | |||
50 | lib/libxmlrpc_abyss.so.3.16 | |||
41 | lib/libxmlrpc_client++.a | 51 | lib/libxmlrpc_client++.a | |
42 | lib/libxmlrpc_client++.so | 52 | lib/libxmlrpc_client++.so | |
43 | lib/libxmlrpc_client++.so.3 | 53 | lib/libxmlrpc_client++.so.4 | |
44 | lib/libxmlrpc_client++.so.3.06 | 54 | lib/libxmlrpc_client++.so.4.16 | |
45 | lib/libxmlrpc_client.la | 55 | lib/libxmlrpc_client.a | |
56 | lib/libxmlrpc_client.so | |||
57 | lib/libxmlrpc_client.so.3 | |||
58 | lib/libxmlrpc_client.so.3.16 | |||
46 | lib/libxmlrpc_cpp.a | 59 | lib/libxmlrpc_cpp.a | |
47 | lib/libxmlrpc_cpp.so | 60 | lib/libxmlrpc_cpp.so | |
48 | lib/libxmlrpc_cpp.so.3 | 61 | lib/libxmlrpc_cpp.so.4 | |
49 | lib/libxmlrpc_cpp.so.3.06 | 62 | lib/libxmlrpc_cpp.so.4.16 | |
63 | lib/libxmlrpc_packetsocket.a | |||
64 | lib/libxmlrpc_packetsocket.so | |||
65 | lib/libxmlrpc_packetsocket.so.4 | |||
66 | lib/libxmlrpc_packetsocket.so.4.16 | |||
50 | lib/libxmlrpc_server++.a | 67 | lib/libxmlrpc_server++.a | |
51 | lib/libxmlrpc_server++.so | 68 | lib/libxmlrpc_server++.so | |
52 | lib/libxmlrpc_server++.so.3 | 69 | lib/libxmlrpc_server++.so.4 | |
53 | lib/libxmlrpc_server++.so.3.06 | 70 | lib/libxmlrpc_server++.so.4.16 | |
54 | lib/libxmlrpc_server.la | 71 | lib/libxmlrpc_server.a | |
72 | lib/libxmlrpc_server.so | |||
73 | lib/libxmlrpc_server.so.3 | |||
74 | lib/libxmlrpc_server.so.3.16 | |||
55 | lib/libxmlrpc_server_abyss++.a | 75 | lib/libxmlrpc_server_abyss++.a | |
56 | lib/libxmlrpc_server_abyss++.so | 76 | lib/libxmlrpc_server_abyss++.so | |
57 | lib/libxmlrpc_server_abyss++.so.3 | 77 | lib/libxmlrpc_server_abyss++.so.4 | |
58 | lib/libxmlrpc_server_abyss++.so.3.06 | 78 | lib/libxmlrpc_server_abyss++.so.4.16 | |
59 | lib/libxmlrpc_server_abyss.la | 79 | lib/libxmlrpc_server_abyss.a | |
60 | lib/libxmlrpc_server_cgi.la | 80 | lib/libxmlrpc_server_abyss.so | |
61 | lib/libxmlrpc_util.la | 81 | lib/libxmlrpc_server_abyss.so.3 | |
62 | lib/libxmlrpc_xmlparse.la | 82 | lib/libxmlrpc_server_abyss.so.3.16 | |
63 | lib/libxmlrpc_xmltok.la | 83 | lib/libxmlrpc_server_cgi++.a | |
84 | lib/libxmlrpc_server_cgi++.so | |||
85 | lib/libxmlrpc_server_cgi++.so.4 | |||
86 | lib/libxmlrpc_server_cgi++.so.4.16 | |||
87 | lib/libxmlrpc_server_cgi.a | |||
88 | lib/libxmlrpc_server_cgi.so | |||
89 | lib/libxmlrpc_server_cgi.so.3 | |||
90 | lib/libxmlrpc_server_cgi.so.3.16 | |||
91 | lib/libxmlrpc_server_pstream++.a | |||
92 | lib/libxmlrpc_server_pstream++.so | |||
93 | lib/libxmlrpc_server_pstream++.so.4 | |||
94 | lib/libxmlrpc_server_pstream++.so.4.16 | |||
95 | lib/libxmlrpc_util.a | |||
96 | lib/libxmlrpc_util.so | |||
97 | lib/libxmlrpc_util.so.3 | |||
98 | lib/libxmlrpc_util.so.3.16 | |||
99 | lib/libxmlrpc_xmlparse.a | |||
100 | lib/libxmlrpc_xmlparse.so | |||
101 | lib/libxmlrpc_xmlparse.so.3 | |||
102 | lib/libxmlrpc_xmlparse.so.3.16 | |||
103 | lib/libxmlrpc_xmltok.a | |||
104 | lib/libxmlrpc_xmltok.so | |||
105 | lib/libxmlrpc_xmltok.so.3 | |||
106 | lib/libxmlrpc_xmltok.so.3.16 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.7 2010/06/15 09:18:10 adam Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.8 2011/04/06 07:45:47 adam Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= xmlrpc-c | 3 | BUILDLINK_TREE+= xmlrpc-c | |
4 | 4 | |||
5 | .if !defined(XMLRPC_C_BUILDLINK3_MK) | 5 | .if !defined(XMLRPC_C_BUILDLINK3_MK) | |
6 | XMLRPC_C_BUILDLINK3_MK:= | 6 | XMLRPC_C_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.06.32 | 8 | BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.16.34 | |
9 | BUILDLINK_ABI_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.06.38nb3 | 9 | BUILDLINK_ABI_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.16.34 | |
10 | BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c | 10 | BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c | |
11 | 11 | |||
12 | .include "../../www/libwww/buildlink3.mk" | 12 | .include "../../www/libwww/buildlink3.mk" | |
13 | .include "../../www/curl/buildlink3.mk" | 13 | .include "../../www/curl/buildlink3.mk" | |
14 | .endif # XMLRPC_C_BUILDLINK3_MK | 14 | .endif # XMLRPC_C_BUILDLINK3_MK | |
15 | 15 | |||
16 | BUILDLINK_TREE+= -xmlrpc-c | 16 | BUILDLINK_TREE+= -xmlrpc-c |
@@ -1,14 +1,11 @@ | @@ -1,14 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2011/03/25 13:38:07 adam Exp $ | 1 | $NetBSD: distinfo,v 1.16 2011/04/06 07:45:47 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (xmlrpc-c-1.06.42.tgz) = a4c4b878b97cbd7350a2e11518c480fe1d8997a2 | 3 | SHA1 (xmlrpc-c-1.16.34.tgz) = e4fa13bc8609134f74ba60597c9a12e28565e094 | |
4 | RMD160 (xmlrpc-c-1.06.42.tgz) = 02e98cd84a806a81c76bc8508e50cc6b73019f32 | 4 | RMD160 (xmlrpc-c-1.16.34.tgz) = bb1cce17997875fce483fcab7136dfa6a494f8e6 | |
5 | Size (xmlrpc-c-1.06.42.tgz) = 712841 bytes | 5 | Size (xmlrpc-c-1.16.34.tgz) = 754271 bytes | |
6 | SHA1 (patch-aa) = 54390ac4c2740997544cc3321aa031eff59cbf91 | 6 | SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417 | |
7 | SHA1 (patch-ab) = 601e4d33351d77c43846b328fed02b2f04c9ae3b | 7 | SHA1 (patch-ac) = e230eb36f812c85521721ead4d080250e61f670f | |
8 | SHA1 (patch-ac) = e553e66662aca6d7c246acc24e960074213320c6 | 8 | SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3 | |
9 | SHA1 (patch-ae) = 0e56c03e8066bfeb4e9a6330ee160d1ab1d68a11 | 9 | SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2 | |
10 | SHA1 (patch-af) = fdeabde63338443459d96aca657a3fc402b9fbc4 | 10 | SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde | |
11 | SHA1 (patch-ah) = bcbca2cd9a7029bac048347b03aabce856a9eb0c | 11 | SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c | |
12 | SHA1 (patch-ai) = ef5e4fc8b412e39addbb6da2cd83ec3c345860a0 | |||
13 | SHA1 (patch-aj) = 48c5164a23024a1b6d3f6e53a24c2650ffcb47c9 | |||
14 | SHA1 (patch-ak) = cf1b406f08913c47d416cc1bbd25fb0fba67ad75 |
@@ -1,46 +1,33 @@ | @@ -1,46 +1,33 @@ | |||
1 | $NetBSD: patch-aa,v 1.5 2009/11/09 13:29:53 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.6 2011/04/06 07:45:48 adam Exp $ | |
2 | 2 | |||
3 | --- Makefile.common.orig 2007-07-13 02:32:20.000000000 +0200 | 3 | --- common.mk.orig 2011-03-25 16:58:35.000000000 +0000 | |
4 | +++ Makefile.common | 4 | +++ common.mk | |
5 | @@ -28,15 +28,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wove | 5 | @@ -31,15 +31,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wove | |
6 | # assertion and crash the program if it isn't really true. You can add | 6 | # assertion and crash the program if it isn't really true. You can add | |
7 | # -UNDEBUG (in any of various ways) to override this. | 7 | # -UNDEBUG (in any of various ways) to override this. | |
8 | # | 8 | # | |
9 | -CFLAGS_COMMON = -DNDEBUG | 9 | -CFLAGS_COMMON = -DNDEBUG | |
10 | -CXXFLAGS_COMMON = -DNDEBUG | 10 | -CXXFLAGS_COMMON = -DNDEBUG | |
11 | +CFLAGS_COMMON += -DNDEBUG | 11 | +CFLAGS_COMMON += -DNDEBUG | |
12 | +CXXFLAGS_COMMON += -DNDEBUG | 12 | +CXXFLAGS_COMMON += -DNDEBUG | |
13 | 13 | |||
14 | ifeq ($(C_COMPILER_GNU),yes) | 14 | ifeq ($(C_COMPILER_GNU),yes) | |
15 | - CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3 | 15 | - CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3 | |
16 | + CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common | 16 | + CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common | |
17 | endif | 17 | endif | |
18 | 18 | |||
19 | ifeq ($(CXX_COMPILER_GNU),yes) | 19 | ifeq ($(CXX_COMPILER_GNU),yes) | |
20 | - CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g | 20 | - CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g | |
21 | + CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) | 21 | + CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) | |
22 | endif | 22 | endif | |
23 | 23 | |||
24 | DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR) | 24 | DISTDIR = $(BLDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR) | |
25 | @@ -116,10 +116,8 @@ ifneq ($(ENABLE_LIBXML2_BACKEND),yes) | 25 | @@ -524,7 +524,7 @@ install-headers: $(HEADERS_TO_INSTALL) | |
26 | # We're using the internal Expat XML parser | |||
27 | LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK) | |||
28 | LDLIBS_XML = \ | |||
29 | - -L$(BUILDDIR)/lib/expat/xmlparse/.libs \ | |||
30 | - -lxmlrpc_xmlparse \ | |||
31 | - -L$(BUILDDIR)/lib/expat/xmltok/.libs \ | |||
32 | - -lxmlrpc_xmltok | |||
33 | + $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \ | |||
34 | + $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la | |||
35 | else | |||
36 | LDLIBS_XML = $(shell xml2-config --libs) | |||
37 | endif | |||
38 | @@ -334,7 +332,7 @@ install-headers: $(HEADERS_TO_INSTALL) | |||
39 | done | 26 | done | |
40 | 27 | |||
41 | 28 | |||
42 | -INSTALL_PROGRAM_CMD = $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p | 29 | -INSTALL_PROGRAM_CMD = $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p | |
43 | +INSTALL_PROGRAM_CMD = libtool --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p | 30 | +INSTALL_PROGRAM_CMD = libtool --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p | |
44 | 31 | |||
45 | install-bin: $(PROGRAMS_TO_INSTALL) $(DESTDIR)$(PROGRAMINST_DIR) | 32 | install-bin: $(PROGRAMS_TO_INSTALL) $(DESTDIR)$(PROGRAMINST_DIR) | |
46 | @list='$(PROGRAMS_TO_INSTALL)'; \ | 33 | @list='$(PROGRAMS_TO_INSTALL)'; \ |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ac,v 1.3 2009/10/28 09:25:23 adam Exp $ | 1 | $NetBSD: patch-ac,v 1.4 2011/04/06 07:45:48 adam Exp $ | |
2 | 2 | |||
3 | --- src/cpp/Makefile.orig 2009-08-30 17:43:48.000000000 +0200 | 3 | --- src/cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 | |
4 | +++ src/cpp/Makefile | 4 | +++ src/cpp/Makefile | |
5 | @@ -139,7 +139,7 @@ libxmlrpc_client++.a: $(LIBXMLRPC_CLIENT | 5 | @@ -283,7 +283,7 @@ $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.o) \ | |
6 | # RULES TO COMPILE OBJECT MODULES FOR LIBRARIES | 6 | $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh): \ | |
7 | #----------------------------------------------------------------------------- | 7 | INCLUDES = $(BASIC_INCLUDES) | |
8 | 8 | |||
9 | -CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) | 9 | -CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) | |
10 | +CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_SHLIB) $(CFLAGS_PERSONAL) $(CADD) | 10 | +CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_SHLIB) $(CFLAGS_PERSONAL) $(CADD) | |
11 | 11 | |||
12 | XmlRpcCpp.o:%.o:%.cpp | 12 | TRANSPORT_CONFIG_USERS = client curl libwww wininet | |
13 | $(CXX) -c $(BASIC_INCLUDES) $(CXXFLAGS) $< | 13 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ae,v 1.2 2009/10/27 18:50:39 drochner Exp $ | 1 | $NetBSD: patch-ae,v 1.3 2011/04/06 07:45:48 adam Exp $ | |
2 | 2 | |||
3 | --- lib/expat/Makefile.orig 2006-07-12 04:00:38.000000000 +0200 | 3 | --- lib/expat/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 | |
4 | +++ lib/expat/Makefile | 4 | +++ lib/expat/Makefile | |
5 | @@ -6,7 +6,7 @@ SUBDIR = lib/expat | 5 | @@ -9,7 +9,7 @@ SUBDIR := lib/expat | |
6 | include $(SRCDIR)/Makefile.config | 6 | include $(BLDDIR)/config.mk | |
7 | 7 | |||
8 | # Build up SUBDIRS: | 8 | # Build up SUBDIRS: | |
9 | -SUBDIRS = gennmtab xmlparse xmltok | 9 | -SUBDIRS = gennmtab xmlparse xmltok | |
10 | +SUBDIRS = gennmtab xmltok xmlparse | 10 | +SUBDIRS = gennmtab xmltok xmlparse | |
11 | 11 | |||
12 | default: all | 12 | default: all | |
13 | 13 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ai,v 1.1 2009/11/05 21:04:54 joerg Exp $ | 1 | $NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $ | |
2 | 2 | |||
3 | --- tools/xmlrpc/Makefile.orig 2009-11-01 17:37:40.000000000 +0100 | 3 | --- tools/xmlrpc/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 | |
4 | +++ tools/xmlrpc/Makefile | 4 | +++ tools/xmlrpc/Makefile | |
5 | @@ -38,7 +38,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) | 5 | @@ -45,7 +45,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) | |
6 | XMLRPC_OBJS = xmlrpc.o dumpvalue.o | 6 | XMLRPC_OBJS = xmlrpc.o $(DUMPVALUE) | |
7 | 7 | |||
8 | xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS) | 8 | xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS) | |
9 | - $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS) | 9 | - $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS) | |
10 | + libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS) | 10 | + libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS) | |
11 | 11 | |||
12 | %.o:%.c | 12 | %.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h | |
13 | $(CC) -c $(CFLAGS) $< | 13 | $(CC) -c $(CFLAGS) $< |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-aj,v 1.1 2009/11/05 21:04:54 joerg Exp $ | 1 | $NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $ | |
2 | 2 | |||
3 | --- tools/xmlrpc_transport/Makefile.orig 2009-11-01 17:43:49.000000000 +0100 | 3 | --- tools/xmlrpc_transport/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 | |
4 | +++ tools/xmlrpc_transport/Makefile | 4 | +++ tools/xmlrpc_transport/Makefile | |
5 | @@ -39,7 +39,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%) | 5 | @@ -45,7 +45,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%) | |
6 | LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL) | 6 | LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL) | |
7 | 7 | |||
8 | xmlrpc_transport:%:%.o $(LIBS) $(UTILS) | 8 | xmlrpc_transport:%:%.o $(LIBS) $(UTILS) | |
9 | - $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS) | 9 | - $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS) | |
10 | + libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS) | 10 | + libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS) | |
11 | 11 | |||
12 | %.o:%.c | 12 | %.o:%.c | |
13 | $(CC) -c $(CFLAGS) $< | 13 | $(CC) -c $(CFLAGS) $< |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ak,v 1.1 2009/11/05 21:04:54 joerg Exp $ | 1 | $NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $ | |
2 | 2 | |||
3 | --- tools/xml-rpc-api2cpp/Makefile.orig 2009-11-01 17:46:49.000000000 +0100 | 3 | --- tools/xml-rpc-api2cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 | |
4 | +++ tools/xml-rpc-api2cpp/Makefile | 4 | +++ tools/xml-rpc-api2cpp/Makefile | |
5 | @@ -43,7 +43,7 @@ xml-rpc-api2cpp: \ | 5 | @@ -44,7 +44,7 @@ xml-rpc-api2cpp: \ | |
6 | $(LIBXMLRPC) \ | 6 | $(LIBXMLRPC) \ | |
7 | $(LIBXMLRPC_XML) \ | 7 | $(LIBXMLRPC_XML) \ | |
8 | $(LIBXMLRPC_UTIL) | 8 | $(LIBXMLRPC_UTIL) | |
9 | - $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) | 9 | - $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) | |
10 | + libtool --mode=link $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) | 10 | + libtool --mode=link $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) | |
11 | 11 | |||
12 | %.o:%.cpp | 12 | %.o:%.cpp | |
13 | $(CXX) -c $(CXXFLAGS) $< | 13 | $(CXX) -c $(CXXFLAGS) $< |