Here's a simple update to the bug fix release:
* fix crash after losing MPD connection
* fix crash after DNS lookup error
While here, switch sites to HTTPS and shorten shell parameter expansion
a bit.
Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST?
$ make -s test
===> Regression tests for ncmpc-0.29v0
ninja: Entering directory `/usr/obj/ports/ncmpc-0.29/build-amd64'
[0/1] Running all tests.
No tests defined.
Feedback? Any takers?
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 3c7296f6a35..0a9ff2799af 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -2,13 +2,12 @@
COMMENT= curses based frontend for mpd
-VER= 0.28
+VER= 0.29
DISTNAME= ncmpc-${VER}
EPOCH= 0
CATEGORIES= audio
-REVISION= 0
-HOMEPAGE= http://www.musicpd.org/clients/ncmpc/
+HOMEPAGE= https://www.musicpd.org/clients/ncmpc/
MAINTAINER= David Coppa <dco...@openbsd.org>
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c glib-2.0 intl mpdclient>=1 ncursesw
-MASTER_SITES= http://www.musicpd.org/download/ncmpc/${VER:R}/
+MASTER_SITES= https://www.musicpd.org/download/ncmpc/${VER:R}/
EXTRACT_SUFX= .tar.xz
@@ -42,7 +41,7 @@ CONFIGURE_ENV= CPP=${CPP} \
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ncmpc
- mv ${PREFIX}/share/doc/ncmpc/{config.sample,keys.sample,ncmpc.lirc} \
+ mv ${PREFIX}/share/doc/ncmpc/{{config,keys}.sample,ncmpc.lirc} \
${PREFIX}/share/examples/ncmpc/
.include <bsd.port.mk>
diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo
index b503f98aac7..d44cc8162fb 100644
--- a/audio/ncmpc/distinfo
+++ b/audio/ncmpc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.28.tar.xz) = 9m5bb++Dvf2js++vP7rWpNjEe7GztoEL7UTT41sAeAQ=
-SIZE (ncmpc-0.28.tar.xz) = 233724
+SHA256 (ncmpc-0.29.tar.xz) = 72iptnFyOD6oDuRleQFRCUM/oFhyiBLSsOvt5mDYXxI=
+SIZE (ncmpc-0.29.tar.xz) = 233876
diff --git a/audio/ncmpc/patches/patch-meson_build
b/audio/ncmpc/patches/patch-meson_build
index 9c5bf14598f..6807cf7c69a 100644
--- a/audio/ncmpc/patches/patch-meson_build
+++ b/audio/ncmpc/patches/patch-meson_build
@@ -3,7 +3,7 @@ $OpenBSD: patch-meson_build,v 1.1 2017/09/26 09:55:07 dcoppa
Exp $
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -55,73 +55,11 @@ conf.set('ENABLE_ASYNC_CONNECT', async_connect)
+@@ -55,78 +55,11 @@ conf.set('ENABLE_ASYNC_CONNECT', async_connect)
conf.set('ENABLE_MULTIBYTE', get_option('multibyte'))
@@ -26,6 +26,11 @@ Index: meson.build
- if curses_dep.found()
- curses = 'ncurses'
- else
+- curses_dep = cc.find_library('ncursesw', required: false)
+- if not curses_dep.found()
+- curses_dep = cc.find_library('ncurses')
+- endif
+-
- # TODO: find other curses implementation (pdcurses?)
- endif
- endif
@@ -81,7 +86,7 @@ Index: meson.build
enable_lirc = get_option('lirc')
if enable_lirc == 'false'
enable_lirc = false
-@@ -142,7 +80,7 @@ else
+@@ -147,7 +80,7 @@ else
endif
conf.set('ENABLE_LIRC', enable_lirc)
@@ -90,7 +95,7 @@ Index: meson.build
common_cflags = [
# for getaddrinfo() and sigaction() with glibc
-@@ -350,7 +288,6 @@ ncmpc = executable('ncmpc',
+@@ -359,7 +292,6 @@ ncmpc = executable('ncmpc',
include_directories: inc,
dependencies: [
glib_dep,
