- Convert to USES=qmake (and other USES while I'm here)

- Add state support
- Convert LIB_DEPENDS to new style, adjust USE_QT4 components, etc.

Approved by:	portmgr (blanket approval)

9 files changed, 51 insertions, 97 deletions

diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index fc6481f9559..60c9c6b96c4 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	vg@FreeBSD.org
-COMMENT=	A music player and a collection manager based on Qt4
+COMMENT=	Music player and collection manager based on Qt4
 
 BUILD_DEPENDS=	audiere-config:${PORTSDIR}/audio/audiere \
 		${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
@@ -18,14 +18,15 @@ LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
 		libtag.so:${PORTSDIR}/audio/taglib
 
 USE_LDCONFIG=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	gui xml uic_build moc_build rcc_build \
 		network phonon-gst sql
-USES=		gettext iconv pkgconfig
-NO_STAGE=	yes
+USES=		gettext iconv pkgconfig qmake
 USE_SDL=	sdl
-QMAKEFLAGS+=	"CONFIG+=player_phonon"
-MAKE_ENV+=	INSTALL_ROOT=${PREFIX}
-QMAKEPRO=	Cuberok.pro
+QMAKE_ARGS+=	"CONFIG+=player_phonon"
+
+BROKEN_ia64=	does not compile
+BROKEN_powerpc=	${BROKEN_ia64}
+BROKEN_sparc64=	${BROKEN_ia64}
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -34,18 +35,11 @@ post-patch:
 		-e 's,libavformat,libavformat0,g' \
 		${WRKSRC}/Cuberok.pro \
 		${WRKSRC}/plugins/player_ffmpeg/player_ffmpeg.pro
-
-do-configure:
-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/lib64/lib/g' \
-		plugins/plugins_path-x86*
-
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
-.include <bsd.port.post.mk>
+	${REINPLACE_CMD} -e 's/lib64/lib/g' \
+		${WRKSRC}/plugins/plugins_path-x86*
+# Fix installation paths
+	${REINPLACE_CMD} '/.path =/s,= \(.*\),= $$$$PREFIX/\1,' \
+			${WRKSRC}/plugins/*.pri \
+			${WRKSRC}/src/src.pro
+
+.include <bsd.port.mk>
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index d1f0ef5d7a6..74d57f6140c 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -10,18 +10,17 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	CUE player
 
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 
-USES=		pkgconfig
-NO_STAGE=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build network
+USES=		pkgconfig qmake
+USE_QT4=	gui xml uic_build moc_build rcc_build network
 USE_GSTREAMER=	flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack
 
 LICENSE=	GPLv3
 
 DESKTOP_ENTRIES="Cueplayer" "Lightweight media player based on Qt and Gstreamer" \
 		"${DATADIR}/${PORTNAME}.png" "${PORTNAME}" \
-		"AudioVideo;Audio;Video;" ${FALSE}
+		"AudioVideo;Audio;Video;" true
 
 post-patch:
 	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/cueplayer/,${DATADIR}/,g' \
@@ -29,10 +28,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX},g' \
 		${WRKSRC}/${PORTNAME}.pro
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 29b5e3d278b..29d7d1b9d7c 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -18,26 +18,21 @@ LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libgpod.so:${PORTSDIR}/audio/libgpod
 
-USES=		pkgconfig
-NO_STAGE=	yes
+USES=		pkgconfig qmake
 USE_BZIP2=	yes
-USE_QT4=	gui linguist_build moc_build network phonon qmake_build \
+USE_QT4=	gui linguist_build moc_build network phonon \
 		rcc_build uic_build webkit xml
-USE_LDCONFIG=	yes
 LASTFM=		${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	${LASTFM}.sh
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
-
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${PREFIX}/bin/${LASTFM}
-	${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${DATADIR}/
-	${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${STAGEDIR}${PREFIX}/bin/${LASTFM}
+	${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${STAGEDIR}${DATADIR}
+	${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/app/client/Last.fm\ Scrobbler.css \
-		${DATADIR}/
+		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index 132416ff859..032f7bfbfb2 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -8,23 +8,18 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	vg@FreeBSD.org
-COMMENT=	A simple media player using Qt/Phonon
+COMMENT=	Simple media player using Qt/Phonon
 
+USES=		qmake
 USE_BZIP2=	yes
-NO_STAGE=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build \
+USE_QT4=	gui xml uic_build moc_build \
 		rcc_build phonon
 
-QMAKE_PRO=	${PORTNAME}.pro
-
 WRKSRC=		${WRKDIR}/dev
 
 PLIST_FILES=	bin/${PORTNAME}
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index 6d34abdf01b..0ccfeb33994 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -15,15 +15,8 @@ LICENSE=	BSD
 BUILD_DEPENDS=	libumidi>=2.0.9:${PORTSDIR}/audio/libumidi
 LIB_DEPENDS=	libumidi20.so:${PORTSDIR}/audio/libumidi
 
+USES=		qmake
 USE_BZIP2=	yes
-NO_STAGE=	yes
-
-USE_QT4=	gui qmake_build moc_build rcc_build network
-
-QMAKE_MIDIPP=	${QMAKE} -unix PREFIX=${PREFIX} -o
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_MIDIPP} Makefile ${PORTNAME}.pro
+USE_QT4=	gui moc_build rcc_build network
 
 .include <bsd.port.mk>
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index e537e09dd3e..373964e42eb 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -8,24 +8,18 @@ CATEGORIES=	audio
 MASTER_SITES=	http://flavio.tordini.org/files/${PORTNAME}/
 
 MAINTAINER=	vg@FreeBSD.org
-COMMENT=	Minitunes is just another music player
+COMMENT=	Just another music player
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
-NO_STAGE=	yes
-USE_QT4=	dbus gui moc_build network phonon qmake_build rcc_build \
+USES=		qmake
+USE_QT4=	dbus gui moc_build network phonon rcc_build \
 		sql uic_build xml
 INSTALLS_ICONS=	yes
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-QMAKEFLAGS+=	PREFIX="${PREFIX}"
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro
-
 .include <bsd.port.mk>
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 23946c091b3..ecd02b0e59e 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
-COMMENT=	A voice chat software primarily intended for use while gaming
+COMMENT=	Voice chat software primarily intended for use while gaming
 
 LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
@@ -17,18 +17,18 @@ LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \
 		libprotoc.so:${PORTSDIR}/devel/protobuf \
 		libopus.so:${PORTSDIR}/audio/opus
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig qmake
 USE_QT4=	gui svg iconengines_run xml sql network l10n \
-		linguist_build qmake_build moc_build rcc_build uic_build \
+		linguist_build moc_build rcc_build uic_build \
 		opengl sql-sqlite3_run
 
 USE_XORG=	ice
-HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=yes
 
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \
 		bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
+QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 
 OPTIONS_DEFINE=	DBUS BONJOUR
 OPTIONS_DEFAULT=	DBUS
@@ -51,9 +51,6 @@ LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 4f96839c3b9..0161e02b0e9 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -15,9 +15,11 @@ LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 
 USERS=		murmur
 GROUPS=		murmur
-USE_QT4=	qmake_build moc_build corelib network xml sql sql-sqlite3_run
+USES=		qmake
+USE_QT4=	moc_build corelib network xml sql sql-sqlite3_run
 
 CONFIG=		no-client
+QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 
 USE_RC_SUBR=	murmur
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
@@ -50,10 +52,6 @@ CONFIG+=	no-bonjour
 post-patch:
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \
-		${QMAKE} -unix PREFIX=${PREFIX} ${QMAKEFLAGS} main.pro "CONFIG+=${CONFIG}"
-
 pre-install:
 	@${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
 	@${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 07072af6064..842d809c73b 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -13,15 +13,11 @@ COMMENT=	Easy to use musicpd client written in Qt4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-
+USES=		qmake
 USE_BZIP2=	yes
-NO_STAGE=	yes
-USE_QT4=	qmake_build moc_build rcc_build uic_build \
+USE_QT4=	moc_build rcc_build uic_build \
 		corelib gui network xml xmlpatterns
 INSTALLS_ICONS=	yes
-QMAKE_ARGS=	${QMAKE_PRO}
-QMAKE_PRO=	${PORTNAME}.pro
 
 OPTIONS_DEFINE=	DBUS NLS DEBUG
 
@@ -39,27 +35,23 @@ PLIST_SUB+=	NLS=""
 
 .if ${PORT_OPTIONS:MDBUS}
 USE_QT4+=	dbus
-QMAKEFLAGS+=	"CONFIG+=qdbus"
+QMAKE_ARGS+=	"CONFIG+=qdbus"
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
-QMAKEFLAGS+=	"CONFIG+=debug"
+QMAKE_ARGS+=	"CONFIG+=debug"
 .endif
 
 post-patch:
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/INSTALLS += translations/d' \
-		${WRKSRC}/${QMAKE_PRO}
+		${WRKSRC}/${PORTNAME}.pro
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		-e 's|lupdate|lupdate-qt4|' \
 		-e 's|lrelease|lrelease-qt4|' \
-		${WRKSRC}/${QMAKE_PRO}
+		${WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/src/notifications_dbus.cpp
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \
-		${QMAKEFLAGS} ${QMAKE_ARGS}
-
 .include <bsd.port.mk>