moc: Update to 2.5.2

pkgsrc changes:

* support wide-curses, enabled by default so I can read my song titles.
* support for alsa, enabled by default on linux
* support for more file formats
* pkglint fixes

2.5.2

New configuration file options:
    ALSAStutterDefeat: avoid the ALSA bug which causes stuttering
Significant bug fixes:
    Fixed error during configure on busybox systems
    Fixed calculation of average bitrate in FLAC decoder
    Fixed unintentional disabling of MMAP support
    Fixed build failure on split ncurses/tinfo systems
    Fixed unreaped children when running in foreground mode
    Fixed freeze on Nokia devices if audios play to completion
    Circumvented ALSA stutter bug
    Added missing 'Precache' option to example config file
Miscellaneous:
    Improved the accuracy of the average bitrate for FLAC
    Mitigated out-of-file seeking for several formats
    Warn of TagLib version requirement rising to 1.5
    Warn of Musepack library changing to libmpc (from libmpcdec)

2.5.1

Significant bug fixes:
    Corrected the setting of linked libraries for Berkeley DB
    Fixed ALSA volume setting problem (Tomasz Golinski)
    Fixed clearing of stream status message on error
    Resolved FFmpeg/LibAV's downmixing API issues (Andreas Cadhalpun)
    Removed duplicate logging of fatal error messages
Miscellaneous:
    Adapted to FFmpeg 3.0 API
    Warn of FFmpeg/LibAV version requirement rising to 1.0/10.0
    Warn of pending POSIX.1-2001 compliance requirement
    Fixed several warnings and errors on OpenBSD (Brent Cook)
    Fixed various (and potential) segfaults (Daniel T. Borelli, Hendrik Iben, Rastislav Barlik)
    Fixed various resource leakages
    Silenced various compiler warnings
    Added instructions on building with autoreconf

9 files changed, 147 insertions, 188 deletions

diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index b935baf7a7c..82bf3cfcfea 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2018/12/13 19:51:41 adam Exp $
+# $NetBSD: Makefile,v 1.39 2019/06/11 11:54:56 nia Exp $
 
-DISTNAME=		moc-2.5.0
-PKGREVISION=		11
+DISTNAME=		moc-2.5.2
 CATEGORIES=		audio
 MASTER_SITES=		http://ftp.daper.net/pub/soft/moc/stable/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		peter.schuller@infidyne.com
-HOMEPAGE=		http://moc.daper.net/
+HOMEPAGE=		https://moc.daper.net/
 COMMENT=		Curses based console audio player
 LICENSE=		gnu-gpl-v2
 
@@ -15,14 +14,37 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
-# XXX: Only needed to regen configure script
-#USE_TOOLS+=		autoconf automake
+USE_LANGUAGES=		c c++
 
+SUBST_CLASSES+=		eq
+SUBST_STAGE.eq=		pre-configure
+SUBST_FILES.eq=		configure
+SUBST_SED.eq=		-e 's," == "," = ",g'
+SUBST_MESSAGE.eq=	Fixing non-portable == in test
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
-SUBST_FILES.oss=	config.example options.c
+SUBST_FILES.oss=	config.example.in options.c
 SUBST_SED.oss=		-e s,/dev/dsp,${DEVOSSAUDIO},g
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
+.endif
+
+.if ${OSS_TYPE} == "none"
+CONFIGURE_ARGS+=	--without-oss
+.endif
+
+# not in pkgsrc?
+CONFIGURE_ARGS+=	--without-rcc
+
+# no buildlink?
+CONFIGURE_ARGS+=	--without-timidity
+
+# if you're one of the two people with music collections in musepack,
+# want this, and can get it to work, please send a patch
+CONFIGURE_ARGS+=	--without-musepack
 
 BUILDLINK_TRANSFORM+=	l:db:db4
 
@@ -32,19 +54,12 @@ LDFLAGS.SunOS+=		-lsocket
 # It is harmless.
 CHECK_WRKREF_SKIP=	bin/mocp
 
-# XXX: This target is [currently] for regenerating configure to add the
-# XXX: sched_get_priority_max check of librt.
-#pre-configure:
-#	cd ${WRKSRC} && autoreconf -v -i
-
 .include "options.mk"
-
 .include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../sysutils/file/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/moc/PLIST b/audio/moc/PLIST
index e85053a5d72..07c4751c0be 100644
--- a/audio/moc/PLIST
+++ b/audio/moc/PLIST
@@ -1,10 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2016/02/16 08:46:01 leot Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/06/11 11:54:56 nia Exp $
 bin/mocp
