Sat Jan 5 10:37:57 2013 UTC ()
Fix build on OpenBSD/amd64 5.2.
Add config for OpenBSD.


(ryoon)
diff -r1.30 -r1.31 pkgsrc/textproc/xmlrpc-c/Makefile
diff -r1.27 -r1.28 pkgsrc/textproc/xmlrpc-c/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in
cvs diff -r1.30 -r1.31 pkgsrc/textproc/xmlrpc-c/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/xmlrpc-c/Makefile 2012/12/16 01:52:36 1.30
+++ pkgsrc/textproc/xmlrpc-c/Makefile 2013/01/05 10:37:56 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2012/12/16 01:52:36 obache Exp $ 1# $NetBSD: Makefile,v 1.31 2013/01/05 10:37:56 ryoon Exp $
2 2
3DISTNAME= xmlrpc-c-1.16.44 3DISTNAME= xmlrpc-c-1.16.44
4# the "super stable" branch 4# the "super stable" branch
5PKGNAME= ${DISTNAME:S/-c-/-c-ss-/} 5PKGNAME= ${DISTNAME:S/-c-/-c-ss-/}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= textproc devel 7CATEGORIES= textproc devel
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/}
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://xmlrpc-c.sourceforge.net/ 12HOMEPAGE= http://xmlrpc-c.sourceforge.net/
13COMMENT= Library for writing an XML-RPC server or client in C or C++ 13COMMENT= Library for writing an XML-RPC server or client in C or C++
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -27,17 +27,19 @@ MAKE_FILE= GNUmakefile @@ -27,17 +27,19 @@ MAKE_FILE= GNUmakefile
27MAKE_ENV= CFLAGS_COMMON=${CFLAGS:M*:Q} 27MAKE_ENV= CFLAGS_COMMON=${CFLAGS:M*:Q}
28MAKE_ENV+= CXXFLAGS_COMMON=${CXXFLAGS:M*:Q} 28MAKE_ENV+= CXXFLAGS_COMMON=${CXXFLAGS:M*:Q}
29MAKE_ENV+= LADD=${LDFLAGS:M*:Q} 29MAKE_ENV+= LADD=${LDFLAGS:M*:Q}
30TEST_TARGET= check 30TEST_TARGET= check
31 31
32PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 32PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
33SUBST_CLASSES+= pthread 33SUBST_CLASSES+= pthread
34SUBST_STAGE.pthread= pre-configure 34SUBST_STAGE.pthread= pre-configure
35SUBST_MESSAGE.pthread= Fixing config scripts. 35SUBST_MESSAGE.pthread= Fixing config scripts.
36SUBST_FILES.pthread= xmlrpc-c-config.* xmlrpc-c-config.test.* 36SUBST_FILES.pthread= xmlrpc-c-config.* xmlrpc-c-config.test.*
37SUBST_SED.pthread= -e 's/-lpthread/${PTHREAD_LINKFLAGS:Q}/' 37SUBST_SED.pthread= -e 's/-lpthread/${PTHREAD_LINKFLAGS:Q}/'
38SUBST_SED.pthread+= -e 's/-L\(.\)libdir/-L\1libdir ${COMPILER_RPATH_FLAG}\1libdir/' 38SUBST_SED.pthread+= -e 's/-L\(.\)libdir/-L\1libdir ${COMPILER_RPATH_FLAG}\1libdir/'
39 39
 40LDFLAGS.OpenBSD+= ${PTHREAD_LINKFLAGS}
 41
40.include "../../www/curl/buildlink3.mk" 42.include "../../www/curl/buildlink3.mk"
41.include "../../www/libwww/buildlink3.mk" 43.include "../../www/libwww/buildlink3.mk"
42.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/textproc/xmlrpc-c/distinfo (expand / switch to unified diff)

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

--- pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in 2012/07/25 15:49:34 1.1
+++ pkgsrc/textproc/xmlrpc-c/patches/patch-config.mk.in 2013/01/05 10:37:56 1.2
@@ -1,27 +1,46 @@ @@ -1,27 +1,46 @@
1$NetBSD: patch-config.mk.in,v 1.1 2012/07/25 15:49:34 jperkin Exp $ 1$NetBSD: patch-config.mk.in,v 1.2 2013/01/05 10:37:56 ryoon 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 2012-07-25 15:14:31.150813087 +0000 6--- config.mk.in.orig 2011-03-25 16:58:35.000000000 +0000
7+++ config.mk.in 2012-07-25 15:16:38.062750186 +0000 7+++ config.mk.in
8@@ -187,10 +187,15 @@ 8@@ -187,10 +187,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST
9 SHLIB_SUFFIX = so 9 SHLIB_SUFFIX = so
10 shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN)) 10 shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
11 shliblefn = $(1:%=%.$(SHLIB_SUFFIX)) 11 shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
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 endif 25 endif
26  26
27 ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix) 27 ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix)
 28@@ -235,6 +240,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_O
 29 NEED_WL_RPATH=yes
 30 endif
 31
 32+ifeq ($(patsubst openbsd%,openbsd,$(HOST_OS)),openbsd)
 33+ SHARED_LIB_TYPE = unix
 34+ SHLIB_SUFFIX = so
 35+ MUST_BUILD_SHLIB = Y
 36+ MUST_BUILD_SHLIBLE = Y
 37+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
 38+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
 39+ CFLAGS_SHLIB = -fpic
 40+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
 41+ NEED_WL_RPATH=yes
 42+endif
 43+
 44 ifeq ($(patsubst freebsd%,freebsd,$(HOST_OS)),freebsd)
 45 SHARED_LIB_TYPE = unix
 46 SHLIB_SUFFIX = so