diff -ruN -ruN --exclude=CVS /usr/ports/audio/cmus/Makefile /usr/home/simon/src/ports/audio/cmus/Makefile
--- /usr/ports/audio/cmus/Makefile	Thu Aug 10 18:45:49 2006
+++ /usr/home/simon/src/ports/audio/cmus/Makefile	Thu Aug 17 16:06:44 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://onion.dynserv.net/~timo/files/ \
 		http://mirror.greaterscope.net/cmus/
@@ -27,12 +28,16 @@
 		MODPLUG "libmodplug (mod, x3m, ...) support" Off \
 		MUSEPACK "libmpcdec (Musepack .mpc) support" Off \
 		VORBIS "Ogg/Vorbis support" On \
-		LIBAO "Libao cross-platform audio library" On \
+		LIBAO "Libao cross-platform audio library" Off \
 		ARTS "ARTS support" Off \
 		TREMOR "Use Tremor as Ogg/Vorbis input plugin" Off
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile on FreeBSD 4.X
+.endif
+
 .if defined(WITH_FLAC)
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=CONFIG_FLAC=y
@@ -105,11 +110,6 @@
 
 post-extract:
 	@${REINPLACE_CMD} -e 's,-lncursesw,-lncurses,g' ${WRKSRC}/configure
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL} ${WRKSRC}/cmus-status-display ${EXAMPLESDIR}
-.endif
+	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>
diff -ruN -ruN --exclude=CVS /usr/ports/audio/cmus/pkg-plist /usr/home/simon/src/ports/audio/cmus/pkg-plist
--- /usr/ports/audio/cmus/pkg-plist	Thu Aug 10 18:45:49 2006
+++ /usr/home/simon/src/ports/audio/cmus/pkg-plist	Thu Aug 17 16:02:33 2006
@@ -15,8 +15,8 @@
 %%DATADIR%%/green-mono-88.theme
 %%DATADIR%%/rc
 %%DATADIR%%/xterm-white.theme
-%%PORTDOCS%%%%EXAMPLESDIR%%/cmus-status-display
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/cmus-status-display
+@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
 @dirrm lib/cmus/op
 @dirrm lib/cmus/ip