Link tools with libtool. Don't use .libs in linker pathes.

6 files changed, 81 insertions, 14 deletions

diff --git a/textproc/xmlrpc-c/distinfo b/textproc/xmlrpc-c/distinfo
index 5e34e82dea6..2283e854b26 100644
--- a/textproc/xmlrpc-c/distinfo
+++ b/textproc/xmlrpc-c/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.8 2009/10/28 09:25:23 adam Exp $
+$NetBSD: distinfo,v 1.9 2009/11/05 21:04:54 joerg Exp $
 
 SHA1 (xmlrpc-c-1.06.38.tgz) = 40332f0f363b9ca79242b28d4cbf13516702dacf
 RMD160 (xmlrpc-c-1.06.38.tgz) = 8d9f85a1b1be91fdc5c8aaab5571d0270ddbdf67
 Size (xmlrpc-c-1.06.38.tgz) = 702092 bytes
-SHA1 (patch-aa) = 6dc9755b4e883cd55d8914761887fb3cbfff0ef1
+SHA1 (patch-aa) = a571e823967bb4af86f0fb9c561ffcc53d35505b
 SHA1 (patch-ab) = 34dd91b43385fa4a4893375dc774e0865a79b8fa
 SHA1 (patch-ac) = e553e66662aca6d7c246acc24e960074213320c6
 SHA1 (patch-ae) = 0e56c03e8066bfeb4e9a6330ee160d1ab1d68a11
 SHA1 (patch-af) = fdeabde63338443459d96aca657a3fc402b9fbc4
-SHA1 (patch-ah) = 55558998059c502f46a2bd9141ede7182df0753b
+SHA1 (patch-ah) = a6975843be204c831283ab77565150ee54679177
+SHA1 (patch-ai) = ef5e4fc8b412e39addbb6da2cd83ec3c345860a0
+SHA1 (patch-aj) = 48c5164a23024a1b6d3f6e53a24c2650ffcb47c9
+SHA1 (patch-ak) = cf1b406f08913c47d416cc1bbd25fb0fba67ad75
diff --git a/textproc/xmlrpc-c/patches/patch-aa b/textproc/xmlrpc-c/patches/patch-aa
index ba35ae99117..c6b9c8fb716 100644
--- a/textproc/xmlrpc-c/patches/patch-aa
+++ b/textproc/xmlrpc-c/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/10/28 09:25:23 adam Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/05 21:04:54 joerg Exp $
 
 --- Makefile.common.orig	2007-07-13 02:32:20.000000000 +0200
 +++ Makefile.common
@@ -22,3 +22,16 @@ $NetBSD: patch-aa,v 1.3 2009/10/28 09:25:23 adam Exp $
  endif
  
  DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
+@@ -116,10 +116,8 @@ ifneq ($(ENABLE_LIBXML2_BACKEND),yes)
+   # We're using the internal Expat XML parser
+   LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
+   LDLIBS_XML = \
+-        -L$(BUILDDIR)/lib/expat/xmlparse/.libs \
+-	-lxmlrpc_xmlparse \
+-        -L$(BUILDDIR)/lib/expat/xmltok/.libs \
+-	-lxmlrpc_xmltok
++        $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
++        $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
+ else
+   LDLIBS_XML = $(shell xml2-config --libs)
+ endif
diff --git a/textproc/xmlrpc-c/patches/patch-ah b/textproc/xmlrpc-c/patches/patch-ah
index 5ff0a637ab6..5a234ef837e 100644
--- a/textproc/xmlrpc-c/patches/patch-ah
+++ b/textproc/xmlrpc-c/patches/patch-ah
@@ -1,12 +1,24 @@
-$NetBSD: patch-ah,v 1.1 2009/10/27 18:50:39 drochner Exp $
+$NetBSD: patch-ah,v 1.2 2009/11/05 21:04:54 joerg Exp $
 
---- src/Makefile.orig	2009-01-09 21:33:17.000000000 +0100
+--- src/Makefile.orig	2009-11-02 13:47:29.000000000 +0100
 +++ src/Makefile
-@@ -51,6 +51,7 @@ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
-   LIBXML_LIBS = $(shell xml2-config --libs)
- else
-   LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
-+  LIBXML_LIBS = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la
- endif
- 
- ABYSS_INCLUDES = -I$(SRCDIR)/lib/abyss/src
+@@ -7,8 +7,8 @@ VPATH = .:$(SRCDIR)
+ 
+ include $(BUILDDIR)/Makefile.config
+ 
+-ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src/.libs
+-LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil/.libs
++ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src
++LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil
+ 
+ default: all
+ 
+@@ -134,7 +134,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%
+ 
+ LDFLAGS = $(LADD)
+ 
+-LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR)
++LIBPATHS = -L$(LIBUTIL_LIBDIR)
+ 
+ LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD)
+ 
diff --git a/textproc/xmlrpc-c/patches/patch-ai b/textproc/xmlrpc-c/patches/patch-ai
new file mode 100644
index 00000000000..538569d561a
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2009/11/05 21:04:54 joerg Exp $
+
+--- tools/xmlrpc/Makefile.orig	2009-11-01 17:37:40.000000000 +0100
++++ tools/xmlrpc/Makefile
+@@ -38,7 +38,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) 
+ XMLRPC_OBJS = xmlrpc.o dumpvalue.o
+ 
+ xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS)
+-	$(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
++	libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
+ 
+ %.o:%.c
+ 	$(CC) -c $(CFLAGS) $<
diff --git a/textproc/xmlrpc-c/patches/patch-aj b/textproc/xmlrpc-c/patches/patch-aj
new file mode 100644
index 00000000000..a2c387350da
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2009/11/05 21:04:54 joerg Exp $
+
+--- tools/xmlrpc_transport/Makefile.orig	2009-11-01 17:43:49.000000000 +0100
++++ tools/xmlrpc_transport/Makefile
+@@ -39,7 +39,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
+ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL)
+ 
+ xmlrpc_transport:%:%.o $(LIBS) $(UTILS)
+-	$(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS)
++	libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS)
+ 
+ %.o:%.c
+ 	$(CC) -c $(CFLAGS) $<
diff --git a/textproc/xmlrpc-c/patches/patch-ak b/textproc/xmlrpc-c/patches/patch-ak
new file mode 100644
index 00000000000..03f82ca1c79
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2009/11/05 21:04:54 joerg Exp $
+
+--- tools/xml-rpc-api2cpp/Makefile.orig	2009-11-01 17:46:49.000000000 +0100
++++ tools/xml-rpc-api2cpp/Makefile
+@@ -43,7 +43,7 @@ xml-rpc-api2cpp: \
+   $(LIBXMLRPC) \
+   $(LIBXMLRPC_XML) \
+   $(LIBXMLRPC_UTIL)
+-	$(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
++	libtool --mode=link $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
+ 
+ %.o:%.cpp
+ 	$(CXX) -c $(CXXFLAGS) $<