Index: multimedia/qmmp/Makefile
===================================================================
--- multimedia/qmmp/Makefile	(revision 405270)
+++ multimedia/qmmp/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -15,7 +15,7 @@
 
 USES=		cmake:outsource desktop-file-utils pkgconfig tar:bzip2
 USE_QT4=	corelib gui network xml \
-		qmake_build rcc_build uic_build moc_build linguist_build
+		linguisttools_build moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 OPTIONS_SUB=	yes
@@ -328,7 +328,7 @@
 	@${GREP} -L 'libdata/pkgconfig' \
 		${WRKSRC}/src/qmmp/CMakeLists.txt \
 		${WRKSRC}/src/qmmpui/CMakeLists.txt | ${XARGS} \
-		${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|'
+		${REINPLACE_CMD} -e '/pkgconfig/s|\$${LIB_DIR}|libdata|'
 
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
@@ -349,7 +349,7 @@
 	${RM} -f ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
-		>> ${WRKDIR}/PLIST.doc
+		>> ${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 405270)
+++ multimedia/qmmp/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.9.5.tar.bz2) = 628a017b2327437ff77ccf5b77b4756bd1e73186f030f4bb34b93c1135ea353e
-SIZE (qmmp-0.9.5.tar.bz2) = 1121832
+SHA256 (qmmp-0.9.6.tar.bz2) = 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b
+SIZE (qmmp-0.9.6.tar.bz2) = 1124762
Index: multimedia/qmmp/pkg-descr
===================================================================
--- multimedia/qmmp/pkg-descr	(revision 405270)
+++ multimedia/qmmp/pkg-descr	(working copy)
@@ -19,7 +19,6 @@
 	multiple playlists, MMS, file type determination and converter, MPRIS,
 	CUE sheet, embedded CUE (for FLAC and WavPack), ReplayGain,
 	automatic charset detection for cue files and ShoutCast metadata,
-	video playback via Mplayer, lyrics (using lyrics.wikia.com), and
-	skinned UI (supports all skins for XMMS and Winamp 2.x)
-
+	video playback via Mplayer, lyrics (using lyrics.wikia.com), simple
+	UI, and skinned UI (supports all skins for XMMS and Winamp 2.x)
 WWW: http://qmmp.ylsoftware.com/
Index: multimedia/qmmp/pkg-plist
===================================================================
--- multimedia/qmmp/pkg-plist	(revision 405270)
+++ multimedia/qmmp/pkg-plist	(working copy)
@@ -109,8 +109,8 @@
 lib/qmmp/PlayListFormats/libxspfplaylistformat.so
 %%CURL%%lib/qmmp/Transports/libhttp.so
 %%MMS%%lib/qmmp/Transports/libmms.so
+%%QSUI%%lib/qmmp/Ui/libqsui.so
 %%SKINNEDUI%%lib/qmmp/Ui/libskinned.so
-%%QSUI%%lib/qmmp/Ui/libqsui.so
 %%ANALYZER%%lib/qmmp/Visual/libanalyzer.so
 %%PROJECTM%%lib/qmmp/Visual/libprojectm.so
 libdata/pkgconfig/qmmp.pc
Index: multimedia/qmmp-qt5/Makefile
===================================================================
--- multimedia/qmmp-qt5/Makefile	(revision 405270)
+++ multimedia/qmmp-qt5/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -16,7 +16,7 @@
 
 USES=		cmake:outsource desktop-file-utils pkgconfig tar:bzip2
 USE_QT5=	core gui network widgets xml \
-		qmake_build buildtools_build linguisttools_build
+		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
 OPTIONS_SUB=	yes
@@ -342,7 +342,7 @@
 	${RM} -f ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
-		>> ${WRKDIR}/PLIST.doc
+		>> ${WRKDIR}/PLIST.doc ; \
 	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: multimedia/qmmp-qt5/distinfo
===================================================================
--- multimedia/qmmp-qt5/distinfo	(revision 405270)
+++ multimedia/qmmp-qt5/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-1.0.4.tar.bz2) = 9867fcb7ad7389f1c01d3bf31829fbe40a89eb8b05c104225257cea98c49ea85
-SIZE (qmmp-1.0.4.tar.bz2) = 1102390
+SHA256 (qmmp-1.0.5.tar.bz2) = 64952bfbe8b4bc6b74e04c4384fb923d0495f8380773ad7170b5a87fd2661ce1
+SIZE (qmmp-1.0.5.tar.bz2) = 1105704
Index: multimedia/qmmp-qt5/pkg-descr
===================================================================
--- multimedia/qmmp-qt5/pkg-descr	(revision 405270)
+++ multimedia/qmmp-qt5/pkg-descr	(working copy)
@@ -19,7 +19,6 @@
 	multiple playlists, MMS, file type determination and converter, MPRIS,
 	CUE sheet, embedded CUE (for FLAC and WavPack), ReplayGain,
 	automatic charset detection for cue files and ShoutCast metadata,
-	video playback via Mplayer, lyrics (using lyrics.wikia.com), and
-	skinned UI (supports all skins for XMMS and Winamp 2.x)
-
+	video playback via Mplayer, lyrics (using lyrics.wikia.com), simple
+	UI, and skinned UI (supports all skins for XMMS and Winamp 2.x)
 WWW: http://qmmp.ylsoftware.com/