From owner-svn-ports-branches@FreeBSD.ORG  Tue Aug 19 09:33:05 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@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 ESMTPS id 9A8457D4;
 Tue, 19 Aug 2014 09:33:05 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8638635B9;
 Tue, 19 Aug 2014 09:33:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7J9X5r2033144;
 Tue, 19 Aug 2014 09:33:05 GMT (envelope-from makc@FreeBSD.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7J9X5WJ033143;
 Tue, 19 Aug 2014 09:33:05 GMT (envelope-from makc@FreeBSD.org)
Message-Id: <201408190933.s7J9X5WJ033143@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org
 using -f
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Tue, 19 Aug 2014 09:33:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r365368 - branches/2014Q3/devel/thrift-cpp
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Aug 2014 09:33:05 -0000

Author: makc
Date: Tue Aug 19 09:33:04 2014
New Revision: 365368
URL: http://svnweb.freebsd.org/changeset/ports/365368
QAT: https://qat.redports.org/buildarchive/r365368/

Log:
  MFH: r364589
  
  devel/thrift-cpp:
  - Unbreak Makefile when building with QT4 support. USE_QT4 cannot be set
    after bsd.port.pre.mk and requires inclusion of bsd.port.options.mk
    (when used with options). However converting to options helpers saves
    us from additional include.
  - Replace spaces with tab while here
  
  PR:		189127
  Reported by:	jrh29@alumni.cwru.edu
  Approved by:	maintainer timeout (3 months from the date of report, I didn't
  		wait approval for my patch)
  Approved by:	portmgr (erwin)

Modified:
  branches/2014Q3/devel/thrift-cpp/Makefile
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/devel/thrift-cpp/Makefile
==============================================================================
--- branches/2014Q3/devel/thrift-cpp/Makefile	Tue Aug 19 09:02:30 2014	(r365367)
+++ branches/2014Q3/devel/thrift-cpp/Makefile	Tue Aug 19 09:33:04 2014	(r365368)
@@ -34,10 +34,11 @@ INSTALL_WRKSRC=		${WRKSRC}/lib/cpp
 
 OPTIONS_DEFINE=		QT4
 QT4_CONFIGURE_WITH=	qt4
+QT4_USE=		QT4=network,moc_build,qmake_build,rcc_build,uic_build
 
 OPTIONS_SUB=		yes
 
-CONFIGURE_ARGS+=        \
+CONFIGURE_ARGS+=	\
 		--without-c_glib \
 		--with-cpp \
 		--without-csharp \
@@ -56,10 +57,6 @@ CONFIGURE_ARGS+=        \
 USE_CXXSTD=	c++11
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-USE_QT4=		network moc_build qmake_build rcc_build uic_build
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am