From owner-svn-ports-head@FreeBSD.ORG  Wed Nov  6 22:48:02 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E1606AAE;
 Wed,  6 Nov 2013 22:48:02 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
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 CE3EC252D;
 Wed,  6 Nov 2013 22:48:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6Mm2qV080492;
 Wed, 6 Nov 2013 22:48:02 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6Mm2rr080491;
 Wed, 6 Nov 2013 22:48:02 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201311062248.rA6Mm2rr080491@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 6 Nov 2013 22:48:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333044 - head/devel/qscintilla2-designerplugin
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.14
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: Wed, 06 Nov 2013 22:48:03 -0000

Author: rakuco
Date: Wed Nov  6 22:48:02 2013
New Revision: 333044
URL: http://svnweb.freebsd.org/changeset/ports/333044

Log:
  Switch from the manual qmake logic to USES=qmake.
  
  Doing so correctly handles all the PREFIX, DESTDIR and stage directories
  logic that the previous code did not, and should make the package build fine
  on the cluster instead of failing at the "stage" stage.
  
  While here, simplify the bsd.port.{pre,post}.mk includes.

Modified:
  head/devel/qscintilla2-designerplugin/Makefile

Modified: head/devel/qscintilla2-designerplugin/Makefile
==============================================================================
--- head/devel/qscintilla2-designerplugin/Makefile	Wed Nov  6 22:19:18 2013	(r333043)
+++ head/devel/qscintilla2-designerplugin/Makefile	Wed Nov  6 22:48:02 2013	(r333044)
@@ -15,23 +15,17 @@ COMMENT=	Qt4 Designer plugin for QScinti
 LIB_DEPENDS=	qscintilla2:${PORTSDIR}/devel/qscintilla2
 
 DISTINFO_FILE=	${QSCI2_DISTINFO_FILE}
+USES=		qmake
 USE_QT4=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
 
-QMAKE_ARGS=	-unix PREFIX=${PREFIX}
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/designer-Qt4Qt5
 
 .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
-.include <bsd.port.pre.mk>
 
 pre-configure:
 	${REINPLACE_CMD} -e \
 		's|$$$$\[QT_INSTALL_PLUGINS\]|${PREFIX}/${QT_PLUGINDIR_REL}|' \
 		${WRKSRC}/designer.pro
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} designer.pro
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>