Thu Sep 12 18:52:54 2013 UTC ()
Changes 1.25.25:
* base.hpp: Fix declarations out of order causing compile failure. Broken since Xmlrpc-c 1.19 (June 2009).
* Make distclean cleans up src/test/blddir and src/test/srcdir.


(adam)
diff -r1.32 -r1.33 pkgsrc/textproc/xmlrpc-c/Makefile
diff -r1.4 -r1.5 pkgsrc/textproc/xmlrpc-c/PLIST
diff -r1.28 -r1.29 pkgsrc/textproc/xmlrpc-c/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/xmlrpc-c/patches/patch-GNUmakefile
diff -r1.4 -r0 pkgsrc/textproc/xmlrpc-c/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/patch-ai
diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/patch-aj
diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/patch-ak
diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in
diff -r1.1 -r0 pkgsrc/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
diff -r1.1 -r0 pkgsrc/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curlmulti.c
diff -r1.1 -r0 pkgsrc/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curltransaction.c
diff -r1.1 -r0 pkgsrc/textproc/xmlrpc-c/patches/patch-lib_curl__transport_xmlrpc__curl__transport.c
cvs diff -r1.32 -r1.33 pkgsrc/textproc/xmlrpc-c/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/Makefile 2013/02/06 23:21:18 1.32
+++ pkgsrc/textproc/xmlrpc-c/Makefile 2013/09/12 18:52:54 1.33
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.32 2013/02/06 23:21:18 jperkin Exp $ 1# $NetBSD: Makefile,v 1.33 2013/09/12 18:52:54 adam Exp $
2 2
3DISTNAME= xmlrpc-c-1.16.44 3DISTNAME= xmlrpc-c-1.25.25
4# the "super stable" branch 4# the "super stable" branch
5PKGNAME= ${DISTNAME:S/-c-/-c-ss-/} 5PKGNAME= ${DISTNAME:S/-c-/-c-ss-/}
6PKGREVISION= 2 
7CATEGORIES= textproc devel 6CATEGORIES= textproc devel
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/}
9EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://xmlrpc-c.sourceforge.net/ 11HOMEPAGE= http://xmlrpc-c.sourceforge.net/
13COMMENT= Library for writing an XML-RPC server or client in C or C++ 12COMMENT= Library for writing an XML-RPC server or client in C or C++
14LICENSE= modified-bsd 13LICENSE= modified-bsd
15 14
16CONFLICTS+= xmlrpc-c-[0-9]* 15CONFLICTS+= xmlrpc-c-[0-9]*
17SUPERSEDES+= xmlrpc-c-[0-9]* 16SUPERSEDES+= xmlrpc-c-[0-9]*
18 17
19# Sometimes can't open ../xmltok/libxmlrpc_xmltok.la 18# Sometimes can't open ../xmltok/libxmlrpc_xmltok.la
20MAKE_JOBS_SAFE= no 19#MAKE_JOBS_SAFE= no
21 20
22USE_LANGUAGES= c99 c++ 21USE_LANGUAGES= c99 c++
23USE_LIBTOOL= yes 22USE_LIBTOOL= yes
24USE_TOOLS+= gmake 23USE_TOOLS+= gmake
25GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
26MAKE_FILE= GNUmakefile 25MAKE_FILE= GNUmakefile
27MAKE_ENV= CFLAGS_COMMON=${CFLAGS:M*:Q} 26MAKE_ENV= CFLAGS_COMMON=${CFLAGS:M*:Q}
28MAKE_ENV+= CXXFLAGS_COMMON=${CXXFLAGS:M*:Q} 27MAKE_ENV+= CXXFLAGS_COMMON=${CXXFLAGS:M*:Q}
29MAKE_ENV+= LADD=${LDFLAGS:M*:Q} 28MAKE_ENV+= LADD=${LDFLAGS:M*:Q}
30TEST_TARGET= check 29TEST_TARGET= check
31 30
32PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 31PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
33SUBST_CLASSES+= pthread 32SUBST_CLASSES+= pthread
cvs diff -r1.4 -r1.5 pkgsrc/textproc/xmlrpc-c/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/PLIST 2011/04/06 07:45:47 1.4
+++ pkgsrc/textproc/xmlrpc-c/PLIST 2013/09/12 18:52:54 1.5
@@ -1,106 +1,107 @@ @@ -1,106 +1,107 @@
1@comment $NetBSD: PLIST,v 1.4 2011/04/06 07:45:47 adam Exp $ 1@comment $NetBSD: PLIST,v 1.5 2013/09/12 18:52:54 adam Exp $
2bin/xmlrpc-c-config 2bin/xmlrpc-c-config
3include/XmlRpcCpp.h 3include/XmlRpcCpp.h
4include/xmlrpc-c/abyss.h 4include/xmlrpc-c/abyss.h
5include/xmlrpc-c/abyss_unixsock.h 5include/xmlrpc-c/abyss_unixsock.h
6include/xmlrpc-c/abyss_winsock.h 6include/xmlrpc-c/abyss_winsock.h
7include/xmlrpc-c/base.h 7include/xmlrpc-c/base.h
8include/xmlrpc-c/base.hpp 8include/xmlrpc-c/base.hpp
9include/xmlrpc-c/c_util.h 9include/xmlrpc-c/c_util.h
10include/xmlrpc-c/client.h 10include/xmlrpc-c/client.h
11include/xmlrpc-c/client.hpp 11include/xmlrpc-c/client.hpp
12include/xmlrpc-c/client_global.h 12include/xmlrpc-c/client_global.h
13include/xmlrpc-c/client_simple.hpp 13include/xmlrpc-c/client_simple.hpp
14include/xmlrpc-c/client_transport.hpp 14include/xmlrpc-c/client_transport.hpp
15include/xmlrpc-c/config.h 15include/xmlrpc-c/config.h
16include/xmlrpc-c/girerr.hpp 16include/xmlrpc-c/girerr.hpp
17include/xmlrpc-c/girmem.hpp 17include/xmlrpc-c/girmem.hpp
18include/xmlrpc-c/inttypes.h 18include/xmlrpc-c/inttypes.h
 19include/xmlrpc-c/json.h
