svn commit: r334926 - in head: devel/qdevelop multimedia/minitube

[Max Brazhnikov]

Author: makc
Date: Tue Nov 26 12:58:55 2013
New Revision: 334926
URL: http://svnweb.freebsd.org/changeset/ports/334926

Log:
  - Clean up after conversion to USES=qmake
  - Use options helpels

Modified:
  head/devel/qdevelop/Makefile
  head/multimedia/minitube/Makefile

Modified: head/devel/qdevelop/Makefile
==============================================================================
--- head/devel/qdevelop/Makefile	Tue Nov 26 12:22:43 2013	(r334925)
+++ head/devel/qdevelop/Makefile	Tue Nov 26 12:58:55 2013	(r334926)
@@ -9,7 +9,7 @@ MASTER_SITES=	http://biord-software.org/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	makc at FreeBSD.org
-COMMENT=	Development environment entirely dedicated to Qt4
+COMMENT=	Development environment entirely dedicated to Qt 4
 
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
@@ -17,11 +17,10 @@ USE_QT4=	gui sql network xml designer sq
 		moc_build uic_build rcc_build
 USES=		qmake
 
-QMAKE_PRO=	QDevelop.pro
 STRIP_FILES=	bin/${PORTNAME}
 
 DESKTOP_ENTRIES=	"QDevelop" \
-			"Qt4 development environment" \
+			"Qt 4 development environment" \
 			"${PREFIX}/share/pixmaps/qdevelop.png" \
 			"qdevelop" \
 			"Development;IDE;Qt;" \
@@ -29,22 +28,14 @@ DESKTOP_ENTRIES=	"QDevelop" \
 
 OPTIONS_DEFINE=	TOOLS DOCS NLS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-TOOLS_DESC=	Install Qt4 dev. tools (qmake, moc, etc.)
+OPTIONS_SUB=	yes
+NLS_USE=	QT4=linguist_build
+TOOLS_DESC=	Install Qt 4 development tools (qmake, moc, etc.)
+TOOLS_USE=	${_TOOLS:C|.*|QT4=&_run|}
+_TOOLS=		assistant linguist moc qmake rcc uic
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USE_QT4+=	linguist_build
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTOOLS}
-USE_QT4+=	assistant_run linguist_run \
-		qmake_run moc_run uic_run rcc_run
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|\"qmake\"|\"qmake-qt4\"|g" \
 		-e "s|\"linguist\"|\"linguist-qt4\"|g" \
@@ -56,7 +47,7 @@ post-patch:
 		-e "s|\"/usr/bin/ctags\"|\"${LOCALBASE}/bin/exctags\"|g" \
 		${WRKSRC}/src/toolscontrolimpl.cpp
 	${REINPLACE_CMD} -e "/target.path/s|/usr/bin/|${PREFIX}/bin|g" \
-		${WRKSRC}/${QMAKE_PRO}
+		${WRKSRC}/QDevelop.pro
 	${REINPLACE_CMD} -e "s,lib/qdevelop/translations,${DATADIR_REL}/translations,g" \
 		${WRKSRC}/src/main.cpp \
 		${WRKSRC}/plugins/tools-regexp-planner/replugin.cpp \
@@ -64,7 +55,7 @@ post-patch:
 
 post-configure:
 .if ${PORT_OPTIONS:MNLS}
-	cd ${WRKSRC} && ${LRELEASE} ${QMAKE_PRO}
+	${LRELEASE} ${WRKSRC}/QDevelop.pro
 .endif
 
 post-install:

Modified: head/multimedia/minitube/Makefile
==============================================================================
--- head/multimedia/minitube/Makefile	Tue Nov 26 12:22:43 2013	(r334925)
+++ head/multimedia/minitube/Makefile	Tue Nov 26 12:58:55 2013	(r334926)
@@ -16,25 +16,19 @@ INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 QMAKE_ARGS=	QMAKE_LRELEASE=${LRELEASE}
-QMAKE_PRO=	${WRKSRC}/${PORTNAME}.pro
 
 STRIP_FILES=	bin/minitube
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USE=	QT4=linguist_build
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USE_QT4+=	linguist_build
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 pre-configure:
-	${REINPLACE_CMD} -e 's,$$$$PKGDATADIR,${DATADIR},g' ${QMAKE_PRO}
+	${REINPLACE_CMD} -e 's,$$$$PKGDATADIR,${DATADIR},g' ${WRKSRC}/minitube.pro
 .if !${PORT_OPTIONS:MNLS}
-	${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${QMAKE_PRO}
+	${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${WRKSRC}/minitube.pro
 .endif
 
 post-install: