restore linker search path which got lost in libtoolification, fixes incomplete pkg installation w/o DESTDIR (PR pkg/42297 by Brad Harder) bump PKGREVISIONdiff -r1.13 -r1.14 pkgsrc/textproc/xmlrpc-c/Makefile
(drochner)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.13 2009/11/09 13:29:53 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.14 2009/11/10 21:25:57 drochner 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 | PKGREVISION= 2 | |
7 | CATEGORIES= textproc devel | 7 | CATEGORIES= textproc devel | |
8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} | 8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} | |
9 | EXTRACT_SUFX= .tgz | 9 | EXTRACT_SUFX= .tgz | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://xmlrpc-c.sourceforge.net/ | 12 | HOMEPAGE= http://xmlrpc-c.sourceforge.net/ | |
13 | 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++ | |
14 | 14 | |||
15 | CONFLICTS+= xmlrpc-c-[0-9]* | 15 | CONFLICTS+= xmlrpc-c-[0-9]* | |
16 | SUPERSEDES+= xmlrpc-c-[0-9]* | 16 | SUPERSEDES+= xmlrpc-c-[0-9]* | |
17 | 17 | |||
18 | PKG_DESTDIR_SUPPORT= user-destdir | 18 | PKG_DESTDIR_SUPPORT= user-destdir | |
19 | 19 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2009/11/09 13:29:53 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.11 2009/11/10 21:25:57 drochner 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) = 54390ac4c2740997544cc3321aa031eff59cbf91 | 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) = bcbca2cd9a7029bac048347b03aabce856a9eb0c | |
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,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | $NetBSD: patch-ah,v 1.2 2009/11/05 21:04:54 joerg Exp $ | 1 | $NetBSD: patch-ah,v 1.3 2009/11/10 21:25:57 drochner Exp $ | |
2 | 2 | |||
3 | --- src/Makefile.orig 2009-11-02 13:47:29.000000000 +0100 | 3 | --- src/Makefile.orig 2009-11-02 13:47:29.000000000 +0100 | |
4 | +++ src/Makefile | 4 | +++ src/Makefile | |
5 | @@ -7,8 +7,8 @@ VPATH = .:$(SRCDIR) | 5 | @@ -7,8 +7,8 @@ VPATH = .:$(SRCDIR) | |
6 | 6 | |||
7 | include $(BUILDDIR)/Makefile.config | 7 | include $(BUILDDIR)/Makefile.config | |
8 | 8 | |||
9 | -ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src/.libs | 9 | -ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src/.libs | |
10 | -LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil/.libs | 10 | -LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil/.libs | |
11 | +ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src | 11 | +ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src | |
12 | +LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil | 12 | +LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil | |
13 | 13 | |||
14 | default: all | 14 | default: all | |
15 | 15 | |||
16 | @@ -134,7 +134,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=% | 16 | @@ -134,7 +134,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=% | |
17 | 17 | |||
18 | LDFLAGS = $(LADD) | 18 | LDFLAGS = $(LADD) | |
19 | 19 | |||
20 | -LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR) | 20 | -LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR) | |
21 | +LIBPATHS = -L$(LIBUTIL_LIBDIR) | 21 | +LIBPATHS = -L. -L$(LIBUTIL_LIBDIR) | |
22 | 22 | |||
23 | LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD) | 23 | LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD) | |
24 | 24 |