Make sure to install programs with libtool. Bump revision.diff -r1.12 -r1.13 pkgsrc/textproc/xmlrpc-c/Makefile
(joerg)
@@ -1,18 +1,19 @@ | @@ -1,18 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2009/10/30 06:14:54 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2009/11/09 13:29:53 joerg Exp $ | |
2 | 2 | |||
3 | DISTNAME= xmlrpc-c-1.06.38 | 3 | DISTNAME= xmlrpc-c-1.06.38 | |
4 | # the "super stable" branch | 4 | # the "super stable" branch | |
5 | PKGNAME= xmlrpc-c-ss-1.06.38 | 5 | PKGNAME= xmlrpc-c-ss-1.06.38 | |
6 | PKGREVISION= 1 | |||
6 | CATEGORIES= textproc devel | 7 | CATEGORIES= textproc devel | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} | 8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} | |
8 | EXTRACT_SUFX= .tgz | 9 | EXTRACT_SUFX= .tgz | |
9 | 10 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://xmlrpc-c.sourceforge.net/ | 12 | HOMEPAGE= http://xmlrpc-c.sourceforge.net/ | |
12 | COMMENT= Library for writing an XML-RPC server or client in C or C++ | 13 | COMMENT= Library for writing an XML-RPC server or client in C or C++ | |
13 | 14 | |||
14 | CONFLICTS+= xmlrpc-c-[0-9]* | 15 | CONFLICTS+= xmlrpc-c-[0-9]* | |
15 | SUPERSEDES+= xmlrpc-c-[0-9]* | 16 | SUPERSEDES+= xmlrpc-c-[0-9]* | |
16 | 17 | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | 18 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | 19 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2009/11/05 21:04:54 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.10 2009/11/09 13:29:53 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (xmlrpc-c-1.06.38.tgz) = 40332f0f363b9ca79242b28d4cbf13516702dacf | 3 | SHA1 (xmlrpc-c-1.06.38.tgz) = 40332f0f363b9ca79242b28d4cbf13516702dacf | |
4 | RMD160 (xmlrpc-c-1.06.38.tgz) = 8d9f85a1b1be91fdc5c8aaab5571d0270ddbdf67 | 4 | RMD160 (xmlrpc-c-1.06.38.tgz) = 8d9f85a1b1be91fdc5c8aaab5571d0270ddbdf67 | |
5 | Size (xmlrpc-c-1.06.38.tgz) = 702092 bytes | 5 | Size (xmlrpc-c-1.06.38.tgz) = 702092 bytes | |
6 | SHA1 (patch-aa) = a571e823967bb4af86f0fb9c561ffcc53d35505b | 6 | SHA1 (patch-aa) = 54390ac4c2740997544cc3321aa031eff59cbf91 | |
7 | SHA1 (patch-ab) = 34dd91b43385fa4a4893375dc774e0865a79b8fa | 7 | SHA1 (patch-ab) = 34dd91b43385fa4a4893375dc774e0865a79b8fa | |
8 | SHA1 (patch-ac) = e553e66662aca6d7c246acc24e960074213320c6 | 8 | SHA1 (patch-ac) = e553e66662aca6d7c246acc24e960074213320c6 | |
9 | SHA1 (patch-ae) = 0e56c03e8066bfeb4e9a6330ee160d1ab1d68a11 | 9 | SHA1 (patch-ae) = 0e56c03e8066bfeb4e9a6330ee160d1ab1d68a11 | |
10 | SHA1 (patch-af) = fdeabde63338443459d96aca657a3fc402b9fbc4 | 10 | SHA1 (patch-af) = fdeabde63338443459d96aca657a3fc402b9fbc4 | |
11 | SHA1 (patch-ah) = a6975843be204c831283ab77565150ee54679177 | 11 | SHA1 (patch-ah) = a6975843be204c831283ab77565150ee54679177 | |
12 | SHA1 (patch-ai) = ef5e4fc8b412e39addbb6da2cd83ec3c345860a0 | 12 | SHA1 (patch-ai) = ef5e4fc8b412e39addbb6da2cd83ec3c345860a0 | |
13 | SHA1 (patch-aj) = 48c5164a23024a1b6d3f6e53a24c2650ffcb47c9 | 13 | SHA1 (patch-aj) = 48c5164a23024a1b6d3f6e53a24c2650ffcb47c9 | |
14 | SHA1 (patch-ak) = cf1b406f08913c47d416cc1bbd25fb0fba67ad75 | 14 | SHA1 (patch-ak) = cf1b406f08913c47d416cc1bbd25fb0fba67ad75 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-aa,v 1.4 2009/11/05 21:04:54 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.5 2009/11/09 13:29:53 joerg Exp $ | |
2 | 2 | |||
3 | --- Makefile.common.orig 2007-07-13 02:32:20.000000000 +0200 | 3 | --- Makefile.common.orig 2007-07-13 02:32:20.000000000 +0200 | |
4 | +++ Makefile.common | 4 | +++ Makefile.common | |
5 | @@ -28,15 +28,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wove | 5 | @@ -28,15 +28,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) | |
@@ -25,13 +25,22 @@ $NetBSD: patch-aa,v 1.4 2009/11/05 21:04 | @@ -25,13 +25,22 @@ $NetBSD: patch-aa,v 1.4 2009/11/05 21:04 | |||
25 | @@ -116,10 +116,8 @@ ifneq ($(ENABLE_LIBXML2_BACKEND),yes) | 25 | @@ -116,10 +116,8 @@ ifneq ($(ENABLE_LIBXML2_BACKEND),yes) | |
26 | # We're using the internal Expat XML parser | 26 | # We're using the internal Expat XML parser | |
27 | LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK) | 27 | LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK) | |
28 | LDLIBS_XML = \ | 28 | LDLIBS_XML = \ | |
29 | - -L$(BUILDDIR)/lib/expat/xmlparse/.libs \ | 29 | - -L$(BUILDDIR)/lib/expat/xmlparse/.libs \ | |
30 | - -lxmlrpc_xmlparse \ | 30 | - -lxmlrpc_xmlparse \ | |
31 | - -L$(BUILDDIR)/lib/expat/xmltok/.libs \ | 31 | - -L$(BUILDDIR)/lib/expat/xmltok/.libs \ | |
32 | - -lxmlrpc_xmltok | 32 | - -lxmlrpc_xmltok | |
33 | + $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \ | 33 | + $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \ | |
34 | + $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la | 34 | + $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la | |
35 | else | 35 | else | |
36 | LDLIBS_XML = $(shell xml2-config --libs) | 36 | LDLIBS_XML = $(shell xml2-config --libs) | |
37 | endif | 37 | endif | |
38 | @@ -334,7 +332,7 @@ install-headers: $(HEADERS_TO_INSTALL) | |||
39 | done | |||
40 | ||||
41 | ||||
42 | -INSTALL_PROGRAM_CMD = $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p | |||
43 | +INSTALL_PROGRAM_CMD = libtool --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p | |||
44 | ||||
45 | install-bin: $(PROGRAMS_TO_INSTALL) $(DESTDIR)$(PROGRAMINST_DIR) | |||
46 | @list='$(PROGRAMS_TO_INSTALL)'; \ |