+${PLIST.faad}lib/moc/decoder_plugins/libaac_decoder.la
+${PLIST.ffmpeg}lib/moc/decoder_plugins/libffmpeg_decoder.la
 ${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la
-lib/moc/decoder_plugins/libmp3_decoder.la
+${PLIST.modplug}lib/moc/decoder_plugins/libmodplug_decoder.la
+${PLIST.mad}lib/moc/decoder_plugins/libmp3_decoder.la
+${PLIST.sidplay}lib/moc/decoder_plugins/libsidplay2_decoder.la
 ${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_decoder.la
 ${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la
 ${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la
+${PLIST.wavpack}lib/moc/decoder_plugins/libwavpack_decoder.la
 man/man1/mocp.1
 share/doc/moc/README
 share/doc/moc/README_equalizer
diff --git a/audio/moc/distinfo b/audio/moc/distinfo
index 38bf44f0f6d..78c3dba632b 100644
--- a/audio/moc/distinfo
+++ b/audio/moc/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.13 2017/02/16 13:31:44 maya Exp $
+$NetBSD: distinfo,v 1.14 2019/06/11 11:54:56 nia Exp $
 
-SHA1 (moc-2.5.0.tar.bz2) = a02c10075541995771dbdccb7f2d0ecd19d70b81
-RMD160 (moc-2.5.0.tar.bz2) = 0c5d927b7c8ef54338ff6970f9e5d4f71dcb6168
-SHA512 (moc-2.5.0.tar.bz2) = ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c
-Size (moc-2.5.0.tar.bz2) = 594532 bytes
-SHA1 (patch-ab) = 37a3cc45df7b528613ce5c714c95895988f1570c
-SHA1 (patch-ad) = 4d4d73f819717698b37ca937477989b010adb5c8
-SHA1 (patch-decoder__plugins_vorbis_vorbis.m4) = 50f2967146be40a6d6b881cdffe5f25c4c226175
-SHA1 (patch-playlist__file.c) = cc2d5280992d713c846bfe16e8869238df6dca5d
+SHA1 (moc-2.5.2.tar.bz2) = 9d27a929b63099416263471c16367997c0ae6dba
+RMD160 (moc-2.5.2.tar.bz2) = 3b965b4f173f1d217b4dfb071376d989bdc8d2ff
+SHA512 (moc-2.5.2.tar.bz2) = 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
+Size (moc-2.5.2.tar.bz2) = 602728 bytes
+SHA1 (patch-alsa.c) = 7d603757dae2c1a749ab3d0ebd7bdeee18e6dc5e
+SHA1 (patch-playlist__file.c) = 0cda1917aca55341981dff94bcbb177af1be3de2
diff --git a/audio/moc/options.mk b/audio/moc/options.mk
index 9d6618a884f..99117d5ddd4 100644
--- a/audio/moc/options.mk
+++ b/audio/moc/options.mk
@@ -1,71 +1,121 @@
-# $NetBSD: options.mk,v 1.6 2016/02/16 08:46:01 leot Exp $
+# $NetBSD: options.mk,v 1.7 2019/06/11 11:54:56 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.moc
-PKG_SUPPORTED_OPTIONS=	sndfile flac vorbis speex curl samplerate jack
-PKG_SUGGESTED_OPTIONS=	sndfile flac vorbis curl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.moc
+
+PKG_SUPPORTED_OPTIONS+=		curl faad flac mad sndfile vorbis
+PKG_SUPPORTED_OPTIONS+=		alsa ffmpeg jack modplug samplerate
+PKG_SUPPORTED_OPTIONS+=		sidplay speex wavpack wide-curses
+
+PKG_SUGGESTED_OPTIONS+=		curl faad flac mad sndfile vorbis wide-curses
+PKG_SUGGESTED_OPTIONS.Linux+=	alsa
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		flac sndfile speex vorbis
+PLIST_VARS+=	faad ffmpeg flac mad modplug sidplay sndfile
+PLIST_VARS+=	speex vorbis wavpack
+
+.if !empty(PKG_OPTIONS:Malsa)
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-alsa
+.endif
+
+.if !empty(PKG_OPTIONS:Mcurl)
+.  include "../../www/curl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-curl
+.endif
+
+.if !empty(PKG_OPTIONS:Mfaad)
+PLIST.faad=		yes
+.  include "../../audio/faad2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-aac
+.endif
+
+.if !empty(PKG_OPTIONS:Mffmpeg)
+PLIST.ffmpeg=		yes
+.  include "../../multimedia/ffmpeg3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-ffmpeg
+.endif
+
+.if !empty(PKG_OPTIONS:Mflac)
+PLIST.flac=		yes
+.  include "../../audio/flac/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-flac
+.endif
 
 .if !empty(PKG_OPTIONS:Mjack)
-CONFIGURE_ARGS+=	--with-jack
 ###
 ### Resampling support is usually required with jack.
 ###
 .  include "../../audio/jack/buildlink3.mk"
-.  if empty(PKG_OPTIONS:Msamplerate)
-PKG_OPTIONS+=		samplerate
-.  endif
+.  include "../../audio/libsamplerate/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
 
+.if !empty(PKG_OPTIONS:Mmad)
+PLIST.mad=		yes
+.  include "../../audio/libmad/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-mp3
+.endif
+
+.if !empty(PKG_OPTIONS:Mmodplug)
+PLIST.modplug=		yes
+.  include "../../audio/libmodplug/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-modplug
+.endif
+
 .if !empty(PKG_OPTIONS:Msamplerate)
-CONFIGURE_ARGS+=	--with-samplerate
-.  if empty(PKG_OPTIONS:Msndfile)
-PKG_OPTIONS+=		sndfile
-.  endif
 .  include "../../audio/libsamplerate/buildlink3.mk"
 .else
+.  if empty(PKG_OPTIONS:Mjack)
 CONFIGURE_ARGS+=	--without-samplerate
+.  endif
+.endif
+
+.if !empty(PKG_OPTIONS:Msidplay)
+PLIST.sidplay=		yes
+.  include "../../audio/libsidplay2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-sidplay2
 .endif
 
 .if !empty(PKG_OPTIONS:Msndfile)
 PLIST.sndfile=		yes
-CONFIGURE_ARGS+=	--with-sndfile
 .  include "../../audio/libsndfile/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-sndfile
 .endif
 
-.if !empty(PKG_OPTIONS:Mflac)
-PLIST.flac=		yes
-CONFIGURE_ARGS+=	--with-flac
-.  include "../../audio/flac/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mspeex)
+PLIST.speex=		yes
+.  include "../../audio/speex/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-flac
+CONFIGURE_ARGS+=	--without-speex
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
 PLIST.vorbis=		yes
-CONFIGURE_ARGS+=	--with-vorbis
 .  include "../../audio/libvorbis/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
-.if !empty(PKG_OPTIONS:Mspeex)
-PLIST.speex=		yes
-CONFIGURE_ARGS+=	--with-speex
-.  include "../../audio/speex/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mwavpack)
+PLIST.wavpack=		yes
+.  include "../../audio/wavpack/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-speex
+CONFIGURE_ARGS+=	--without-wavpack
 .endif
 
-.if !empty(PKG_OPTIONS:Mcurl)
-CONFIGURE_ARGS+=	--with-curl
-.  include "../../www/curl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-curl
+.if !empty(PKG_OPTIONS:Mwide-curses)
+# handled by curses.buildlink3.mk
+# XXX i'm not sure why this is needed
+FAKE_NCURSES=		yes
 .endif
diff --git a/audio/moc/patches/patch-ab b/audio/moc/patches/patch-ab
deleted file mode 100644
index cae4bfd183b..00000000000
--- a/audio/moc/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2016/02/16 08:46:01 leot Exp $
-
-Check for sched_get_priority_max being in -lrt.
-
---- configure.in.orig	2014-08-30 02:32:27.000000000 +0000
-+++ configure.in
-@@ -95,7 +95,10 @@ AC_CHECK_HEADERS([fcntl.h string.h strin
- 		 AC_MSG_ERROR([Can't find required header files.]))
- AC_CHECK_HEADERS([sys/select.h byteswap.h])
- 
--AC_CHECK_FUNCS([sched_get_priority_max])
-+AC_CHECK_FUNCS([sched_get_priority_max], ,
-+	       [AC_CHECK_LIB([rt], 
-+		[sched_get_priority_max], 
-+		[EXTRA_LIBS="$EXTRA_LIBS -lrt"])])
- 
- dnl langinfo
- AC_CHECK_HEADERS([langinfo.h])
diff --git a/audio/moc/patches/patch-ad b/audio/moc/patches/patch-ad
deleted file mode 100644
index e8c8bc17c7e..00000000000
--- a/audio/moc/patches/patch-ad
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2016/02/16 08:46:01 leot Exp $
-
-regen after patching configure.in:
-
-- check for sched_get_priority_max being in -lrt
-
---- configure.orig	2014-08-30 02:35:05.000000000 +0000
-+++ configure
-@@ -24142,6 +24142,72 @@ eval as_val=\$$as_ac_var
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
-+else
-+  { echo "$as_me:$LINENO: checking for sched_get_priority_max in -lrt" >&5
-+echo $ECHO_N "checking for sched_get_priority_max in -lrt... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rt_sched_get_priority_max+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sched_get_priority_max ();
-+int
-+main ()
-+{
-+return sched_get_priority_max ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_rt_sched_get_priority_max=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rt_sched_get_priority_max=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sched_get_priority_max" >&5
-+echo "${ECHO_T}$ac_cv_lib_rt_sched_get_priority_max" >&6; }
-+if test $ac_cv_lib_rt_sched_get_priority_max = yes; then
-+  EXTRA_LIBS="$EXTRA_LIBS -lrt"
-+fi
-+
- fi
- done
- 
-@@ -25065,6 +25131,7 @@ if ac_fn_c_try_link "$LINENO"; then :
-   mp_cv_ncursesw=yes
- else
-   mp_cv_ncursesw=no
-+  LIBS="$mp_save_LIBS"
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
-@@ -28271,7 +28338,7 @@ if test "${with_vorbis+set}" = set; then
- fi
- 
- 
--if test "x$with_vorbis" == "xtremor"
-+if test "x$with_vorbis" = "xtremor"
- then
- 
- pkg_failed=no
diff --git a/audio/moc/patches/patch-alsa.c b/audio/moc/patches/patch-alsa.c
new file mode 100644
index 00000000000..c1dc6654208
--- /dev/null
+++ b/audio/moc/patches/patch-alsa.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-alsa.c,v 1.1 2019/06/11 11:54:56 nia Exp $
+
+Build on NetBSD.
+
+--- alsa.c.orig	2016-11-16 00:54:37.000000000 +0000
++++ alsa.c
+@@ -36,6 +36,10 @@
+ #include "options.h"
+ #include "log.h"
+ 
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
++
+ #define BUFFER_MAX_USEC	300000
+ 
+ static snd_pcm_t *handle = NULL;
diff --git a/audio/moc/patches/patch-decoder__plugins_vorbis_vorbis.m4 b/audio/moc/patches/patch-decoder__plugins_vorbis_vorbis.m4
deleted file mode 100644
index 10f77e03745..00000000000
--- a/audio/moc/patches/patch-decoder__plugins_vorbis_vorbis.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-decoder__plugins_vorbis_vorbis.m4,v 1.1 2016/02/16 08:46:01 leot Exp $
-
-Avoid the use of "==" operator in test(1).
-
---- decoder_plugins/vorbis/vorbis.m4.orig	2012-07-05 06:51:44.000000000 +0000
-+++ decoder_plugins/vorbis/vorbis.m4
-@@ -3,7 +3,7 @@ dnl vorbis
- AC_ARG_WITH(vorbis, AS_HELP_STRING([--without-vorbis],
-                                    [Compile without Ogg Vorbis support]))
- 
--if test "x$with_vorbis" == "xtremor"
-+if test "x$with_vorbis" = "xtremor"
- then
- 	PKG_CHECK_MODULES(OGG_VORBIS,
- 			  [vorbisidec >= 1.0],
diff --git a/audio/moc/patches/patch-playlist__file.c b/audio/moc/patches/patch-playlist__file.c
index 2a5c72dfdda..f7056d066ce 100644
--- a/audio/moc/patches/patch-playlist__file.c
+++ b/audio/moc/patches/patch-playlist__file.c
@@ -1,4 +1,9 @@
-$NetBSD: patch-playlist__file.c,v 1.2 2016/02/16 08:46:01 leot Exp $
+$NetBSD: patch-playlist__file.c,v 1.3 2019/06/11 11:54:56 nia Exp $
+
+flock is a BSD extension.
+
+XXX maybe this can be removed:
+https://github.com/illumos/illumos-gate/commit/7a5aac98bc37534537d4896efd4efd30627d221e
 
 --- playlist_file.c.orig	2014-08-30 02:31:51.000000000 +0000
 +++ playlist_file.c