--- /usr/home/simon/ports/audio/cmus/Makefile	Wed Aug 23 13:40:24 2006
+++ /usr/home/simon/ports/audio/cmus/Makefile	Fri Dec 22 20:00:41 2006
@@ -6,7 +6,7 @@ 
 #
 
 PORTNAME=	cmus
-PORTVERSION=	2.0.4
+PORTVERSION=	2.1.0
 CATEGORIES=	audio
 MASTER_SITES=	http://onion.dynserv.net/~timo/files/ \
 		http://mirror.greaterscope.net/cmus/
@@ -26,9 +26,12 @@ 
 OPTIONS=	FLAC "FLAC (Free Lossless Audio Codec) support" Off \
 		MAD "MPEG Audio Decoder (libmad) support" On \
 		MODPLUG "libmodplug (mod, x3m, ...) support" Off \
+		MIKMOD "libmikmod (mod, x3m, ...) support" Off \
 		MUSEPACK "libmpcdec (Musepack .mpc) support" Off \
 		VORBIS "Ogg/Vorbis support" On \
 		TREMOR "Use Tremor as Ogg/Vorbis input plugin" Off \
+		MP4 "MPEG-4 AAC support" Off \
+		AAC "AAC support" Off \
 		LIBAO "Libao cross-platform audio library" Off \
 		ARTS "ARTS support" Off
 
@@ -65,6 +68,14 @@ 
 PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
+.if defined(WITH_MIKMOD)
+LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+=CONFIG_MIKMOD=y
+PLIST_SUB+=	MIKMOD=""
+.else
+PLIST_SUB+=	MIKMOD="@comment "
+.endif
+
 .if defined(WITH_MUSEPACK)
 LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/libmpcdec
 CONFIGURE_ARGS+=CONFIG_MPC=y
@@ -83,6 +94,30 @@ 
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
+.if defined(WITH_TREMOR)
+LIB_DEPENDS+=	vorbisidec:${PORTSDIR}/audio/libtremor
+CONFIGURE_ARGS+=CONFIG_TREMOR=y
+.endif
+
+.if defined(WITH_MP4)
+LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+CONFIGURE_ARGS+=CONFIG_MP4=y
+PLIST_SUB+=	MP4=""
+.else
+CONFIGURE_ARGS+=CONFIG_MP4=n
+PLIST_SUB+=	MP4="@comment "
+.endif
+
+.if defined(WITH_AAC)
+LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+CONFIGURE_ARGS+=CONFIG_AAC=y
+PLIST_SUB+=	AAC=""
+.else
+CONFIGURE_ARGS+=CONFIG_AAC=n
+PLIST_SUB+=	AAC="@comment "
+.endif
+
 .if defined(WITH_LIBAO)
 LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=CONFIG_AO=y
@@ -99,11 +134,6 @@ 
 .else
 CONFIGURE_ARGS+=CONFIG_ARTS=n
 PLIST_SUB+=	ARTS="@comment "
-.endif
-
-.if defined(WITH_TREMOR)
-LIB_DEPENDS+=	vorbisidec:${PORTSDIR}/audio/libtremor
-CONFIGURE_ARGS+=CONFIG_TREMOR=y
 .endif
 
 MAN1=	cmus.1 cmus-remote.1
--- /usr/home/simon/ports/audio/cmus/distinfo	Wed Aug 23 13:40:24 2006
+++ /usr/home/simon/ports/audio/cmus/distinfo	Fri Dec 22 19:17:43 2006
@@ -1,3 +1,3 @@ 
-MD5 (cmus-2.0.4.tar.bz2) = 14e965f672ae0e69042399efeb1bea07
-SHA256 (cmus-2.0.4.tar.bz2) = c3eafe6bbce9c8c57ebc54f4fc0709a5e4c797a7a2289ef394c19f9fbbd22bfa
-SIZE (cmus-2.0.4.tar.bz2) = 138595
+MD5 (cmus-2.1.0.tar.bz2) = 11ca53a05442ee073b6e790e957b1433
+SHA256 (cmus-2.1.0.tar.bz2) = fe47e258918526b9e1b2cd7081d73654af8c326f0f3b0fabe450b805b78423c0
+SIZE (cmus-2.1.0.tar.bz2) = 146956
--- /usr/home/simon/ports/audio/cmus/pkg-descr	Thu Aug 10 18:45:49 2006
+++ /usr/home/simon/ports/audio/cmus/pkg-descr	Fri Dec 22 20:15:36 2006
@@ -1,20 +1,6 @@ 
-CMus is a small and fast music player using the ncurses library.
-CMus has vi-style command interface, e.g. searching using '/' or
-'?' and adding files to playlist ':add ~/foo.ogg'.
-
-  * Plays FLAC, OGG, MP3, WAV, modules
-  * MP3 and Ogg streaming (Shoutcast/Icecast)
-  * WinAmp / XMMS keys "zxcvb"
-  * Can be controlled via UNIX socket
-  * Customizable colors
-  * Nice vi-style interface with tabulator expansion
-  * Background playlist loading
-  * Track metadata database makes adding files to playlist very fast.
-  * Album/artist modes. Playing within one album or artist.
-  * Powerful playlist filters
-  * Can run external commands for the currently selected files
-  * Directory browser
-  * Supports 256 colors
+cmus is a small ncurses based music player. It supports various output methods
+by output-plugins. It has got completely configurable keybindings and it can be
+controlled from the outside via cmus-remote(1).
 
 Author:	Timo Hirvonen <tihirvon@gmail.com>
 WWW:	http://onion.dynserv.net/~timo/cmus.html
--- /usr/home/simon/ports/audio/cmus/pkg-plist	Mon Aug 21 17:17:47 2006
+++ /usr/home/simon/ports/audio/cmus/pkg-plist	Fri Dec 22 19:43:45 2006
@@ -4,8 +4,11 @@ 
 %%FLAC%%lib/cmus/ip/flac.so
 %%MAD%%lib/cmus/ip/mad.so
 %%MODPLUG%%lib/cmus/ip/modplug.so
+%%MIKMOD%%lib/cmus/ip/mikmod.so
 %%MPC%%lib/cmus/ip/mpc.so
 %%VORBIS%%lib/cmus/ip/vorbis.so
+%%MP4%%lib/cmus/ip/mp4.so
+%%AAC%%lib/cmus/ip/aac.so
 lib/cmus/op/oss.so
 %%AO%%lib/cmus/op/ao.so
 %%ARTS%%lib/cmus/op/arts.so