From owner-svn-ports-head@FreeBSD.ORG  Mon Aug 11 06:45:43 2014
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 61F5A371
 for <svn-ports-head@freebsd.org>; Mon, 11 Aug 2014 06:45:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3434A25D4
 for <svn-ports-head@freebsd.org>; Mon, 11 Aug 2014 06:45:43 +0000 (UTC)
Received: from makc (uid 1181) (envelope-from makc@FreeBSD.org) id 223f
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Mon, 11 Aug 2014 06:45:42 +0000
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Mon, 11 Aug 2014 06:45:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364589 - head/devel/thrift-cpp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e86696.223f.4ca98a44@svn.freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
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, 11 Aug 2014 06:45:43 -0000

Author: makc
Date: Mon Aug 11 06:45:42 2014
New Revision: 364589
URL: http://svnweb.freebsd.org/changeset/ports/364589
QAT: https://qat.redports.org/buildarchive/r364589/

Log:
  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)
  MFH:		2014Q3

Modified:
  head/devel/thrift-cpp/Makefile

Modified: head/devel/thrift-cpp/Makefile
==============================================================================
--- head/devel/thrift-cpp/Makefile	Mon Aug 11 06:36:23 2014	(r364588)
+++ head/devel/thrift-cpp/Makefile	Mon Aug 11 06:45:42 2014	(r364589)
@@ -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