Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Nov 2013 17:42:04 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334688 - in head/games: hexalate quackle
Message-ID:  <201311231742.rANHg4D5096721@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Sat Nov 23 17:42:04 2013
New Revision: 334688
URL: http://svnweb.freebsd.org/changeset/ports/334688

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

Modified:
  head/games/hexalate/Makefile
  head/games/quackle/Makefile

Modified: head/games/hexalate/Makefile
==============================================================================
--- head/games/hexalate/Makefile	Sat Nov 23 17:31:59 2013	(r334687)
+++ head/games/hexalate/Makefile	Sat Nov 23 17:42:04 2013	(r334688)
@@ -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 <bsd.port.mk>

Modified: head/games/quackle/Makefile
==============================================================================
--- head/games/quackle/Makefile	Sat Nov 23 17:31:59 2013	(r334687)
+++ head/games/quackle/Makefile	Sat Nov 23 17:42:04 2013	(r334688)
@@ -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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311231742.rANHg4D5096721>