- Pass QMAKE_ARGS to qmake

Approved by:	portmgr (blanket approval)

5 files changed, 15 insertions, 20 deletions

diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 8214c99d23e2..86da32dd93f1 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -17,31 +17,27 @@ USE_QT4=	gui network script xml qmake_build moc_build rcc_build uic_build \
 
 ALL_TARGET=	src/smplayer
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 
-MAN1=		smplayer.1
-MANCOMPRESSED=	yes
-
 PORTDOCS=	Changelog Copying.txt Install.txt Not_so_obvious_things.txt \
 		Readme.txt Release_notes.txt
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|qmake|${QMAKE}|g' \
-		-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \
+	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|g' \
+		-e 's|lrelease|${LRELEASE}|g' \
 		-e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
 		-e 's,/share/man,/man,g' \
-		-e 's, make, ${GMAKE},g' \
+		-e 's, make, ${MAKE_CMD},g' \
 		${WRKSRC}/Makefile
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer/pkg-plist b/multimedia/smplayer/pkg-plist
index 24b470410fb3..0a41175344b2 100644
--- a/multimedia/smplayer/pkg-plist
+++ b/multimedia/smplayer/pkg-plist
@@ -1,4 +1,5 @@
 bin/smplayer
+man/man1/smplayer.1.gz
 share/applications/smplayer.desktop
 share/applications/smplayer_enqueue.desktop
 share/icons/hicolor/128x128/apps/smplayer.png
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index 8643355d56f3..91a912612c74 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -15,7 +15,7 @@ USE_BZIP2=	yes
 USES=		gmake
 ALL_TARGET=	#empty
 USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build
-QMAKEFLAGS+=	QMAKE_CXXFLAGS_RELEASE=""
+QMAKE_ARGS+=	QMAKE_CXXFLAGS_RELEASE=""
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	*
@@ -23,8 +23,8 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKEFLAGS}|' \
-		-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \
+	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
+		-e 's|lrelease|${LRELEASE}|g' \
 		-e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
 		-e 's|$$(PREFIX)/share/smtube|${DATADIR}|g' \
 		-e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \
diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile
index 41c65a940678..c61efcf38dc9 100644
--- a/multimedia/umplayer/Makefile
+++ b/multimedia/umplayer/Makefile
@@ -17,22 +17,19 @@ USE_XZ=		yes
 USE_QT4=	gui network xml qmake_build moc_build rcc_build uic_build \
 		linguist_build
 INSTALLS_ICONS=	yes
-MAKE_ARGS=	QMAKE_OPTS="DEFINES+=NO_DEBUG_ON_CONSOLE" PREFIX="${PREFIX}"
+MAKE_ARGS+=	${PREFIX}
+QMAKE_ARGS+=	"DEFINES+=NO_DEBUG_ON_CONSOLE"
 ALL_TARGET=	src/umplayer
 
-MAN1=		umplayer.1
-MANCOMPRESSED=	yes
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \
 		-e 's|cd src|(&| ; /cd src/s|$$|)|' \
-		-e 's|qmake|${QMAKE}|' \
-		-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|' \
+		-e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
+		-e 's|lrelease|${LRELEASE}|' \
 		-e 's|/share/man|/man|' \
 		-e 's|/doc/packages|/doc|' \
 		-e 's|^.*/get_svn_revision.sh$$||' \
diff --git a/multimedia/umplayer/pkg-plist b/multimedia/umplayer/pkg-plist
index c398748467b6..57329c2c17c5 100644
--- a/multimedia/umplayer/pkg-plist
+++ b/multimedia/umplayer/pkg-plist
@@ -1,4 +1,5 @@
 bin/umplayer
+man/man1/umplayer.1.gz
 share/applications/umplayer.desktop
 share/applications/umplayer_enqueue.desktop
 %%PORTDOCS%%%%DOCSDIR%%/Audio_equalizer.txt