19include/xmlrpc-c/oldcppwrapper.hpp 20include/xmlrpc-c/oldcppwrapper.hpp
20include/xmlrpc-c/oldxmlrpc.h 21include/xmlrpc-c/oldxmlrpc.h
21include/xmlrpc-c/packetsocket.hpp 22include/xmlrpc-c/packetsocket.hpp
22include/xmlrpc-c/registry.hpp 23include/xmlrpc-c/registry.hpp
23include/xmlrpc-c/server.h 24include/xmlrpc-c/server.h
24include/xmlrpc-c/server_abyss.h 25include/xmlrpc-c/server_abyss.h
25include/xmlrpc-c/server_abyss.hpp 26include/xmlrpc-c/server_abyss.hpp
26include/xmlrpc-c/server_cgi.h 27include/xmlrpc-c/server_cgi.h
27include/xmlrpc-c/server_pstream.hpp 28include/xmlrpc-c/server_pstream.hpp
28include/xmlrpc-c/server_w32httpsys.h 29include/xmlrpc-c/server_w32httpsys.h
29include/xmlrpc-c/timeout.hpp 30include/xmlrpc-c/timeout.hpp
30include/xmlrpc-c/transport.h 31include/xmlrpc-c/transport.h
31include/xmlrpc-c/util.h 32include/xmlrpc-c/util.h
32include/xmlrpc-c/xml.hpp 33include/xmlrpc-c/xml.hpp
33include/xmlrpc.h 34include/xmlrpc.h
34include/xmlrpc_abyss.h 35include/xmlrpc_abyss.h
35include/xmlrpc_cgi.h 36include/xmlrpc_cgi.h
36include/xmlrpc_client.h 37include/xmlrpc_client.h
37include/xmlrpc_server.h 38include/xmlrpc_server.h
38include/xmlrpc_server_w32httpsys.h 39include/xmlrpc_server_w32httpsys.h
39lib/libxmlrpc++.a 40lib/libxmlrpc++.a
40lib/libxmlrpc++.so 41lib/libxmlrpc++.so
41lib/libxmlrpc++.so.4 42lib/libxmlrpc++.so.7
42lib/libxmlrpc++.so.4.16 43lib/libxmlrpc++.so.7.25
43lib/libxmlrpc.a 44lib/libxmlrpc.a
44lib/libxmlrpc.so 45lib/libxmlrpc.so
45lib/libxmlrpc.so.3 46lib/libxmlrpc.so.3
46lib/libxmlrpc.so.3.16 47lib/libxmlrpc.so.3.25
47lib/libxmlrpc_abyss.a 48lib/libxmlrpc_abyss.a
48lib/libxmlrpc_abyss.so 49lib/libxmlrpc_abyss.so
49lib/libxmlrpc_abyss.so.3 50lib/libxmlrpc_abyss.so.3
50lib/libxmlrpc_abyss.so.3.16 51lib/libxmlrpc_abyss.so.3.25
51lib/libxmlrpc_client++.a 52lib/libxmlrpc_client++.a
52lib/libxmlrpc_client++.so 53lib/libxmlrpc_client++.so
53lib/libxmlrpc_client++.so.4 54lib/libxmlrpc_client++.so.7
54lib/libxmlrpc_client++.so.4.16 55lib/libxmlrpc_client++.so.7.25
55lib/libxmlrpc_client.a 56lib/libxmlrpc_client.a
56lib/libxmlrpc_client.so 57lib/libxmlrpc_client.so
57lib/libxmlrpc_client.so.3 58lib/libxmlrpc_client.so.3
58lib/libxmlrpc_client.so.3.16 59lib/libxmlrpc_client.so.3.25
59lib/libxmlrpc_cpp.a 60lib/libxmlrpc_cpp.a
60lib/libxmlrpc_cpp.so 61lib/libxmlrpc_cpp.so
61lib/libxmlrpc_cpp.so.4 62lib/libxmlrpc_cpp.so.7
62lib/libxmlrpc_cpp.so.4.16 63lib/libxmlrpc_cpp.so.7.25
63lib/libxmlrpc_packetsocket.a 64lib/libxmlrpc_packetsocket.a
64lib/libxmlrpc_packetsocket.so 65lib/libxmlrpc_packetsocket.so
65lib/libxmlrpc_packetsocket.so.4 66lib/libxmlrpc_packetsocket.so.7
66lib/libxmlrpc_packetsocket.so.4.16 67lib/libxmlrpc_packetsocket.so.7.25
67lib/libxmlrpc_server++.a 68lib/libxmlrpc_server++.a
68lib/libxmlrpc_server++.so 69lib/libxmlrpc_server++.so
69lib/libxmlrpc_server++.so.4 70lib/libxmlrpc_server++.so.7
70lib/libxmlrpc_server++.so.4.16 71lib/libxmlrpc_server++.so.7.25
71lib/libxmlrpc_server.a 72lib/libxmlrpc_server.a
72lib/libxmlrpc_server.so 73lib/libxmlrpc_server.so
73lib/libxmlrpc_server.so.3 74lib/libxmlrpc_server.so.3
74lib/libxmlrpc_server.so.3.16 75lib/libxmlrpc_server.so.3.25
75lib/libxmlrpc_server_abyss++.a 76lib/libxmlrpc_server_abyss++.a
76lib/libxmlrpc_server_abyss++.so 77lib/libxmlrpc_server_abyss++.so
77lib/libxmlrpc_server_abyss++.so.4 78lib/libxmlrpc_server_abyss++.so.7
78lib/libxmlrpc_server_abyss++.so.4.16 79lib/libxmlrpc_server_abyss++.so.7.25
79lib/libxmlrpc_server_abyss.a 80lib/libxmlrpc_server_abyss.a
80lib/libxmlrpc_server_abyss.so 81lib/libxmlrpc_server_abyss.so
81lib/libxmlrpc_server_abyss.so.3 82lib/libxmlrpc_server_abyss.so.3
82lib/libxmlrpc_server_abyss.so.3.16 83lib/libxmlrpc_server_abyss.so.3.25
83lib/libxmlrpc_server_cgi++.a 84lib/libxmlrpc_server_cgi++.a
84lib/libxmlrpc_server_cgi++.so 85lib/libxmlrpc_server_cgi++.so
85lib/libxmlrpc_server_cgi++.so.4 86lib/libxmlrpc_server_cgi++.so.7
86lib/libxmlrpc_server_cgi++.so.4.16 87lib/libxmlrpc_server_cgi++.so.7.25
87lib/libxmlrpc_server_cgi.a 88lib/libxmlrpc_server_cgi.a
88lib/libxmlrpc_server_cgi.so 89lib/libxmlrpc_server_cgi.so
89lib/libxmlrpc_server_cgi.so.3 90lib/libxmlrpc_server_cgi.so.3
90lib/libxmlrpc_server_cgi.so.3.16 91lib/libxmlrpc_server_cgi.so.3.25
91lib/libxmlrpc_server_pstream++.a 92lib/libxmlrpc_server_pstream++.a
92lib/libxmlrpc_server_pstream++.so 93lib/libxmlrpc_server_pstream++.so
93lib/libxmlrpc_server_pstream++.so.4 94lib/libxmlrpc_server_pstream++.so.7
94lib/libxmlrpc_server_pstream++.so.4.16 95lib/libxmlrpc_server_pstream++.so.7.25
95lib/libxmlrpc_util.a 96lib/libxmlrpc_util.a
96lib/libxmlrpc_util.so 97lib/libxmlrpc_util.so
97lib/libxmlrpc_util.so.3 98lib/libxmlrpc_util.so.3
98lib/libxmlrpc_util.so.3.16 99lib/libxmlrpc_util.so.3.25
99lib/libxmlrpc_xmlparse.a 100lib/libxmlrpc_xmlparse.a
100lib/libxmlrpc_xmlparse.so 101lib/libxmlrpc_xmlparse.so
101lib/libxmlrpc_xmlparse.so.3 102lib/libxmlrpc_xmlparse.so.3
102lib/libxmlrpc_xmlparse.so.3.16 103lib/libxmlrpc_xmlparse.so.3.25
103lib/libxmlrpc_xmltok.a 104lib/libxmlrpc_xmltok.a
104lib/libxmlrpc_xmltok.so 105lib/libxmlrpc_xmltok.so
105lib/libxmlrpc_xmltok.so.3 106lib/libxmlrpc_xmltok.so.3
106lib/libxmlrpc_xmltok.so.3.16 107lib/libxmlrpc_xmltok.so.3.25
cvs diff -r1.28 -r1.29 pkgsrc/textproc/xmlrpc-c/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/distinfo 2013/01/05 10:37:56 1.28
+++ pkgsrc/textproc/xmlrpc-c/distinfo 2013/09/12 18:52:54 1.29
@@ -1,17 +1,12 @@ @@ -1,17 +1,12 @@
1$NetBSD: distinfo,v 1.28 2013/01/05 10:37:56 ryoon Exp $ 1$NetBSD: distinfo,v 1.29 2013/09/12 18:52:54 adam Exp $
2 2
3SHA1 (xmlrpc-c-1.16.44.tgz) = 181c54ac860698ed7cf4e3814c6f3c6dd46b2ce1 3SHA1 (xmlrpc-c-1.25.25.tgz) = 10112e9c5328de5ce334c3e7ab7c02cd4ad3f8b2
4RMD160 (xmlrpc-c-1.16.44.tgz) = c9293bb74bf6298d6dd6529669f86d4cddd1fcf8 4RMD160 (xmlrpc-c-1.25.25.tgz) = 9b48b6aa70f04d4f8663515b64feb3186e31dd41
5Size (xmlrpc-c-1.16.44.tgz) = 758939 bytes 5Size (xmlrpc-c-1.25.25.tgz) = 779371 bytes
6SHA1 (patch-GNUmakefile) = 3edcf5ef38c9e94466d0303cb0eb7ce2d5ca39bb 6SHA1 (patch-GNUmakefile) = e4c6b18adaec74257ae174f64ac680aaf63d31a5
7SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417 7SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417
8SHA1 (patch-ac) = e230eb36f812c85521721ead4d080250e61f670f 
9SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3 8SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3
10SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2 9SHA1 (patch-ai) = 8d7ddc541779129de1e03a3cee81505ffbfb4171
11SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde 10SHA1 (patch-aj) = e65acd3d49be3486f70cda935a8b2aae3f8af3e8
12SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c 11SHA1 (patch-ak) = 4525977b51a25f115c1266dccf0e2cc754dc80d3
13SHA1 (patch-config.mk.in) = 9b85954b7ef5962ff3750ccd78392e5c7bdbd592 12SHA1 (patch-config.mk.in) = ddb63b60b40fb739700e3808336199f848c25904
14SHA1 (patch-examples_cpp_Makefile) = 3c2ca9b50a587c6a6395aec292ca643605158171 
15SHA1 (patch-lib_curl__transport_curlmulti.c) = 1cea4c43b1ed3dcf73827afc14d7bb9267371121 
16SHA1 (patch-lib_curl__transport_curltransaction.c) = 1dcf46c0dd1dd8e7fdfbb6c81e00b326f6d0b1f9 
17SHA1 (patch-lib_curl__transport_xmlrpc__curl__transport.c) = ea132ebb46ff0ce9893d64e9c9205d5a155220ef 
cvs diff -r1.1 -r1.2 pkgsrc/textproc/xmlrpc-c/patches/patch-GNUmakefile (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/patches/patch-GNUmakefile 2011/11/22 19:17:19 1.1
+++ pkgsrc/textproc/xmlrpc-c/patches/patch-GNUmakefile 2013/09/12 18:52:54 1.2
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1$NetBSD: patch-GNUmakefile,v 1.1 2011/11/22 19:17:19 yyamano Exp $ 1$NetBSD: patch-GNUmakefile,v 1.2 2013/09/12 18:52:54 adam Exp $
2 2
3Make this build with symlinked pkgsrc directory. 3Make this build with symlinked pkgsrc directory.
 4Don't build examples: they are not installed, and give error with libc++.
4 5
5--- GNUmakefile.orig 2011-03-25 16:27:18.000000000 +0000 6--- GNUmakefile.orig 2011-03-25 16:27:18.000000000 +0000
6+++ GNUmakefile 7+++ GNUmakefile
7@@ -1,6 +1,6 @@ 8@@ -1,6 +1,6 @@
8 include srcdir.mk 9 include srcdir.mk
9  10
10-BLDDIR = $(CURDIR) 11-BLDDIR = $(CURDIR)
11+BLDDIR = $(shell pwd) 12+BLDDIR = $(shell pwd)
12 SUBDIR = 13 SUBDIR =
13  14
14 export SRCDIR 15 export SRCDIR
 16@@ -8,7 +8,7 @@ export BLDDIR
 17
 18 include $(BLDDIR)/config.mk
 19
 20-SUBDIRS = include lib src tools examples
 21+SUBDIRS = include lib src tools
 22
 23 # The reason we don't build tools and examples by default is that they
 24 # contain executables, which require significantly more from the
File Deleted: pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ac
cvs diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ai 2011/04/06 07:45:48 1.2
+++ pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ai 2013/09/12 18:52:54 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $ 1$NetBSD: patch-ai,v 1.3 2013/09/12 18:52:54 adam Exp $
2 2
3--- tools/xmlrpc/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 3--- tools/xmlrpc/Makefile.orig 2013-03-29 06:38:36.000000000 +0000
4+++ tools/xmlrpc/Makefile 4+++ tools/xmlrpc/Makefile
5@@ -45,7 +45,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC)  5@@ -43,7 +43,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC)
6 XMLRPC_OBJS = xmlrpc.o $(DUMPVALUE) 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 $(BLDDIR)/include/xmlrpc-c/config.h 12 %.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h
13 $(CC) -c $(CFLAGS) $< 13 $(CC) -c $(CFLAGS_ALL) $<
cvs diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-aj 2011/04/06 07:45:48 1.2
+++ pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-aj 2013/09/12 18:52:54 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $ 1$NetBSD: patch-aj,v 1.3 2013/09/12 18:52:54 adam Exp $
2 2
3--- tools/xmlrpc_transport/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 3--- tools/xmlrpc_transport/Makefile.orig 2013-03-29 06:38:36.000000000 +0000
4+++ tools/xmlrpc_transport/Makefile 4+++ tools/xmlrpc_transport/Makefile
5@@ -45,7 +45,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%) 5@@ -36,7 +36,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_ALL) $<
cvs diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ak 2011/04/06 07:45:48 1.2
+++ pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-ak 2013/09/12 18:52:54 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $ 1$NetBSD: patch-ak,v 1.3 2013/09/12 18:52:54 adam Exp $
2 2
3--- tools/xml-rpc-api2cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000 3--- tools/xml-rpc-api2cpp/Makefile.orig 2013-03-29 06:38:36.000000000 +0000
4+++ tools/xml-rpc-api2cpp/Makefile 4+++ tools/xml-rpc-api2cpp/Makefile
5@@ -44,7 +44,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_ALL) $<
cvs diff -r1.2 -r1.3 pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in 2013/01/05 10:37:56 1.2
+++ pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in 2013/09/12 18:52:54 1.3
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: patch-config.mk.in,v 1.2 2013/01/05 10:37:56 ryoon Exp $ 1$NetBSD: patch-config.mk.in,v 1.3 2013/09/12 18:52:54 adam Exp $
2 2
3Do not use -Bdynamic -G when using GCC on Solaris, it creates non-PIC 3Do not use -Bdynamic -G when using GCC on Solaris, it creates non-PIC
4libraries. 4libraries.
5 5
6--- config.mk.in.orig 2011-03-25 16:58:35.000000000 +0000 6--- config.mk.in.orig 2013-03-29 06:38:36.000000000 +0000
7+++ config.mk.in 7+++ config.mk.in
8@@ -187,10 +187,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST 8@@ -193,10 +193,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST
9 SHLIB_SUFFIX = so 9 # linker, it's even more complicated: we need an rpath option of the
10 shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN)) 10 # form -Wl,-R .
11 shliblefn = $(1:%=%.$(SHLIB_SUFFIX)) 11
12- # Solaris compiler (Sun C 5.5) can't take multiple ld options as 12- # Solaris compiler (Sun C 5.5) can't take multiple ld options as
13- # -Wl,-a,-b . Ld sees -a,-b in that case. 13- # -Wl,-a,-b . Ld sees -a,-b in that case.
14- LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME) 14- LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
15- CFLAGS_SHLIB = -Kpic 15- CFLAGS_SHLIB = -Kpic
16+ ifeq ($(C_COMPILER_GNU),yes) 16+ ifeq ($(C_COMPILER_GNU),yes)
17+ LDFLAGS_SHLIB = -shared -Wl,-h -Wl,$(SONAME) 17+ LDFLAGS_SHLIB = -shared -Wl,-h -Wl,$(SONAME)
18+ CFLAGS_SHLIB = -fPIC 18+ CFLAGS_SHLIB = -fPIC
19+ else 19+ else
20+ # Solaris compiler (Sun C 5.5) can't take multiple ld options as 20+ # Solaris compiler (Sun C 5.5) can't take multiple ld options as
21+ # -Wl,-a,-b . Ld sees -a,-b in that case. 21+ # -Wl,-a,-b . Ld sees -a,-b in that case.
22+ LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME) 22+ LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
23+ CFLAGS_SHLIB = -Kpic 23+ CFLAGS_SHLIB = -Kpic
24+ endif 24+ endif
 25 NEED_RPATH=yes
