svn commit: r365368 - branches/2014Q3/devel/thrift-cpp

[Max Brazhnikov]

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 at 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