Index: audio/moc/Makefile
===================================================================
--- audio/moc/Makefile	(revision 374114)
+++ audio/moc/Makefile	(working copy)
@@ -2,76 +2,91 @@
 # $FreeBSD$
 
 PORTNAME=	moc
-PORTVERSION=	2.4.4
-PORTREVISION=	18
+PORTVERSION=	2.5.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
+MASTER_SITES=	http://ftp.daper.net/pub/soft/moc/stable/
 
 MAINTAINER=	rzinkov@gmail.com
 COMMENT=	Console audio player designed to be powerful and easy to use
 
+LICENSE=	GPLv2
+
+LIB_DEPENDS=    libltdl.so:${PORTSDIR}/devel/libltdl
+
 USES=		gmake libtool pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+USE_BDB=	yes
+INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--without-sidplay2
 
-OPTIONS_DEFINE=	JACK MP3 FFMPEG MUSEPACK VORBIS FLAC SNDFILE SPEEX SAMPLERATE CURL RCC
+CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
+
+OPTIONS_DEFINE=	AAC CURL DEBUG FFMPEG FLAC JACK MODPLUG MP3 MUSEPACK RCC \
+		SAMPLERATE SNDFILE SPEEX VORBIS WAVPACK
 OPTIONS_DEFAULT=	MP3 VORBIS FLAC CURL
 CURL_DESC=	curl support (Internet streams)
 RCC_DESC=	RCC support
 
+AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_PLIST_FILES=	lib/moc/decoder_plugins/libaac_decoder.so
+AAC_CONFIGURE_OFF=	--without-aac
+
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_OFF=	--without-curl
+
+DEBUG_CONFIGURE_OFF=	--enable-debug=no
+
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_PLIST_FILES=	lib/moc/decoder_plugins/libffmpeg_decoder.so
+FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
+
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_PLIST_FILES=	lib/moc/decoder_plugins/libflac_decoder.so
+FLAC_CONFIGURE_OFF=	--without-flac
+
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_OFF=	--without-jack
 
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_PLIST_FILES=	lib/moc/decoder_plugins/libmodplug_decoder.so
+MODPLUG_CONFIGURE_OFF=	--without-modplug
+
 MP3_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag
-MP3_PLIST_FILES=	lib/moc/decoder_plugins/libmp3_decoder.a \
-		lib/moc/decoder_plugins/libmp3_decoder.so
+			libid3tag.so:${PORTSDIR}/audio/libid3tag
+MP3_PLIST_FILES=	lib/moc/decoder_plugins/libmp3_decoder.so
 MP3_CONFIGURE_OFF=	--without-mp3
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack \
-		libtag_c.so:${PORTSDIR}/audio/taglib
-MUSEPACK_PLIST_FILES=	lib/moc/decoder_plugins/libmusepack_decoder.a \
-		lib/moc/decoder_plugins/libmusepack_decoder.so
+			libtag_c.so:${PORTSDIR}/audio/taglib
+MUSEPACK_PLIST_FILES=	lib/moc/decoder_plugins/libmusepack_decoder.so
 MUSEPACK_CONFIGURE_OFF=	--without-musepack
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-VORBIS_PLIST_FILES=	lib/moc/decoder_plugins/libvorbis_decoder.a \
-		lib/moc/decoder_plugins/libvorbis_decoder.so
-VORBIS_CONFIGURE_OFF=	--without-ogg
+RCC_LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel/librcc \
+			librcd.so:${PORTSDIR}/devel/librcd
+RCC_CONFIGURE_OFF=	--without-rcc
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
-FLAC_PLIST_FILES=	lib/moc/decoder_plugins/libflac_decoder.a \
-		lib/moc/decoder_plugins/libflac_decoder.so
-FLAC_CONFIGURE_OFF=	--without-flac
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_CONFIGURE_OFF=	--without-samplerate
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-FFMPEG_PLIST_FILES=   lib/moc/decoder_plugins/libffmpeg_decoder.a \
-		lib/moc/decoder_plugins/libffmpeg_decoder.so
-FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
-
 SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-SNDFILE_PLIST_FILES=	lib/moc/decoder_plugins/libsndfile_formats_decoder.a \
-		lib/moc/decoder_plugins/libsndfile_formats_decoder.so
+SNDFILE_PLIST_FILES=	lib/moc/decoder_plugins/libsndfile_decoder.so
 SNDFILE_CONFIGURE_OFF=	--without-sndfile
 
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
-SPEEX_PLIST_FILES=	lib/moc/decoder_plugins/libspeex_decoder.a \
-		lib/moc/decoder_plugins/libspeex_decoder.so
+SPEEX_PLIST_FILES=	lib/moc/decoder_plugins/libspeex_decoder.so
 SPEEX_CONFIGURE_OFF=	--without-speex
 
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-SAMPLERATE_CONFIGURE_OFF=	--without-samplerate
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_PLIST_FILES=	lib/moc/decoder_plugins/libvorbis_decoder.so
+VORBIS_CONFIGURE_OFF=	--without-ogg
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-CURL_CONFIGURE_OFF=	--without-curl
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_PLIST_FILES=	lib/moc/decoder_plugins/libwavpack_decoder.so
+WAVPACK_CONFIGURE_OFF=	--without-wavpack
 
-RCC_LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel/librcc \
-		librcd.so:${PORTSDIR}/devel/librcd
-RCC_CONFIGURE_OFF=	--without-rcc
-
 post-patch:
 	@${REINPLACE_CMD} -e '/PKG_CONFIG/ s|alsa|no-&|g' ${WRKSRC}/configure
 
Index: audio/moc/distinfo
===================================================================
--- audio/moc/distinfo	(revision 374114)
+++ audio/moc/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (moc-2.4.4.tar.bz2) = 26bf5707128def20d8b69c0f0c3624a82b7f72c36280bcf86b9b5e8bf8d08b05
-SIZE (moc-2.4.4.tar.bz2) = 699724
+SHA256 (moc-2.5.0.tar.bz2) = d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091
+SIZE (moc-2.5.0.tar.bz2) = 594532
Index: audio/moc/pkg-plist
===================================================================
--- audio/moc/pkg-plist	(revision 374114)
+++ audio/moc/pkg-plist	(working copy)
@@ -1,9 +1,10 @@
 bin/mocp
 man/man1/mocp.1.gz
 share/doc/moc/config.example
+share/doc/moc/keymap.example
+share/doc/moc/README
+share/doc/moc/README_equalizer
 share/doc/moc/THANKS
-share/doc/moc/README
-share/doc/moc/keymap.example
 share/moc/themes/black_theme
 share/moc/themes/darkdot_theme
 share/moc/themes/example_theme