Update to libmpdclient-2.13

audio/libmpdclient/Makefile

@@ -1,23 +1,29 @@
-# $OpenBSD: Makefile,v 1.17 2017/03/23 07:23:53 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.18 2017/08/11 08:57:16 dcoppa Exp $
 
 COMMENT=		library for interfacing MPD
 
-VER=			2.11
+VER=			2.13
 DISTNAME=		libmpdclient-${VER}
-SHARED_LIBS=		mpdclient 2.2	# 2.11
+SHARED_LIBS=		mpdclient 3.0	# 2.13
 CATEGORIES=		audio
-HOMEPAGE=		http://www.musicpd.org/libs/libmpdclient/
+HOMEPAGE=		https://www.musicpd.org/libs/libmpdclient/
 
 MAINTAINER=		David Coppa <dcoppa@openbsd.org>
 
 # 3-BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		http://www.musicpd.org/download/libmpdclient/${VER:R}/
+MASTER_SITES=		https://www.musicpd.org/download/libmpdclient/${VER:R}/
 
-USE_GMAKE=		Yes
+EXTRACT_SUFX=		.tar.xz
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--disable-documentation
+MODULES=		devel/meson
+
+### XXX the meson MODULE should handle these
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/meson.build
+post-install:
+	rm ${PREFIX}/lib/libmpdclient.so
+###
 
 .include <bsd.port.mk>

audio/libmpdclient/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libmpdclient-2.11.tar.gz) = JJ1RDJYULxTIxF9fj2vYJL/UX1NMw4aqYMpJKrL5jt4=
-SIZE (libmpdclient-2.11.tar.gz) = 400389
+SHA256 (libmpdclient-2.13.tar.xz) = URW9UrwgpwfB7MdYfmOJwXMFNI4hMqZs92fGL8Ve1F0=
+SIZE (libmpdclient-2.13.tar.xz) = 56964

audio/libmpdclient/patches/patch-meson_build

@@ -0,0 +1,15 @@
+$OpenBSD: patch-meson_build,v 1.1 2017/08/11 08:57:16 dcoppa Exp $
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -144,8 +144,7 @@ libmpdclient = library('mpdclient',
+     platform_deps,
+   ],
+   link_args: common_ldflags,
+-  version: meson.project_version(),
+-  soversion: splitted_version[0],
++  soversion: '${LIBmpdclient_VERSION}',
+   install: true
+ )
+ libmpdclient_dep = declare_dependency(link_with: libmpdclient)

audio/libmpdclient/patches/patch-src_sync_c

@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_sync_c,v 1.2 2015/03/17 15:59:48 dcoppa Exp $
+$OpenBSD: patch-src_sync_c,v 1.3 2017/08/11 08:57:16 dcoppa Exp $
 --- src/sync.c.orig	Mon Feb 23 15:50:40 2015
 +++ src/sync.c	Tue Mar 17 10:52:58 2015
 @@ -36,6 +36,7 @@
- #ifndef WIN32
+ #ifndef _WIN32
  #include <sys/select.h>
  #endif
 +#include <string.h>

audio/libmpdclient/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2017/03/23 07:23:53 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.7 2017/08/11 08:57:16 dcoppa Exp $
 include/mpd/
 include/mpd/async.h
 include/mpd/audio_format.h
@@ -34,14 +34,13 @@ include/mpd/status.h
 include/mpd/sticker.h
 include/mpd/tag.h
 include/mpd/version.h
-lib/libmpdclient.a
-lib/libmpdclient.la
 @lib lib/libmpdclient.so.${LIBmpdclient_VERSION}
 lib/pkgconfig/libmpdclient.pc
 share/doc/libmpdclient/
+share/doc/libmpdclient/AUTHORS
 share/doc/libmpdclient/COPYING
 share/doc/libmpdclient/NEWS
-share/doc/libmpdclient/README
+share/doc/libmpdclient/README.rst
 share/vala/
 share/vala/vapi/
 share/vala/vapi/libmpdclient.vapi