bump
On Thu, 2 Apr 2015, Donovan Watteau wrote:
> Hi,
>
> This diff updates audio/cmus to 2.6.0.
>
> It also merges -flac and -wavpack back into -main, which what I
> should have done in the first place... @conflict and @pkgpath
> markers were added, and devel/quirks stuff too.
>
> I added -ffmpeg for those who need to play more exotic formats
> (while trying to keep "sane" default formats in -main, so that
> you won't usually need ffmpeg and its dependencies). For AAC,
> I've switched from audio/faad to graphics/ffmpeg, because the
> former didn't support proper seeking and such.
>
> sndio output plugin was updated to upstream's version for the
> next release.
>
> Tested on amd64 and loongson.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 10 Mar 2013 22:55:02 -0000 1.8
> +++ Makefile 2 Apr 2015 17:42:15 -0000
> @@ -1,79 +1,85 @@
> # $OpenBSD: Makefile,v 1.8 2013/03/10 22:55:02 espie Exp $
>
> +SHARED_ONLY= Yes
> +
> COMMENT-main= ncurses-based music player
> -COMMENT-flac= FLAC input plugin for cmus
> -COMMENT-wavpack= Wavpack input plugin for cmus
> +COMMENT-ffmpeg= ffmpeg input plugin for cmus
>
> -V= 2.5.0
> -DISTNAME= cmus-v$(V)
> -PKGNAME-main= cmus-$(V)
> -PKGNAME-flac= cmus-flac-$(V)
> -PKGNAME-wavpack= cmus-wavpack-$(V)
> +V= 2.6.0
> +DISTNAME= cmus-${V}
> +PKGNAME-main= ${PKGNAME}
> +PKGNAME-ffmpeg= cmus-ffmpeg-${V}
> +
> +MASTER_SITES= https://github.com/cmus/cmus/archive/
> +DISTFILES= v${V}.tar.gz
> +DIST_SUBDIR= cmus
>
> CATEGORIES= audio
> -
> HOMEPAGE= http://cmus.sourceforge.net/
> +
> MAINTAINER= Donovan Watteau <tso...@gmail.com>
>
> # GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
>
> -EXTRACT_SUFX= .tar.bz2
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/}
> -
> -SHARED_ONLY= Yes
> -MULTI_PACKAGES= -main -flac -wavpack
> +MULTI_PACKAGES= -main -ffmpeg
>
> MODULES= converters/libiconv
>
> -WANTLIB-main= c cdio cdio_cdda cue m mad>=2 ncursesw pthread
> sndio
> -WANTLIB-main+= ${MODLIBICONV_WANTLIB}
> +WANTLIB-main+= c cdio cdio_cdda cue FLAC>=5 m mad>=2 ncursesw
> ogg
> +WANTLIB-main+= opusfile pthread sndio wavpack
> ${MODLIBICONV_WANTLIB}
>
> -LIB_DEPENDS= audio/libcdio audio/libcue audio/libmad
> -
> -LIB_DEPENDS-flac= audio/flac audio/libogg
> -RUN_DEPENDS-flac= audio/cmus
> -WANTLIB-flac= FLAC>=5 ogg m
> -LIB_DEPENDS-wavpack= audio/wavpack ${MODLIBICONV_LIB_DEPENDS}
> -RUN_DEPENDS-wavpack= audio/cmus
> -WANTLIB-wavpack= wavpack m ${MODLIBICONV_WANTLIB}
> +LIB_DEPENDS-main= audio/flac \
> + audio/libcdio \
> + audio/libcue \
> + audio/libmad \
> + audio/libogg \
> + audio/opusfile \
> + audio/wavpack
> +
> +WANTLIB-ffmpeg= avformat swresample
> +LIB_DEPENDS-ffmpeg= graphics/ffmpeg
> +RUN_DEPENDS-ffmpeg= audio/cmus
>
> USE_GMAKE= Yes
>
> CONFIGURE_STYLE= simple
> CONFIGURE_ENV= HOSTCC="${CC}" HOSTLD="${CC}"
> HOST_CFLAGS="${CFLAGS}"
> +CFLAGS+= -Wno-system-headers
> # Note: We're explicitly disabling CONFIG_CDDB as it gets undef'd in cdio.c
> CONFIGURE_ARGS= prefix=${PREFIX} \
> exampledir=${PREFIX}/share/examples/cmus \
> mandir=${PREFIX}/man \
> CONFIG_AAC=n \
> - CONFIG_FFMPEG=n \
> + CONFIG_ALSA=n \
> + CONFIG_AO=n \
> + CONFIG_ARTS=n \
> + CONFIG_CDDB=n \
> + CONFIG_DISCID=n \
> + CONFIG_FFMPEG=y \
> + CONFIG_JACK=n \
> CONFIG_MODPLUG=n \
> CONFIG_MP4=n \
> CONFIG_MPC=n \
> CONFIG_OSS=n \
> - CONFIG_SUN=n \
> - CONFIG_AO=n \
> - CONFIG_ARTS=n \
> CONFIG_PULSE=n \
> - CONFIG_ALSA=n \
> CONFIG_ROAR=n \
> + CONFIG_SAMPLERATE=n \
> CONFIG_SNDIO=y \
> - CONFIG_DISCID=n \
> - CONFIG_CDDB=n
> + CONFIG_SUN=n
>
> .if ${MACHINE_ARCH} == "arm"
> CONFIGURE_ARGS+= CONFIG_TREMOR=y
> -LIB_DEPENDS+= audio/tremor
> +LIB_DEPENDS-main+= audio/tremor
> WANTLIB-main+= vorbisidec>=1
> .else
> -LIB_DEPENDS+= audio/libvorbis
> -WANTLIB-main+= ogg vorbis>=0 vorbisfile>=1
> +LIB_DEPENDS-main+= audio/libvorbis
> +WANTLIB-main+= vorbis>=0 vorbisfile>=1
> .endif
>
> NO_TEST= Yes
>
> -post-patch:
> +pre-configure:
> @cp ${FILESDIR}/sndio.c ${WRKSRC}
> perl -pi -e s,/usr,${LOCALBASE}, ${WRKSRC}/Doc/cmus.txt
> perl -pi -e s,doc/cmus/examples,examples/cmus, ${WRKSRC}/Doc/cmus.txt
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 27 Dec 2012 12:02:33 -0000 1.3
> +++ distinfo 2 Apr 2015 17:42:15 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (cmus-v2.5.0.tar.bz2) = ICH6tkCIiY1i0UOVJew0XiGfWNkanpM9yF6E7aIcjd8=
> -SIZE (cmus-v2.5.0.tar.bz2) = 224675
> +SHA256 (cmus/v2.6.0.tar.gz) = DFPAckMuAm1oLRdJu+iXd1B7MRB8oEr60hqb83Ugjo4=
> +SIZE (cmus/v2.6.0.tar.gz) = 287834
> Index: files/sndio.c
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/files/sndio.c,v
> retrieving revision 1.3
> diff -u -p -r1.3 sndio.c
> --- files/sndio.c 27 Dec 2012 12:02:33 -0000 1.3
> +++ files/sndio.c 2 Apr 2015 17:42:15 -0000
> @@ -35,25 +35,28 @@
>
> static sample_format_t sndio_sf;
> static struct sio_par par;
> -static struct sio_hdl *hdl = NULL;
> -static int sndio_volume = 100;
> +static struct sio_hdl *hdl;
> +static int sndio_volume = SIO_MAXVOL;
> static int sndio_paused;
>
> static int sndio_mixer_set_volume(int l, int r)
> {
> sndio_volume = l > r ? l : r;
>
> - if (hdl != NULL)
> - sio_setvol(hdl, sndio_volume * SIO_MAXVOL / 100);
> + if (hdl == NULL)
> + return -OP_ERROR_NOT_INITIALIZED;
> +
> + if (!sio_setvol(hdl, sndio_volume))
> + return -OP_ERROR_INTERNAL;
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_mixer_get_volume(int *l, int *r)
> {
> *l = *r = sndio_volume;
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_set_sf(sample_format_t sf)
> @@ -86,39 +89,39 @@ static int sndio_set_sf(sample_format_t
> par.bits = 8;
> break;
> default:
> - return -1;
> + return -OP_ERROR_SAMPLE_FORMAT;
> }
>
> par.appbufsz = par.rate * 300 / 1000;
> apar = par;
>
> if (!sio_setpar(hdl, &par))
> - return -1;
> + return -OP_ERROR_INTERNAL;
>
> if (!sio_getpar(hdl, &par))
> - return -1;
> + return -OP_ERROR_INTERNAL;
>
> if (apar.rate != par.rate || apar.pchan != par.pchan ||
> apar.bits != par.bits || (par.bits > 8 && apar.le != par.le) ||
> apar.sig != par.sig)
> - return -1;
> + return -OP_ERROR_INTERNAL;
>
> sndio_mixer_set_volume(sndio_volume, sndio_volume);
>
> if (!sio_start(hdl))
> - return -1;
> + return -OP_ERROR_INTERNAL;
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_init(void)
> {
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_exit(void)
> {
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_close(void)
> @@ -128,21 +131,23 @@ static int sndio_close(void)
> hdl = NULL;
> }
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_open(sample_format_t sf, const channel_position_t
> *channel_map)
> {
> + int ret = 0;
> +
> hdl = sio_open(NULL, SIO_PLAY, 0);
> if (hdl == NULL)
> - return -1;
> + return -OP_ERROR_INTERNAL;
>
> - if (sndio_set_sf(sf) == -1) {
> + if ((ret = sndio_set_sf(sf)) < 0) {
> sndio_close();
> - return -1;
> + return ret;
> }
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_write(const char *buf, int cnt)
> @@ -151,7 +156,7 @@ static int sndio_write(const char *buf,
>
> rc = sio_write(hdl, buf, cnt);
> if (rc == 0)
> - return -1;
> + return -OP_ERROR_INTERNAL;
>
> return rc;
> }
> @@ -169,21 +174,23 @@ static int op_sndio_get_option(int key,
> static int sndio_pause(void)
> {
> if (!sndio_paused) {
> - sio_stop(hdl);
> + if(!sio_stop(hdl))
> + return -OP_ERROR_INTERNAL;
> sndio_paused = 1;
> }
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_unpause(void)
> {
> if (sndio_paused) {
> - sio_start(hdl);
> + if (!sio_start(hdl))
> + return -OP_ERROR_INTERNAL;
> sndio_paused = 0;
> }
>
> - return 0;
> + return OP_ERROR_SUCCESS;
> }
>
> static int sndio_buffer_space(void)
> @@ -206,7 +213,7 @@ static int sndio_mixer_exit(void)
>
> static int sndio_mixer_open(int *volume_max)
> {
> - *volume_max = 100;
> + *volume_max = SIO_MAXVOL;
>
> return OP_ERROR_SUCCESS;
> }
> Index: patches/patch-Doc_cmus_txt
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/patches/patch-Doc_cmus_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-Doc_cmus_txt
> --- patches/patch-Doc_cmus_txt 18 Sep 2011 13:27:53 -0000 1.1
> +++ patches/patch-Doc_cmus_txt 2 Apr 2015 17:42:15 -0000
> @@ -1,7 +1,10 @@
> $OpenBSD: patch-Doc_cmus_txt,v 1.1 2011/09/18 13:27:53 landry Exp $
> ---- Doc/cmus.txt.orig Sun Jul 24 11:42:22 2011
> -+++ Doc/cmus.txt Sun Sep 4 22:55:19 2011
> -@@ -860,7 +860,7 @@ id3_default_charset (ISO-8859-1)
> +
> +Add sndio support.
> +
> +--- Doc/cmus.txt.orig Mon Aug 11 09:48:28 2014
> ++++ Doc/cmus.txt Wed Jan 28 21:19:49 2015
> +@@ -932,7 +932,7 @@ icecast_default_charset (ISO-8859-1)
> lib_sort (artist album discnumber tracknumber title filename) [`Sort Keys`]
> Sort keys for the sorted library view (2).
>
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/patches/patch-Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-Makefile
> --- patches/patch-Makefile 6 Sep 2011 07:10:56 -0000 1.1.1.1
> +++ patches/patch-Makefile 2 Apr 2015 17:42:15 -0000
> @@ -1,7 +1,11 @@
> $OpenBSD: patch-Makefile,v 1.1.1.1 2011/09/06 07:10:56 landry Exp $
> ---- Makefile.orig Thu May 26 20:47:33 2011
> -+++ Makefile Mon Jul 4 16:23:00 2011
> -@@ -139,6 +139,7 @@ alsa-objs := alsa.lo mixer_alsa.lo
> +
> +Add sndio support.
> +Fix install(1) usage.
> +
> +--- Makefile.orig Mon Aug 11 09:48:28 2014
> ++++ Makefile Wed Jan 28 22:31:48 2015
> +@@ -165,6 +165,7 @@ jack-objs := jack.lo
> arts-objs := arts.lo
> oss-objs := oss.lo mixer_oss.lo
> sun-objs := sun.lo mixer_sun.lo
> @@ -9,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2011/
> ao-objs := ao.lo
> waveout-objs := waveout.lo
> roar-objs := roar.lo
> -@@ -148,6 +149,7 @@ op-$(CONFIG_ALSA) += alsa.so
> +@@ -175,6 +176,7 @@ op-$(CONFIG_JACK) += jack.so
> op-$(CONFIG_ARTS) += arts.so
> op-$(CONFIG_OSS) += oss.so
> op-$(CONFIG_SUN) += sun.so
> @@ -17,7 +21,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2011/
> op-$(CONFIG_AO) += ao.so
> op-$(CONFIG_WAVEOUT) += waveout.so
> op-$(CONFIG_ROAR) += roar.so
> -@@ -157,6 +159,7 @@ $(alsa-objs): CFLAGS += $(ALSA_CFLAGS)
> +@@ -185,6 +187,7 @@ $(jack-objs): CFLAGS += $(JACK_CFLAGS)
> $(arts-objs): CFLAGS += $(ARTS_CFLAGS)
> $(oss-objs): CFLAGS += $(OSS_CFLAGS)
> $(sun-objs): CFLAGS += $(SUN_CFLAGS)
> @@ -25,13 +29,42 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2011/
> $(ao-objs): CFLAGS += $(AO_CFLAGS)
> $(waveout-objs): CFLAGS += $(WAVEOUT_CFLAGS)
> $(roar-objs): CFLAGS += $(ROAR_CFLAGS)
> -@@ -175,6 +178,9 @@ oss.so: $(oss-objs) $(libcmus-y)
> -
> +@@ -207,6 +210,9 @@ oss.so: $(oss-objs) $(libcmus-y)
> sun.so: $(sun-objs) $(libcmus-y)
> $(call cmd,ld_dl,$(SUN_LIBS))
> -+
> +
> +sndio.so: $(sndio-objs) $(libcmus-y)
> + $(call cmd,ld_dl,$(SNDIO_LIBS))
> -
> ++
> ao.so: $(ao-objs) $(libcmus-y)
> $(call cmd,ld_dl,$(AO_LIBS))
> +
> +@@ -250,17 +256,21 @@ plugins: $(ip-y) $(op-y)
> + man: $(man1) $(man7)
> +
> + install-main: main
> +- $(INSTALL) -m755 $(bindir) cmus cmus-remote
> ++ ${BSD_INSTALL_PROGRAM} cmus cmus-remote $(DESTDIR)$(bindir)
> +
> + install-plugins: plugins
> +- $(INSTALL) -m755 $(libdir)/cmus/ip $(ip-y)
> +- $(INSTALL) -m755 $(libdir)/cmus/op $(op-y)
> ++ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(libdir)/cmus/ip
> ++ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(libdir)/cmus/op
> ++ ${BSD_INSTALL_PROGRAM} $(ip-y) $(DESTDIR)$(libdir)/cmus/ip
> ++ ${BSD_INSTALL_PROGRAM} $(op-y) $(DESTDIR)$(libdir)/cmus/op
> +
> + install-data: man
> +- $(INSTALL) -m644 $(datadir)/cmus $(data)
> +- $(INSTALL) -m644 $(mandir)/man1 $(man1)
> +- $(INSTALL) -m644 $(mandir)/man7 $(man7)
> +- $(INSTALL) -m755 $(exampledir) cmus-status-display
> ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(datadir)/cmus
> ++ ${BSD_INSTALL_DATA} $(data) $(DESTDIR)$(datadir)/cmus
> ++ ${BSD_INSTALL_MAN} $(man1) $(DESTDIR)$(mandir)/man1
> ++ ${BSD_INSTALL_MAN} $(man7) $(DESTDIR)$(mandir)/man7
> ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(exampledir)
> ++ ${BSD_INSTALL_SCRIPT} cmus-status-display $(DESTDIR)$(exampledir)
> +
> + install: all install-main install-plugins install-data
> +
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/patches/patch-configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-configure
> --- patches/patch-configure 27 Dec 2012 12:02:33 -0000 1.2
> +++ patches/patch-configure 2 Apr 2015 17:42:15 -0000
> @@ -1,19 +1,10 @@
> $OpenBSD: patch-configure,v 1.2 2012/12/27 12:02:33 gonzalo Exp $
> -Remove -Wredundant-decls which makes a lot of useless noise on
> -OpenBSD because of some problems in system headers.
> -(+ sndio support)
> ---- configure.orig Wed Nov 7 09:46:17 2012
> -+++ configure Wed Nov 7 19:18:57 2012
> -@@ -5,7 +5,7 @@
> - check_cflags()
> - {
> - check_cc_flag -std=gnu99 -pipe -Wall -Wshadow -Wcast-align
> -Wpointer-arith \
> -- -Wwrite-strings -Wundef -Wmissing-prototypes -Wredundant-decls \
> -+ -Wwrite-strings -Wundef -Wmissing-prototypes \
> - -Wextra -Wno-sign-compare -Wformat-security
> -
> - for i in -Wdeclaration-after-statement \
> -@@ -307,6 +307,16 @@ check_sun()
> +
> +Add sndio support.
> +
> +--- configure.orig Mon Aug 11 09:48:28 2014
> ++++ configure Wed Jan 28 23:16:32 2015
> +@@ -324,6 +324,16 @@ check_sun()
> fi
> }
>
> @@ -30,7 +21,7 @@ OpenBSD because of some problems in syst
> check_waveout()
> {
> case `uname -s` in
> -@@ -438,6 +448,7 @@ Optional Features: y/n
> +@@ -459,6 +469,7 @@ Optional Features: y/n
> CONFIG_ARTS ARTS [auto]
> CONFIG_OSS Open Sound System [auto]
> CONFIG_SUN Sun Audio [auto]
> @@ -38,7 +29,7 @@ OpenBSD because of some problems in syst
> CONFIG_WAVEOUT Windows Wave Out [auto]
> USE_FALLBACK_IP Use a specific IP for every unrecognized [n]
> input format. Currently set to FFMPEG.
> -@@ -499,6 +510,7 @@ check check_ao CONFIG_AO
> +@@ -523,6 +534,7 @@ check check_ao CONFIG_AO
> check check_arts CONFIG_ARTS
> check check_oss CONFIG_OSS
> check check_sun CONFIG_SUN
> @@ -46,11 +37,11 @@ OpenBSD because of some problems in syst
> check check_waveout CONFIG_WAVEOUT
> check check_roar CONFIG_ROAR
>
> -@@ -535,6 +547,6 @@ CFLAGS="${CFLAGS} -DHAVE_CONFIG"
> +@@ -560,6 +572,6 @@ CFLAGS="${CFLAGS} -DHAVE_CONFIG"
>
> makefile_vars bindir datadir libdir mandir exampledir
> - makefile_vars CONFIG_CDIO CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD
> CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4
> CONFIG_AAC CONFIG_FFMPEG CONFIG_CUE
> --makefile_vars CONFIG_ROAR CONFIG_PULSE CONFIG_ALSA CONFIG_AO CONFIG_ARTS
> CONFIG_OSS CONFIG_SUN CONFIG_WAVEOUT
> -+makefile_vars CONFIG_ROAR CONFIG_PULSE CONFIG_ALSA CONFIG_AO CONFIG_ARTS
> CONFIG_OSS CONFIG_SUN CONFIG_SNDIO CONFIG_WAVEOUT
> + makefile_vars CONFIG_CDIO CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD
> CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_OPUS CONFIG_WAVPACK CONFIG_WAV
> CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG CONFIG_CUE
> +-makefile_vars CONFIG_ROAR CONFIG_PULSE CONFIG_ALSA CONFIG_JACK
> CONFIG_SAMPLERATE CONFIG_AO CONFIG_ARTS CONFIG_OSS CONFIG_SUN CONFIG_WAVEOUT
> ++makefile_vars CONFIG_ROAR CONFIG_PULSE CONFIG_ALSA CONFIG_JACK
> CONFIG_SAMPLERATE CONFIG_AO CONFIG_ARTS CONFIG_OSS CONFIG_SUN CONFIG_SNDIO
> CONFIG_WAVEOUT
>
> generate_config_mk
> Index: patches/patch-lib_c
> ===================================================================
> RCS file: patches/patch-lib_c
> diff -N patches/patch-lib_c
> --- patches/patch-lib_c 27 Dec 2012 12:02:33 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-lib_c,v 1.1 2012/12/27 12:02:33 gonzalo Exp $
> -
> -Commit 2b3144f69d upstream ("lib: fix segfault caused by player-prev")
> -
> ---- lib.c.orig Wed Nov 7 09:46:17 2012
> -+++ lib.c Sun Nov 18 19:45:38 2012
> -@@ -271,7 +271,7 @@ static struct tree_track *normal_get_prev(void)
> - if (!repeat)
> - return NULL;
> - /* last track of the album */
> -- return to_tree_track(rb_prev(&CUR_ALBUM->tree_node));
> -+ return album_last_track(CUR_ALBUM);
> - }
> -
> - /* not first album of the artist? */
> Index: pkg/DESCR-ffmpeg
> ===================================================================
> RCS file: pkg/DESCR-ffmpeg
> diff -N pkg/DESCR-ffmpeg
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/DESCR-ffmpeg 2 Apr 2015 17:42:15 -0000
> @@ -0,0 +1 @@
> +ffmpeg input plugin for cmus.
> Index: pkg/DESCR-flac
> ===================================================================
> RCS file: pkg/DESCR-flac
> diff -N pkg/DESCR-flac
> --- pkg/DESCR-flac 6 Sep 2011 07:19:29 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -FLAC input plugin for cmus.
> Index: pkg/DESCR-wavpack
> ===================================================================
> RCS file: pkg/DESCR-wavpack
> diff -N pkg/DESCR-wavpack
> --- pkg/DESCR-wavpack 6 Sep 2011 07:19:29 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -Wavpack input plugin for cmus.
> Index: pkg/PLIST-ffmpeg
> ===================================================================
> RCS file: pkg/PLIST-ffmpeg
> diff -N pkg/PLIST-ffmpeg
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PLIST-ffmpeg 2 Apr 2015 17:42:15 -0000
> @@ -0,0 +1,3 @@
> +@comment $OpenBSD$
> +@conflict cmus-<2.6.0
> +lib/cmus/ip/ffmpeg.so
> Index: pkg/PLIST-flac
> ===================================================================
> RCS file: pkg/PLIST-flac
> diff -N pkg/PLIST-flac
> --- pkg/PLIST-flac 6 Sep 2011 07:10:56 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -@comment $OpenBSD: PLIST-flac,v 1.1.1.1 2011/09/06 07:10:56 landry Exp $
> -lib/cmus/ip/flac.so
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/audio/cmus/pkg/PLIST-main,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-main
> --- pkg/PLIST-main 27 Dec 2012 12:02:33 -0000 1.2
> +++ pkg/PLIST-main 2 Apr 2015 17:42:15 -0000
> @@ -1,13 +1,19 @@
> @comment $OpenBSD: PLIST-main,v 1.2 2012/12/27 12:02:33 gonzalo Exp $
> +@conflict cmus-<2.6.0
> +@pkgpath audio/cmus,-flac
> +@pkgpath audio/cmus,-wavpack
> @bin bin/cmus
> @bin bin/cmus-remote
> lib/cmus/
> lib/cmus/ip/
> lib/cmus/ip/cdio.so
> lib/cmus/ip/cue.so
> +lib/cmus/ip/flac.so
> lib/cmus/ip/mad.so
> +lib/cmus/ip/opus.so
> lib/cmus/ip/vorbis.so
> lib/cmus/ip/wav.so
> +lib/cmus/ip/wavpack.so
> lib/cmus/op/
> lib/cmus/op/sndio.so
> @man man/man1/cmus-remote.1
> @@ -19,7 +25,10 @@ share/cmus/default.theme
> share/cmus/gray-88.theme
> share/cmus/green-mono-88.theme
> share/cmus/green.theme
> +share/cmus/night.theme
> share/cmus/rc
> +share/cmus/solarized-dark.theme
> +share/cmus/solarized-light.theme
> share/cmus/xterm-white.theme
> share/cmus/zenburn.theme
> share/examples/cmus/
> Index: pkg/PLIST-wavpack
> ===================================================================
> RCS file: pkg/PLIST-wavpack
> diff -N pkg/PLIST-wavpack
> --- pkg/PLIST-wavpack 6 Sep 2011 07:10:56 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -@comment $OpenBSD: PLIST-wavpack,v 1.1.1.1 2011/09/06 07:10:56 landry Exp $
> -lib/cmus/ip/wavpack.so
>
>
>
> And here's devel/quirks update:
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.213
> diff -u -p -r1.213 Makefile
> --- Makefile 2 Apr 2015 11:58:29 -0000 1.213
> +++ Makefile 2 Apr 2015 17:50:57 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-2.59
> +PKGNAME = quirks-2.60
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.221
> diff -u -p -r1.221 Quirks.pm
> --- files/Quirks.pm 2 Apr 2015 11:58:29 -0000 1.221
> +++ files/Quirks.pm 2 Apr 2015 17:50:57 -0000
> @@ -361,6 +361,9 @@ my $stem_extensions = {
> 'ruby-dbus' => 'ruby21-dbus',
> 'polarssl' => 'mbedtls',
> 'mscore' => 'musescore',
> +# 5.8
> + 'cmus-flac' => 'cmus',
> + 'cmus-wavpack' => 'cmus',
> };
>
> # reasons for obsolete packages
>
