Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-24 Thread Jeremie Courreges-Anglas 

Committed, thanks.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-19 Thread Klemens Nanni 
On Sun, Nov 19, 2017 at 07:34:13PM +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Nov 19 2017, Klemens Nanni  wrote:
> > On Sun, Nov 19, 2017 at 06:20:55PM +0100, Jeremie Courreges-Anglas wrote:
> >> On Wed, Nov 15 2017, Klemens Nanni  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 -  1.36
> +++ Makefile  19 Nov 2017 18:04:14 -
> @@ -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 
>  
> @@ -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 
> 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 -  1.14
> +++ distinfo  19 Nov 2017 17:49:11 -
> @@ -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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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'
> --

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-19 Thread Jeremie Courreges-Anglas 
On Sun, Nov 19 2017, Klemens Nanni  wrote:
> On Sun, Nov 19, 2017 at 06:20:55PM +0100, Jeremie Courreges-Anglas wrote:
>> On Wed, Nov 15 2017, Klemens Nanni  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
--- Makefile28 Oct 2017 13:28:06 -  1.36
+++ Makefile19 Nov 2017 18:04:14 -
@@ -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 
 
@@ -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 
Index: distinfo
===
RCS file: /d/cvs/ports/audio/ncmpc/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo26 Sep 2017 09:55:07 -  1.14
+++ distinfo19 Nov 2017 17:49:11 -
@@ -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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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)

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-19 Thread Klemens Nanni 
On Sun, Nov 19, 2017 at 06:20:55PM +0100, Jeremie Courreges-Anglas wrote:
> On Wed, Nov 15 2017, Klemens Nanni  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: 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).
"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?

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-19 Thread Jeremie Courreges-Anglas 
On Wed, Nov 15 2017, Klemens Nanni  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: 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).

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-15 Thread Klemens Nanni 
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: 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.

[UPDATE] audio/ncmpc 0.28 -> 0.29

2017-11-15 Thread Klemens Nanni 
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 
 
@@ -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 
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,