- update to moc-2.5.2

- mirror distfile as upstream master site tends to be flaky

audio/moc/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2017/11/18 12:01:14 jasper Exp $
 
 COMMENT =	console audio player
-DISTNAME =	moc-2.5.1
+DISTNAME =	moc-2.5.2
 CATEGORIES =	audio
 HOMEPAGE =	http://moc.daper.net/
-MASTER_SITES =	http://ftp.daper.net/pub/soft/moc/stable/
+MASTER_SITES =	http://ftp.daper.net/pub/soft/moc/stable/ \
+		https://distfiles.nl/
 EXTRACT_SUFX =	.tar.bz2
-REVISION =	5
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM = Yes
 # uses pledge()
 WANTLIB += FLAC avcodec avformat avutil bz2 c crypto curl db
 WANTLIB += faad gsm iconv id3tag intl ltdl m mad magic mp3lame mpcdec
-WANTLIB += ncursesw nghttp2 ogg opus pthread samplerate sndfile sndio
+WANTLIB += ncurses nghttp2 ogg opus pthread samplerate sndfile sndio
 WANTLIB += speex ssl ${COMPILER_LIBCXX} swresample tag tag_c vorbis vorbisenc
 WANTLIB += vorbisfile vpx wavpack x264 x265 xvidcore z
 

audio/moc/distinfo

@@ -1,2 +1,2 @@
-SHA256 (moc-2.5.1.tar.bz2) = G0Gcdakqhf9O52cMZdZgyG/vMgMsZeiehouYj4D6xPI=
-SIZE (moc-2.5.1.tar.bz2) = 580329
+SHA256 (moc-2.5.2.tar.bz2) = 86aBFWAqR4i3z6m76Tl6nV4kxoy2GldpXRwsPs9J2wg=
+SIZE (moc-2.5.2.tar.bz2) = 602728

audio/moc/patches/patch-config_example_in

@@ -1,9 +1,10 @@
-$OpenBSD: patch-config_example_in,v 1.1.1.1 2016/07/10 10:40:43 czarkoff Exp $
+$OpenBSD: patch-config_example_in,v 1.2 2017/11/18 12:01:14 jasper Exp $
 
 Remove audio choices that are irrelevant on OpenBSD.
 
---- config.example.in.orig	Mon Jun 29 12:07:21 2015
-+++ config.example.in	Mon Jun 29 12:08:03 2015
+Index: config.example.in
+--- config.example.in.orig
++++ config.example.in
 @@ -121,32 +121,10 @@
  #
  #HTTPProxy =
@@ -36,5 +37,5 @@ Remove audio choices that are irrelevant on OpenBSD.
 -#ALSAMixer1 = PCM
 -#ALSAMixer2 = Master
  
- # Save software mixer state?
- # If enabled, a file 'softmixer' will be created in '~/.moc/' storing the
+ # Under some circumstances on 32-bit systems, audio played continously
+ # for long periods of time may begin to stutter.  Setting this option to

audio/moc/patches/patch-main_c

@@ -1,10 +1,11 @@
-$OpenBSD: patch-main_c,v 1.2 2016/07/11 07:51:31 czarkoff Exp $
+$OpenBSD: patch-main_c,v 1.3 2017/11/18 12:01:14 jasper Exp $
 
  * pledge(2)
  * remove srand(3) (see patch-playlist_c)
 
---- main.c.orig	Sun Apr 24 06:23:30 2016
-+++ main.c	Mon Jul 11 08:57:56 2016
+Index: main.c
+--- main.c.orig
++++ main.c
 @@ -174,6 +174,8 @@ static void start_moc (const struct parameters *params
  			case 0: /* child - start server */
  				set_me_server ();
@@ -14,10 +15,10 @@ $OpenBSD: patch-main_c,v 1.2 2016/07/11 07:51:31 czarkoff Exp $
  				rc = write (notify_pipe[1], &i, sizeof(i));
  				if (rc < 0)
  					fatal ("write() to notify pipe failed: %s",
-@@ -207,10 +209,14 @@ static void start_moc (const struct parameters *params
- 	else if (params->foreground && params->only_server) {
+@@ -208,10 +210,14 @@ static void start_moc (const struct parameters *params
  		set_me_server ();
  		list_sock = server_init (params->debug, params->foreground);
+ 		signal (SIGCHLD, sig_chld);
 +		if (pledge("stdio rpath wpath cpath inet unix dns audio", NULL) == -1)
 +			fatal ("pledge() failed: %s", strerror(errno));
  		server_loop (list_sock);
@@ -29,7 +30,7 @@ $OpenBSD: patch-main_c,v 1.2 2016/07/11 07:51:31 czarkoff Exp $
  		signal (SIGPIPE, SIG_IGN);
  		if (ping_server(server_sock)) {
  			if (!params->dont_run_iface) {
-@@ -799,6 +805,9 @@ int main (int argc, char *argv[])
+@@ -800,6 +806,9 @@ int main (int argc, char *argv[])
  	struct utsname uts;
  #endif
  
@@ -39,7 +40,7 @@ $OpenBSD: patch-main_c,v 1.2 2016/07/11 07:51:31 czarkoff Exp $
  #ifdef PACKAGE_REVISION
  	logit ("This is Music On Console (revision %s)", PACKAGE_REVISION);
  #else
-@@ -851,11 +860,12 @@ int main (int argc, char *argv[])
+@@ -852,11 +861,12 @@ int main (int argc, char *argv[])
  	io_init ();
  	rcc_init ();
  	decoder_init (params.debug);