Hi,
small updates, i only fought a bit with meson in the mpc update. Using
it now on amd64, probably needs testing on other archs.
cf https://www.musicpd.org/news/2018/02/mpd-0-20-17-released/ &
https://www.musicpd.org/news/2018/02/mpd-0-20-18-released/
is there a particular reason for sticking with an old version ?
Landry
? mpd/mpd-0.18.10_rev2.diff
? mpd/patch-src_Compiler_h
Index: mpc/Makefile
===================================================================
RCS file: /cvs/ports/audio/mpc/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- mpc/Makefile 23 Mar 2017 18:45:45 -0000 1.24
+++ mpc/Makefile 6 Apr 2018 19:39:14 -0000
@@ -2,10 +2,10 @@
COMMENT= command line client for mpd
-VER= 0.28
+VER= 0.29
DISTNAME= mpc-${VER}
-REVISION= 0
CATEGORIES= audio
+EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://www.musicpd.org/clients/mpc/
@@ -18,20 +18,10 @@
LIB_DEPENDS= audio/libmpdclient>=2.2 \
converters/libiconv
+BUILD_DEPENDS += textproc/py-sphinx
MASTER_SITES= http://www.musicpd.org/download/mpc/${VER:R}/
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= ac_cv_func_iconv=yes
+MODULES= devel/meson
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -liconv"
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpc
- ${INSTALL_SCRIPT} \
- ${WRKSRC}/doc/mpd-m3u-handler.sh \
- ${WRKSRC}/doc/mpd-pls-handler.sh \
- ${WRKSRC}/doc/mppledit \
- ${PREFIX}/share/examples/mpc
- ${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash \
- ${PREFIX}/share/examples/mpc
.include <bsd.port.mk>
Index: mpc/distinfo
===================================================================
RCS file: /cvs/ports/audio/mpc/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- mpc/distinfo 22 Aug 2016 11:44:46 -0000 1.14
+++ mpc/distinfo 6 Apr 2018 19:39:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpc-0.28.tar.gz) = UzhcLZrwoAJZQwRbRssgebMAwSJNYVrJj3/xQOloYA0=
-SIZE (mpc-0.28.tar.gz) = 139563
+SHA256 (mpc-0.29.tar.xz) = AvHa7JAstI+M2qb+Icchn2IxsJHd2+Q3o6T7EssHudM=
+SIZE (mpc-0.29.tar.xz) = 41872
Index: mpc/patches/patch-Makefile_in
===================================================================
RCS file: mpc/patches/patch-Makefile_in
diff -N mpc/patches/patch-Makefile_in
--- mpc/patches/patch-Makefile_in 22 Aug 2016 11:44:46 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.10 2016/08/22 11:44:46 dcoppa Exp $
---- Makefile.in.orig Thu Aug 18 12:53:03 2016
-+++ Makefile.in Mon Aug 22 13:43:33 2016
-@@ -301,9 +301,7 @@ top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
- man_MANS = doc/mpc.1
--doc_DATA = AUTHORS COPYING NEWS README \
-- doc/mpd-m3u-handler.sh doc/mpd-pls-handler.sh doc/mppledit \
-- doc/mpc-completion.bash
-+doc_DATA = AUTHORS COPYING NEWS README
-
- EXTRA_DIST = $(man_MANS) $(doc_DATA)
- src_mpc_SOURCES = src/main.c src/mpc.h src/list.c src/list.h \
Index: mpc/patches/patch-doc_meson_build
===================================================================
RCS file: mpc/patches/patch-doc_meson_build
diff -N mpc/patches/patch-doc_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mpc/patches/patch-doc_meson_build 6 Apr 2018 19:39:14 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+only build manpage, and install it in correct dir
+
+Index: doc/meson.build
+--- doc/meson.build.orig
++++ doc/meson.build
+@@ -1,23 +1,14 @@
+ sphinx = find_program('sphinx-build', required:false)
+
+ if sphinx.found()
+- custom_target(
+- 'HTML documentation',
+- output: 'html',
+- input: ['index.rst', 'conf.py'],
+- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+- build_by_default: true,
+- install: true,
+- install_dir: join_paths(get_option('datadir'), 'doc',
meson.project_name()),
+- )
+
+ custom_target(
+ 'Manpage documentation',
+- output: 'man',
++ output: 'man1',
+ input: ['index.rst', 'conf.py'],
+ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+ build_by_default: true,
+ install: true,
+- install_dir: join_paths(get_option('datadir'), 'man', 'man1'),
++ install_dir: get_option('mandir')
+ )
+ endif
Index: mpc/patches/patch-meson_build
===================================================================
RCS file: mpc/patches/patch-meson_build
diff -N mpc/patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mpc/patches/patch-meson_build 6 Apr 2018 19:39:14 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+workaround broken iconv detection
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -12,16 +12,7 @@ conf = configuration_data()
+ conf.set_quoted('PACKAGE', meson.project_name())
+ conf.set_quoted('VERSION', meson.project_version())
+
+-iconv = get_option('iconv')
+-if iconv == 'false'
+- iconv = false
+-elif cc.has_function('iconv')
+- iconv = true
+-elif iconv == 'auto'
+- iconv = false
+-else
+- error('iconv() not available')
+-endif
++iconv = true
+ conf.set('HAVE_ICONV', iconv)
+
+ configure_file(output: 'config.h', configuration: conf)
Index: mpc/patches/patch-src_command_c
===================================================================
RCS file: mpc/patches/patch-src_command_c
diff -N mpc/patches/patch-src_command_c
--- mpc/patches/patch-src_command_c 23 Mar 2017 18:45:45 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_command_c,v 1.10 2017/03/23 18:45:45 dcoppa Exp $
-
-commit 0191d38753cee57fcb72e191d9627043837414aa
-Author: Max Kellermann <m...@musicpd.org>
-Date: Wed Mar 8 16:13:29 2017 +0100
-
-command: add missing parentheses around bit shift
-
---- src/command.c.orig Thu Aug 18 13:10:08 2016
-+++ src/command.c Thu Mar 23 19:41:21 2017
-@@ -618,7 +618,7 @@ cmd_update(int argc, char **argv, struct mpd_connectio
- /* is our last queued update finished now? */
-
- if (current_id == 0 || current_id > id ||
-- (id > 1 << 30 && id < 1000)) /* wraparound */
-+ (id > (1 << 30) && id < 1000)) /* wraparound */
- break;
- }
-
Index: mpc/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/mpc/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- mpc/pkg/PLIST 4 Mar 2012 16:57:19 -0000 1.3
+++ mpc/pkg/PLIST 6 Apr 2018 19:39:14 -0000
@@ -5,9 +5,8 @@
share/doc/mpc/AUTHORS
share/doc/mpc/COPYING
share/doc/mpc/NEWS
-share/doc/mpc/README
-share/examples/mpc/
-share/examples/mpc/mpc-completion.bash
-share/examples/mpc/mpd-m3u-handler.sh
-share/examples/mpc/mpd-pls-handler.sh
-share/examples/mpc/mppledit
+share/doc/mpc/README.rst
+share/doc/mpc/contrib/
+share/doc/mpc/contrib/mpc-completion.bash
+share/doc/mpc/contrib/mpd-m3u-handler.sh
+share/doc/mpc/contrib/mpd-pls-handler.sh
Index: mpd/Makefile
===================================================================
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.114
diff -u -r1.114 Makefile
--- mpd/Makefile 11 Jan 2018 19:27:01 -0000 1.114
+++ mpd/Makefile 6 Apr 2018 19:39:14 -0000
@@ -2,8 +2,7 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.20.10
-REVISION = 1
+VER = 0.20.18
DISTNAME = mpd-${VER}
CATEGORIES = audio
HOMEPAGE = http://www.musicpd.org/
Index: mpd/distinfo
===================================================================
RCS file: /cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.47
diff -u -r1.47 distinfo
--- mpd/distinfo 25 Aug 2017 10:06:59 -0000 1.47
+++ mpd/distinfo 6 Apr 2018 19:39:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.20.10.tar.gz) = NUzYfjFMNZ9zmF2CzSPnbXlVOXFlgLMQrN9ePl6mBPs=
-SIZE (mpd-0.20.10.tar.gz) = 1118169
+SHA256 (mpd-0.20.18.tar.gz) = pODRR/fRL/dg3DCSiFLj+klBqClSQ0kZGYugQJ7IrTw=
+SIZE (mpd-0.20.18.tar.gz) = 1137008
Index: libmpdclient/Makefile
===================================================================
RCS file: /cvs/ports/audio/libmpdclient/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- libmpdclient/Makefile 28 Oct 2017 13:28:06 -0000 1.19
+++ libmpdclient/Makefile 6 Apr 2018 19:39:14 -0000
@@ -2,12 +2,11 @@
COMMENT= library for interfacing MPD
-VER= 2.13
+VER= 2.14
DISTNAME= libmpdclient-${VER}
SHARED_LIBS= mpdclient 3.0 # 2.13
CATEGORIES= audio
HOMEPAGE= https://www.musicpd.org/libs/libmpdclient/
-REVISION= 0
MAINTAINER= David Coppa <dco...@openbsd.org>
Index: libmpdclient/distinfo
===================================================================
RCS file: /cvs/ports/audio/libmpdclient/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- libmpdclient/distinfo 11 Aug 2017 08:57:16 -0000 1.10
+++ libmpdclient/distinfo 6 Apr 2018 19:39:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (libmpdclient-2.13.tar.xz) =
URW9UrwgpwfB7MdYfmOJwXMFNI4hMqZs92fGL8Ve1F0=
-SIZE (libmpdclient-2.13.tar.xz) = 56964
+SHA256 (libmpdclient-2.14.tar.xz) =
CoTieRv+MHfPIu4XhMgF1btVCAPf/lajmqNpCjgGE3I=
+SIZE (libmpdclient-2.14.tar.xz) = 58268
