- Convert unmaintained ports to USES=qmake

- Add stage support
- Convert LIB_DEPENDS to new syntax
- Minor changes/fixes

2 files changed, 20 insertions, 25 deletions

diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile
index f1caa1f308fd..0ef164652802 100644
--- a/devel/alabastra/Makefile
+++ b/devel/alabastra/Makefile
@@ -10,26 +10,28 @@ DISTNAME=	Alabastra-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C++ editor written with Qt4
+COMMENT=	C++ editor written with Qt 4
 
 LICENSE=	GPLv2 # (or later)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+USES=		qmake gmake
 USE_QT4=	gui xml \
 		moc_build qmake_build rcc_build uic_build \
 		iconengines_run
-USE_GMAKE=	yes
 ALL_TARGET=	Alabastra
 
 PLIST_FILES=	bin/alabastra
 
-NO_STAGE=	yes
-do-configure:
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
+DESKTOP_ENTRIES=	"Alabastra" \
+			"C++/Qt editor" \
+			"" \
+			"alabastra" \
+			"Development;IDE;Qt;" \
+			true
 
 do-install:
-	(cd ${INSTALL_WRKSRC} \
-		&& ${INSTALL_PROGRAM} Alabastra ${PREFIX}/bin/alabastra)
+	${INSTALL_PROGRAM} ${WRKSRC}/Alabastra ${STAGEDIR}${PREFIX}/bin/alabastra
 
 .include <bsd.port.mk>
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index adcdc9baecb7..831fba4bae98 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -14,15 +14,15 @@ LICENSE=	GPLv2 # (or later)
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+USES=		qmake
 USE_QT4=	qt3support moc_build qmake_build
 
-MAN1=		kaptain.1
 INFO=		kaptain
 PORTDOCS=	*
 PORTEXAMPLES=	*
-PLIST_FILES=	bin/kaptain
+PLIST_FILES=	bin/kaptain \
+		man/man1/kaptain.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -32,27 +32,20 @@ post-patch:
 		${REINPLACE_CMD} -e \
 		's|/usr/bin/kaptain|${SETENV} kaptain|'
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	(cd ${WRKSRC} \
-		&& ${INSTALL_PROGRAM} kaptain ${PREFIX}/bin)
-	(cd ${WRKSRC}/man \
-		&& ${INSTALL_MAN} kaptain.1 ${MANPREFIX}/man/man1)
-	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_DATA} kaptain.info ${PREFIX}/${INFO_PATH})
+	${INSTALL_PROGRAM} ${WRKSRC}/kaptain ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/kaptain.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/kaptain.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} \
-		&& ${INSTALL_DATA} README ${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_DATA} *.gif *.html *.png *.tgz ${DOCSDIR})
+		&& ${INSTALL_DATA} *.gif *.html *.png *.tgz ${STAGEDIR}${DOCSDIR})
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples \
-		&& ${INSTALL_DATA} *.kaptn *.tgz ${EXAMPLESDIR})
+		&& ${INSTALL_DATA} *.kaptn *.tgz ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>