- 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)

2 files changed, 7 insertions, 16 deletions

diff --git a/polish/qfaktury/Makefile b/polish/qfaktury/Makefile
index 5aef6716b13c..59d43680c106 100644
--- a/polish/qfaktury/Makefile
+++ b/polish/qfaktury/Makefile
@@ -10,24 +10,17 @@ MASTER_SITES=	SF
 MAINTAINER=	meritus@innervision.pl
 COMMENT=	Polish invoicing desktop program
 
-USE_QT4=	qmake_build uic_build moc_build rcc_build corelib gui xml qt3support
+USES=		qmake
+USE_QT4=	uic_build moc_build rcc_build corelib gui xml qt3support
 
 PORTDOCS=	ChangeLog.txt ReadMe.txt ReleaseNotes.txt TODO.txt
 
-NO_STAGE=	yes
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' qfaktury.pro \
 	QFaktury.desktop
 
-pre-build:
-	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC}
-
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 936c7e974a95..808ae8bd5101 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -14,10 +14,11 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
 
-USE_QT4=	corelib gui network xml qmake_build moc_build uic_build rcc_build
+USES=		qmake
+USE_QT4=	corelib gui network xml moc_build uic_build rcc_build
 USE_KDE4=	kdehier
 PLIST_SUB=	KDE4=${KDE4_PREFIX:S|${LOCALBASE}/||}
-QMAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX} KDE4_PREFIX=${STAGEDIR}${KDE4_PREFIX}
+QMAKE_ARGS=	KDE4_PREFIX=${KDE4_PREFIX}
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	ChangeLog README.pl COPYRIGHT
@@ -30,9 +31,6 @@ post-patch:
 		${WRKSRC}/doc/qnapi-download.desktop \
 		${WRKSRC}/doc/qnapi-download.schemas
 
-pre-build:
-	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|g} ${STAGEDIR}${DOCSDIR}