- Convert to USES=qamke

- Support staging properly

1 files changed, 11 insertions, 19 deletions

diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index 17bd84eb5699..c7cfb275c907 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -9,35 +9,31 @@ MASTER_SITES=	${MASTER_SITES_QSCI2}
 DISTNAME=	${QSCI2_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 port of the Scintilla C++ editor class
+COMMENT=	Qt 4 port of the Scintilla C++ editor class
 
-USE_QT4=	qmake_build moc_build gui xml designer
-HAS_CONFIGURE=	yes
+USES=		qmake
+USE_QT4=	moc_build gui xml designer
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=		${WRKSRC}/Qt4Qt5
+CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 
-QMAKE_ARGS=	-unix PREFIX=${PREFIX}
-
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	DOCS EXAMPLES NLS
+OPTIONS_SUB=	yes
+
 .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 post-patch:
 	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
-		's|$$$$\[QT_INSTALL_HEADERS\]|${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}|; \
-		s|$$$$\[QT_INSTALL_LIBS\]|${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}|; \
-		s|$$$$\[QT_INSTALL_TRANSLATIONS\]|${STAGEDIR}${PREFIX}/share/qt4/translations|; \
-		s|$$$$\[QT_INSTALL_DATA\]|${STAGEDIR}${PREFIX}/share/qt4|' \
+		's|$$$$\[QT_INSTALL_HEADERS\]|${PREFIX}/${QT_INCDIR_REL}|; \
+		s|$$$$\[QT_INSTALL_LIBS\]|${PREFIX}/${QT_LIBDIR_REL}|; \
+		s|$$$$\[QT_INSTALL_TRANSLATIONS\]|${PREFIX}/share/qt4/translations|; \
+		s|$$$$\[QT_INSTALL_DATA\]|${PREFIX}/share/qt4|' \
 		qscintilla.pro
 
 .if empty(PORT_OPTIONS:MNLS)
@@ -45,10 +41,6 @@ post-patch:
 		's|trans qsci|qsci|' qscintilla.pro
 .endif
 
-do-configure:
-	cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} qscintilla.pro
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC} &&\