25 endif 26 endif
26  27
27 ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix) 28@@ -242,6 +247,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_O
28@@ -235,6 +240,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_O 
29 NEED_WL_RPATH=yes 29 NEED_WL_RPATH=yes
30 endif 30 endif
31  31
32+ifeq ($(patsubst openbsd%,openbsd,$(HOST_OS)),openbsd) 32+ifeq ($(patsubst openbsd%,openbsd,$(HOST_OS)),openbsd)
33+ SHARED_LIB_TYPE = unix 33+ SHARED_LIB_TYPE = unix
34+ SHLIB_SUFFIX = so 34+ SHLIB_SUFFIX = so
35+ MUST_BUILD_SHLIB = Y 35+ MUST_BUILD_SHLIB = Y
36+ MUST_BUILD_SHLIBLE = Y 36+ MUST_BUILD_SHLIBLE = Y
37+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN)) 37+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
38+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX)) 38+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
39+ CFLAGS_SHLIB = -fpic 39+ CFLAGS_SHLIB = -fpic
40+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB) 40+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
41+ NEED_WL_RPATH=yes 41+ NEED_WL_RPATH=yes
File Deleted: pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-examples_cpp_Makefile
File Deleted: pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-lib_curl__transport_curlmulti.c
File Deleted: pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-lib_curl__transport_curltransaction.c
File Deleted: pkgsrc/textproc/xmlrpc-c/patches/Attic/patch-lib_curl__transport_xmlrpc__curl__transport.c