From f46fec2e974200d1d5ac3b335e6f22ac057e264e Mon Sep 17 00:00:00 2001 From: makc Date: Sat, 23 Nov 2013 17:42:04 +0000 Subject: - Convert to USES=qmake Approved by: portmgr (blanket approval) --- games/hexalate/Makefile | 8 ++------ games/quackle/Makefile | 10 +++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile index 4fbf2d2..e759719 100644 --- a/games/hexalate/Makefile +++ b/games/hexalate/Makefile @@ -11,15 +11,11 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= A color matching game +USES= qmake USE_BZIP2= yes -USE_QT4= corelib gui moc_build qmake_build rcc_build +USE_QT4= corelib gui moc_build rcc_build INSTALLS_ICONS= yes -DESTDIRNAME= INSTALL_ROOT WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} ${PORTNAME}.pro - .include diff --git a/games/quackle/Makefile b/games/quackle/Makefile index b9d8615..098aae1 100644 --- a/games/quackle/Makefile +++ b/games/quackle/Makefile @@ -18,9 +18,9 @@ LICENSE_COMB= dual WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/quacker -USES= gmake +USES= gmake qmake USE_GCC= any -USE_QT4= gui moc_build qmake_build +USE_QT4= gui moc_build DESKTOP_ENTRIES="Quackle" "${COMMENT}" "" "quackle" "Game;BoardGame;" "true" @@ -35,9 +35,9 @@ post-patch: '/QFile::exists/s|("data")|("${DATADIR}")| ; \ /setDataDirectory/s|("data")|("${DATADIR}")|' ${BUILD_WRKSRC}/settings.cpp -do-configure: -.for dir in . quackleio quacker - @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}) +post-configure: +.for dir in quackleio quacker + @(cd ${WRKSRC}/${dir} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}) .endfor pre-build: -- cgit v1.1