Fix pthread usage. Fix a number of libtool and C issues, that made me

wonder how this ever compiled.

6 files changed, 69 insertions, 6 deletions

diff --git a/textproc/xmlrpc-c/Makefile b/textproc/xmlrpc-c/Makefile
index 98b89b35990..7c91aa5e856 100644
--- a/textproc/xmlrpc-c/Makefile
+++ b/textproc/xmlrpc-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/24 18:59:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/26 14:56:30 joerg Exp $
 #
 
 DISTNAME=	xmlrpc-c-1.09.00
@@ -17,6 +17,13 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
 
+SUBST_CLASSES+=	pthread
+SUBST_FILES.pthread=	xmlrpc-c-config.in xmlrpc-c-config.test.in
+PTHREAD_LINKFLAGS=	${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+SUBST_SED.pthread=	-e s/-lpthread/${PTHREAD_LINKFLAGS:Q}/
+SUBST_STAGE.pthread=	post-patch
+
 .include "../../www/libwww/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlrpc-c/distinfo b/textproc/xmlrpc-c/distinfo
index c831076b835..36604d4c4ea 100644
--- a/textproc/xmlrpc-c/distinfo
+++ b/textproc/xmlrpc-c/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/24 11:00:51 wiz Exp $
+$NetBSD: distinfo,v 1.2 2007/02/26 14:56:30 joerg Exp $
 
 SHA1 (xmlrpc-c-1.09.00.tgz) = bd4571ca3bc23c1fe9dd002659fcc2aa3d4ce8a6
 RMD160 (xmlrpc-c-1.09.00.tgz) = ef098edef126dfd5a14334e6a1e4e7919be4b40c
 Size (xmlrpc-c-1.09.00.tgz) = 701817 bytes
 SHA1 (patch-aa) = ff3f7c7d0195c10f57df4ea047eb87a5bdac5cd1
-SHA1 (patch-ab) = 4734d7ccec41c5ccc617f6a2775fa4a67534c995
+SHA1 (patch-ab) = 202cf815e5c8af18bf31ffc00b6a1c5adb609c21
 SHA1 (patch-ac) = 805aebdaa736a08482a4f82559938d38f794ab81
+SHA1 (patch-ad) = 8b7ad5b7aacb6b13f04792bc157e228deaf2de72
+SHA1 (patch-ae) = 683239483a9bfee5defe2b0c8f3ef9fd0d5735f9
+SHA1 (patch-af) = c679a0cc1b867c093e9f1c1990993f18e1f50b2a
diff --git a/textproc/xmlrpc-c/patches/patch-ab b/textproc/xmlrpc-c/patches/patch-ab
index 93eb7008570..330bb55496a 100644
--- a/textproc/xmlrpc-c/patches/patch-ab
+++ b/textproc/xmlrpc-c/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/02/24 11:00:51 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2007/02/26 14:56:30 joerg Exp $
 
---- Makefile.config.in.orig	2006-09-28 04:15:55.000000000 +0200
+--- Makefile.config.in.orig	2006-09-28 02:15:55.000000000 +0000
 +++ Makefile.config.in
-@@ -204,12 +204,13 @@ ifeq ($(HOST_OS),osf)
+@@ -204,12 +204,22 @@ ifeq ($(HOST_OS),osf)
    LDFLAGS_SHLIB = -shared -expect_unresolved
  endif
  
@@ -12,6 +12,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/02/24 11:00:51 wiz Exp $
    SHLIB_SUFFIX = so
 -  shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ))
 +  shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
++  shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
++  CFLAGS_SHLIB = -fPIC
++  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
++endif
++
++ifeq ($(HOST_OS),dragonfly)
++  SHARED_LIB_TYPE = unix
++  SHLIB_SUFFIX = so
++  shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
    shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
 -  CFLAGS_SHLIB = -fpic
 +  CFLAGS_SHLIB = -fPIC
diff --git a/textproc/xmlrpc-c/patches/patch-ad b/textproc/xmlrpc-c/patches/patch-ad
new file mode 100644
index 00000000000..16f680d1ff1
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/02/26 14:56:30 joerg Exp $
+
+--- lib/abyss/src/thread.h.orig	2007-02-26 13:49:18.000000000 +0000
++++ lib/abyss/src/thread.h
+@@ -57,6 +57,8 @@ ThreadHandleSigchld(pid_t const pid);
+ #ifdef WIN32
+ typedef HANDLE TMutex;
+ #else
++#include <pthread.h>
++
+ typedef pthread_mutex_t TMutex;
+ #endif  /* WIN32 */
+ 
diff --git a/textproc/xmlrpc-c/patches/patch-ae b/textproc/xmlrpc-c/patches/patch-ae
new file mode 100644
index 00000000000..6dedf050f87
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/02/26 14:56:31 joerg Exp $
+
+--- lib/expat/Makefile.orig	2007-02-26 14:18:10.000000000 +0000
++++ lib/expat/Makefile
+@@ -9,7 +9,7 @@ SUBDIR := lib/expat
+ include $(BLDDIR)/Makefile.config
+ 
+ # Build up SUBDIRS:
+-SUBDIRS = gennmtab xmlparse xmltok
++SUBDIRS = gennmtab xmltok xmlparse
+ 
+ default: all
+ 
diff --git a/textproc/xmlrpc-c/patches/patch-af b/textproc/xmlrpc-c/patches/patch-af
new file mode 100644
index 00000000000..aaacd66dba4
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2007/02/26 14:56:31 joerg Exp $
+
+--- lib/expat/xmlparse/Makefile.orig	2007-02-26 14:16:29.000000000 +0000
++++ lib/expat/xmlparse/Makefile
+@@ -20,11 +20,11 @@ LIBXMLRPC_XMLPARSE_OBJS = xmlparse.lo
+ 
+ INCLUDES = -I$(BLDDIR) -I$(UTILDIR)/include -I$(XMLTOKDIR)
+ 
+-LIBLDFLAGS = $(LDFLAGS_VERSINFO) -L../xmltok/.libs $(RPATH) $(LADD)
++LIBLDFLAGS = $(LDFLAGS_VERSINFO) $(RPATH) $(LADD)
+ 
+ libxmlrpc_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS) $(LIBXMLRPC_XMLTOK)
+ 	$(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
+-	  $(LIBXMLRPC_XMLPARSE_OBJS) -lxmlrpc_xmltok
++	  $(LIBXMLRPC_XMLPARSE_OBJS) ../xmltok/libxmlrpc_xmltok.la
+ 
+ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+