Index: multimedia/qmmp/Makefile
===================================================================
--- multimedia/qmmp/Makefile	(revision 377004)
+++ multimedia/qmmp/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.8.0
-PORTREVISION=	6
+PORTVERSION=	0.8.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/
 
@@ -90,7 +89,8 @@
 FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
 FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
 
-CDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
+	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CDIO_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
 CDIO_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
 
@@ -169,7 +169,7 @@
 CUE_CMAKE_ON=	-DUSE_CUE:BOOL=TRUE
 CUE_CMAKE_OFF=	-DUSE_CUE:BOOL=FALSE
 
-NULLOUT_DESC=	Support a null output
+NULLOUT_DESC=	Support null output
 NULLOUT_CMAKE_ON=	-DUSE_NULL:BOOL=TRUE
 NULLOUT_CMAKE_OFF=	-DUSE_NULL:BOOL=FALSE
 
@@ -315,14 +315,8 @@
 	${RM} -f ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
-		>> ${WRKDIR}/PLIST.doc ; \
-	${FIND} ${STAGEDIR}${DOCSDIR}/html -type d | \
-		${SED} 's|${STAGEDIR}${PREFIX}/|@dirrm |' \
-		| ${SORT} -r >> ${WRKDIR}/PLIST.doc
+		>> ${WRKDIR}/PLIST.doc
 .endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/qmmp -type d | \
-		${SED} 's|${STAGEDIR}${PREFIX}/|@dirrmtry |' \
-		| ${SORT} -r >> ${WRKDIR}/PLIST.doc ; \
 	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: multimedia/qmmp/distinfo
===================================================================
--- multimedia/qmmp/distinfo	(revision 377004)
+++ multimedia/qmmp/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.8.0.tar.bz2) = 61f44646ffd3f1d90b93607076a405160be5d9736e91c9739c80070bc5357439
-SIZE (qmmp-0.8.0.tar.bz2) = 977600
+SHA256 (qmmp-0.8.3.tar.bz2) = 9e73518adf011e60e36c18d55d05845f8103b4af61351e26edb6c105390dd949
+SIZE (qmmp-0.8.3.tar.bz2) = 991403
Index: multimedia/qmmp/pkg-plist
===================================================================
--- multimedia/qmmp/pkg-plist	(revision 377004)
+++ multimedia/qmmp/pkg-plist	(working copy)
@@ -123,16 +123,4 @@
 share/icons/hicolor/scalable/apps/qmmp-simple.svgz
 %%KDENOTIFY%%%%DATADIR%%/images/app_icon.png
 %%KDENOTIFY%%%%DATADIR%%/images/empty_cover.png
-%%KDENOTIFY%%@dirrm %%DATADIR%%/images
-%%KDENOTIFY%%@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrm include/qmmp
-@dirrm include/qmmpui
 @comment Insert PLIST.doc here
Index: multimedia/qmmp-plugin-pack/Makefile
===================================================================
--- multimedia/qmmp-plugin-pack/Makefile	(revision 377004)
+++ multimedia/qmmp-plugin-pack/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	0.8.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/
 
@@ -54,12 +53,6 @@
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MFFAP} || ${PORT_OPTIONS:MMPG123}
-PLIST_SUB+=	INPUT=""
-.else
-PLIST_SUB+=	INPUT="@comment "
-.endif
-
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
 
Index: multimedia/qmmp-plugin-pack/distinfo
===================================================================
--- multimedia/qmmp-plugin-pack/distinfo	(revision 377004)
+++ multimedia/qmmp-plugin-pack/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.8.0.tar.bz2) = 9cde3320115d1f70d34e336d38e5cb6646a9e347b62efae5f958925eadc5d25d
-SIZE (qmmp-plugin-pack-0.8.0.tar.bz2) = 154739
+SHA256 (qmmp-plugin-pack-0.8.3.tar.bz2) = 7b45464429a44f0de9f611ec4c2d396752c3be19e3b8076f8909cb18930589f0
+SIZE (qmmp-plugin-pack-0.8.3.tar.bz2) = 163989
Index: multimedia/qmmp-plugin-pack/pkg-plist
===================================================================
--- multimedia/qmmp-plugin-pack/pkg-plist	(revision 377004)
+++ multimedia/qmmp-plugin-pack/pkg-plist	(working copy)
@@ -1,6 +1,3 @@
 %%FFAP%%lib/qmmp/Input/libffap.so
 %%MPG123%%lib/qmmp/Input/libmpg123.so
 %%QSUI%%lib/qmmp/Ui/libqsui.so
-%%INPUT%%@dirrmtry lib/qmmp/Input
-%%QSUI%%@dirrmtry lib/qmmp/Ui
-@dirrmtry lib/qmmp