CVS commit: pkgsrc/net/libcares

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 30 09:00:10 UTC 2016

Modified Files:
        pkgsrc/net/libcares: Makefile distinfo
Added Files:
        pkgsrc/net/libcares/patches: patch-Makefile.am

Log Message:
Fix parallel build with BSD make.
Sent upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/libcares/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/libcares/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libcares/patches/patch-Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libcares/Makefile
diff -u pkgsrc/net/libcares/Makefile:1.18 pkgsrc/net/libcares/Makefile:1.19
--- pkgsrc/net/libcares/Makefile:1.18   Thu Sep 29 14:24:33 2016
+++ pkgsrc/net/libcares/Makefile        Fri Sep 30 09:00:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/09/29 14:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/09/30 09:00:10 wiz Exp $
 
 DISTNAME=      c-ares-1.12.0
 PKGNAME=       ${DISTNAME:S/c-/libc/1}
@@ -12,8 +12,11 @@ LICENSE=     mit
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake
+USE_TOOLS+=    automake
 
 PKGCONFIG_OVERRIDE+=   libcares.pc.in
 
+pre-configure:
+       cd ${WRKSRC} && automake
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libcares/distinfo
diff -u pkgsrc/net/libcares/distinfo:1.11 pkgsrc/net/libcares/distinfo:1.12
--- pkgsrc/net/libcares/distinfo:1.11   Thu Sep 29 14:19:59 2016
+++ pkgsrc/net/libcares/distinfo        Fri Sep 30 09:00:10 2016
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2016/09/29 14:19:59 wiz Exp $
+$NetBSD: distinfo,v 1.12 2016/09/30 09:00:10 wiz Exp $
 
 SHA1 (c-ares-1.12.0.tar.gz) = 8abfce61d2d788fb60a3441d05275162a460cbed
 RMD160 (c-ares-1.12.0.tar.gz) = 731085f5d46eabac858eee4c2bde87f70687445e
 SHA512 (c-ares-1.12.0.tar.gz) = 3da0fadb04eccab49b4e6eff3f087a392dd76238d47e74e2ede723883468da688e41f679ee8ca38613fc4f80d3bd7c29e69d3d6c711f988a02fd5d21a3ee1dc6
 Size (c-ares-1.12.0.tar.gz) = 1769879 bytes
+SHA1 (patch-Makefile.am) = aef2a0e1975aadab33e647752fd44e30fbfb568a
 SHA1 (patch-configure) = 1726722a94960fabc7fd69c8e7f9ca40a1492713

Added files:

Index: pkgsrc/net/libcares/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/net/libcares/patches/patch-Makefile.am:1.1
--- /dev/null   Fri Sep 30 09:00:10 2016
+++ pkgsrc/net/libcares/patches/patch-Makefile.am       Fri Sep 30 09:00:10 2016
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile.am,v 1.1 2016/09/30 09:00:10 wiz Exp $
+
+Fix parallel build with BSD make.
+
+--- Makefile.am.orig   2016-09-29 10:51:46.000000000 +0000
++++ Makefile.am
+@@ -150,17 +150,17 @@ libcares_la_HEADERS = ares.h ares_versio
+       ares_build.h ares_rules.h
+ 
+ ahost_SOURCES = ahost.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
+-ahost_LDADD = $(top_builddir)/libcares.la
++ahost_LDADD = libcares.la
+ ahost_CFLAGS = $(AM_CFLAGS)
+ ahost_CPPFLAGS = $(AM_CPPFLAGS)
+ 
+ adig_SOURCES = adig.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
+-adig_LDADD = $(top_builddir)/libcares.la
++adig_LDADD = libcares.la
+ adig_CFLAGS = $(AM_CFLAGS)
+ adig_CPPFLAGS = $(AM_CPPFLAGS)
+ 
+ acountry_SOURCES = acountry.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
+-acountry_LDADD = $(top_builddir)/libcares.la
++acountry_LDADD = libcares.la
+ acountry_CFLAGS = $(AM_CFLAGS)
+ acountry_CPPFLAGS = $(AM_CPPFLAGS)
+