On Sun, Nov 19 2017, Klemens Nanni <k...@posteo.org> wrote: > On Sun, Nov 19, 2017 at 06:20:55PM +0100, Jeremie Courreges-Anglas wrote: >> On Wed, Nov 15 2017, Klemens Nanni <k...@posteo.org> wrote: >> > On Wed, Nov 15, 2017 at 11:27:35PM +0100, Klemens Nanni wrote: >> >> 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. >> > Rephrasing since NO_TEST=Yes is not an option:
Hah, I overlooked this part in your previous mail... >> > There are test targets >> > defined in build.ninja but it doesn't seem to run the actual test. >> > >> > I'm no ninja/meson expert so how should we handle this? `make test' >> > yielding no tests and returning zero seems broken to me. >> >> It's fine, see NO_TEST in bsd.port.mk(5). ... thus my answer may sound a bit redundant. > "It should be left alone for ports with empty regression tests, and for > ports with failing tests" reads to me as "do not set NO_TEST" in this > particular case; where am I wrong? You're not wrong, you shouldn't use NO_TEST=Yes. Just deal with it? :) Updated diff that drops the meson patches. curses and color support seem to be properly detected. The tarball diff between 0.28 and 0.29 is pretty short: https://pbot.rmdir.de/qKjDT9I7l8tYQsfw3wOAiA The "fix crash after losing MPD connection" change appears effective here. The post-install tweak looks like a question of taste though, I may strip it before I commit the diff below (unless David shows up before the usual 7 days timeout). Index: Makefile =================================================================== RCS file: /d/cvs/ports/audio/ncmpc/Makefile,v retrieving revision 1.36 diff -u -p -r1.36 Makefile --- Makefile 28 Oct 2017 13:28:06 -0000 1.36 +++ Makefile 19 Nov 2017 18:04:14 -0000 @@ -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 @@ -29,9 +28,7 @@ LIB_DEPENDS= devel/gettext \ devel/glib2 \ audio/libmpdclient>=2.4 -CONFIGURE_ARGS= -Dcolors=ncursesw \ - -Dcurses=ncursesw \ - -Dlirc=false \ +CONFIGURE_ARGS= -Dlirc=false \ -Dlocale=true \ -Dmouse=true CONFIGURE_ENV= CPP=${CPP} \ @@ -42,7 +39,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> Index: distinfo =================================================================== RCS file: /d/cvs/ports/audio/ncmpc/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 26 Sep 2017 09:55:07 -0000 1.14 +++ distinfo 19 Nov 2017 17:49:11 -0000 @@ -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 Index: patches/patch-meson_build =================================================================== RCS file: patches/patch-meson_build diff -N patches/patch-meson_build --- patches/patch-meson_build 26 Sep 2017 09:55:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,100 +0,0 @@ -$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) - - conf.set('ENABLE_MULTIBYTE', get_option('multibyte')) - --curses = get_option('curses') --if curses == 'ncursesw' -- curses_dep = dependency('ncursesw') --elif curses == 'ncurses' -- curses_dep = dependency('ncurses') --else -- curses_dep = dependency('ncursesw', required: false) -- if curses_dep.found() -- curses = 'ncursesw' -- else -- curses_dep = dependency('ncurses', required: false) -+conf.set('HAVE_NCURSESW', true) -+conf.set('HAVE_NCURSES_H', true) -+conf.set('HAVE_CURSES_ENHANCED', true) -+conf.set('HAVE_GETMOUSE', true) - -- if curses_dep.found() -- curses = 'ncurses' -- else -- # TODO: find other curses implementation (pdcurses?) -- endif -- endif --endif -- --if curses == 'ncursesw' -- conf.set('HAVE_NCURSESW', true) -- curses_enhanced = true -- curses_color = true -- if cc.has_header('ncursesw/curses.h', dependencies: curses_dep) -- conf.set('HAVE_NCURSESW_CURSES_H', true) -- elif cc.has_header('ncursesw.h', dependencies: curses_dep) -- conf.set('HAVE_NCURSESW_H', true) -- else -- error('No ncursesw header found') -- endif --elif curses == 'ncurses' -- conf.set('HAVE_NCURSES', true) -- curses_enhanced = true -- curses_color = true -- if cc.has_header('ncurses/curses.h', dependencies: curses_dep) -- conf.set('HAVE_NCURSES_CURSES_H', true) -- elif cc.has_header('ncurses.h', dependencies: curses_dep) -- conf.set('HAVE_NCURSES_H', true) -- else -- error('No ncurses header found') -- endif --else -- if cc.has_header('curses.h', dependencies: curses_dep) -- conf.set('HAVE_CURSES_H', true) -- -- # TODO: test this with pdcurses -- curses_enhanced = cc.has_header_symbol('curses.h', '_XOPEN_CURSES', dependencies: curses_dep) -- curses_color = curses_enhanced or cc.has_header_symbol('curses.h', 'COLOR_PAIR', dependencies: curses_dep) -- else -- error('No curses header found') -- endif --endif --conf.set('HAVE_CURSES_ENHANCED', curses_enhanced) -- --enable_mouse = get_option('mouse') --if enable_mouse == 'false' -- enable_mouse = false --elif cc.has_function('getmouse', dependencies: curses_dep) -- enable_mouse = true --elif enable_mouse == 'auto' -- enable_mouse = false --else -- error('getmouse() not available') --endif --conf.set('HAVE_GETMOUSE', enable_mouse) -- - enable_lirc = get_option('lirc') - if enable_lirc == 'false' - enable_lirc = false -@@ -142,7 +80,7 @@ else - endif - conf.set('ENABLE_LIRC', enable_lirc) - --conf.set('ENABLE_COLORS', curses_color) -+conf.set('ENABLE_COLORS', true) - - common_cflags = [ - # for getaddrinfo() and sigaction() with glibc -@@ -350,7 +288,6 @@ ncmpc = executable('ncmpc', - include_directories: inc, - dependencies: [ - glib_dep, -- curses_dep, - lirc_dep, - libmpdclient_dep, - ], Index: patches/patch-test_meson_build =================================================================== RCS file: patches/patch-test_meson_build diff -N patches/patch-test_meson_build --- patches/patch-test_meson_build 26 Sep 2017 09:55:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-test_meson_build,v 1.1 2017/09/26 09:55:07 dcoppa Exp $ - -Index: test/meson.build ---- test/meson.build.orig -+++ test/meson.build -@@ -7,7 +7,6 @@ executable( - ), - include_directories: inc, - dependencies: [ -- curses_dep, - glib_dep, - ], - ) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
