svn commit: r334872 - in head/deskutils: fet qrfcview

[Max Brazhnikov]

Author: makc
Date: Mon Nov 25 18:00:55 2013
New Revision: 334872
URL: http://svnweb.freebsd.org/changeset/ports/334872

Log:
  - Convert to USES=qmake
  
  Approved by:	portmgr (blanket approval)

Modified:
  head/deskutils/fet/Makefile
  head/deskutils/qrfcview/Makefile   (contents, props changed)

Modified: head/deskutils/fet/Makefile
==============================================================================
--- head/deskutils/fet/Makefile	Mon Nov 25 17:59:58 2013	(r334871)
+++ head/deskutils/fet/Makefile	Mon Nov 25 18:00:55 2013	(r334872)
@@ -15,10 +15,10 @@ COMMENT=	Free timetabling software
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
+USES=		qmake
 USE_BZIP2=	yes
 USE_QT4=	gui network xml \
-		moc_build qmake_build rcc_build uic_build
-HAS_CONFIGURE=	yes
+		moc_build rcc_build uic_build
 
 PORTEXAMPLES=	*
 
@@ -38,10 +38,6 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
 		${WRKSRC}/src/interface/fet.cpp
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fet ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin

Modified: head/deskutils/qrfcview/Makefile
==============================================================================
--- head/deskutils/qrfcview/Makefile	Mon Nov 25 17:59:58 2013	(r334871)
+++ head/deskutils/qrfcview/Makefile	Mon Nov 25 18:00:55 2013	(r334872)
@@ -11,16 +11,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Graphical RFC viewer
 
-USE_QT4=	gui network corelib qmake_build uic_build moc_build rcc_build
+USES=		qmake
+USE_QT4=	gui network corelib uic_build moc_build rcc_build
 PLIST_FILES=	bin/qRFCView
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=DOCS
 
-do-configure:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} -unix rfcview.pro
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/qRFCView ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}