From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 25 18:01:09 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4C19C82E;
 Mon, 25 Nov 2013 18:01:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 219F32C62;
 Mon, 25 Nov 2013 18:01:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPI198a061371;
 Mon, 25 Nov 2013 18:01:09 GMT (envelope-from makc@svn.freebsd.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPI18qK061368;
 Mon, 25 Nov 2013 18:01:08 GMT (envelope-from makc@svn.freebsd.org)
Message-Id: <201311251801.rAPI18qK061368@svn.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Mon, 25 Nov 2013 18:01:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334874 - in head: deskutils/recoll sysutils/qpxtool
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 18:01:09 -0000

Author: makc
Date: Mon Nov 25 18:01:08 2013
New Revision: 334874
URL: http://svnweb.freebsd.org/changeset/ports/334874

Log:
  - Pass QMAKE_ARGS to qmake
  
  Approved by:	portmgr (blanket approval)

Modified:
  head/deskutils/recoll/Makefile
  head/sysutils/qpxtool/Makefile

Modified: head/deskutils/recoll/Makefile
==============================================================================
--- head/deskutils/recoll/Makefile	Mon Nov 25 18:01:01 2013	(r334873)
+++ head/deskutils/recoll/Makefile	Mon Nov 25 18:01:08 2013	(r334874)
@@ -46,8 +46,8 @@ PYDISTUTILS_EGGINFO=	Recoll-1.0-py${PYTH
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
-		corelib gui xml webkit
+USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines_run \
+		imageformats_run corelib gui xml webkit
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
 INSTALLS_ICONS=	yes
@@ -71,8 +71,8 @@ post-patch:
 
 post-configure:
 .if ${PORT_OPTIONS:MQT4}
-	@cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
+	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} \
+		${QMAKE} ${QMAKE_ARGS}
 .endif
 
 .include <bsd.port.mk>

Modified: head/sysutils/qpxtool/Makefile
==============================================================================
--- head/sysutils/qpxtool/Makefile	Mon Nov 25 18:01:01 2013	(r334873)
+++ head/sysutils/qpxtool/Makefile	Mon Nov 25 18:01:08 2013	(r334874)
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/\.[^.]*$/.x/}/${DISTVERSION}
 
 MAINTAINER=	horia@racoviceanu.com
-COMMENT=	A GUI for testing CD/DVD quality and transfer rate
+COMMENT=	GUI for testing CD/DVD quality and transfer rate
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
@@ -20,7 +20,7 @@ CONFIGURE_ENV=	PREFIX=${PREFIX}
 USE_LDCONFIG=	yes
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKEFLAGS}|' \
+	@${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKE_AGRS}|' \
 		${WRKSRC}/gui/Makefile
 	@${REINPLACE_CMD} -e 's|S_ISBLK|S_ISCHR|' \
 		${WRKSRC}/lib/qpxtransport/qpx_mmc.cpp