From 6aacdd3434774822c21729fda0e85c33546cce56 Mon Sep 17 00:00:00 2001
From: jakllsch <jakllsch@pkgsrc.org>
Date: Sun, 4 Mar 2012 20:10:47 +0000
Subject: [PATCH] Use getaddrinfo(3) even if AI_ADDRCONFIG is missing. PKGREV++

---
 audio/libmpd/Makefile                           |  4 ++--
 audio/libmpd/distinfo                           |  3 ++-
 audio/libmpd/patches/patch-src_libmpdclient.c   | 15 +++++++++++++++
 audio/libmpdclient/Makefile                     |  3 ++-
 audio/libmpdclient/distinfo                     |  3 ++-
 audio/libmpdclient/patches/patch-src_resolver.c | 15 +++++++++++++++
 6 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 audio/libmpd/patches/patch-src_libmpdclient.c
 create mode 100644 audio/libmpdclient/patches/patch-src_resolver.c

diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 97756f3721e6..0b5fd629a1a2 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/03/03 00:12:41 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/03/04 20:10:47 jakllsch Exp $
 #
 
 DISTNAME=		libmpd-0.20.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://download.sarine.nl/Programs/gmpc/0.20.0/ \
 			${MASTER_SITE_SOURCEFORGE:=musicpd/}
diff --git a/audio/libmpd/distinfo b/audio/libmpd/distinfo
index d5926688b611..26dbdad08810 100644
--- a/audio/libmpd/distinfo
+++ b/audio/libmpd/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2010/06/15 21:15:11 joerg Exp $
+$NetBSD: distinfo,v 1.8 2012/03/04 20:10:47 jakllsch Exp $
 
 SHA1 (libmpd-0.20.0.tar.gz) = cb7c9b5dff0e7f560a75d1904a97f316347e7d7b
 RMD160 (libmpd-0.20.0.tar.gz) = d4462aa0fdc01f985f35f7eeaec4b2173b933a91
 Size (libmpd-0.20.0.tar.gz) = 363996 bytes
+SHA1 (patch-src_libmpdclient.c) = 89071667f47ddd6003c6fbc35611b2f9f588b236
diff --git a/audio/libmpd/patches/patch-src_libmpdclient.c b/audio/libmpd/patches/patch-src_libmpdclient.c
new file mode 100644
index 000000000000..eb8a46a82ec0
--- /dev/null
+++ b/audio/libmpd/patches/patch-src_libmpdclient.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libmpdclient.c,v 1.1 2012/03/04 20:10:47 jakllsch Exp $
+Use getaddrinfo(3) even if AI_ADDRCONFIG is missing.
+
+--- src/libmpdclient.c.orig	2010-03-22 03:18:23.000000000 +0000
++++ src/libmpdclient.c
+@@ -64,6 +64,9 @@
+ #define COMMAND_LIST_OK 2
+ 
+ #ifndef MPD_NO_GAI
++#  ifndef AI_ADDRCONFIG
++#    define AI_ADDRCONFIG 0
++#  endif
+ #  ifdef AI_ADDRCONFIG
+ #    define MPD_HAVE_GAI
+ #  endif
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile
index 2990d130ca2f..3c831a611bb2 100644
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/01/16 21:00:00 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2012/03/04 20:10:47 jakllsch Exp $
 #
 
 DISTNAME=	libmpdclient-2.6
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/libmpdclient/distinfo b/audio/libmpdclient/distinfo
index f71f73845714..05327a7d6ed7 100644
--- a/audio/libmpdclient/distinfo
+++ b/audio/libmpdclient/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/01/16 21:00:00 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/03/04 20:10:47 jakllsch Exp $
 
 SHA1 (libmpdclient-2.6.tar.bz2) = 00d88152c0e8599f56d01625da41b55d3a43c264
 RMD160 (libmpdclient-2.6.tar.bz2) = 83dc3a7f57cee7b463e2a1e96fe66b313d35e41f
 Size (libmpdclient-2.6.tar.bz2) = 288343 bytes
+SHA1 (patch-src_resolver.c) = e6622391b2c844969cff2a0c927e3185a27bc81b
diff --git a/audio/libmpdclient/patches/patch-src_resolver.c b/audio/libmpdclient/patches/patch-src_resolver.c
new file mode 100644
index 000000000000..f5ca7b9213ff
--- /dev/null
+++ b/audio/libmpdclient/patches/patch-src_resolver.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_resolver.c,v 1.1 2012/03/04 20:10:47 jakllsch Exp $
+Use getaddrinfo(3) even if AI_ADDRCONFIG is missing.
+
+--- src/resolver.c.orig	2011-10-24 02:43:05.000000000 +0000
++++ src/resolver.c
+@@ -47,6 +47,9 @@
+ #endif
+ 
+ #if defined(ENABLE_TCP) && !defined(MPD_NO_GAI)
++#  ifndef AI_ADDRCONFIG
++#    define AI_ADDRCONFIG 0
++#  endif
+ #  ifdef AI_ADDRCONFIG
+ #    define MPD_HAVE_GAI
+ #  endif