svn commit: r324020 - head/devel/thrift

Mathieu Arnold mat at FreeBSD.org
Wed Jul 31 09:17:09 UTC 2013 

Author: mat
Date: Wed Jul 31 09:17:08 2013
New Revision: 324020
URL: http://svnweb.freebsd.org/changeset/ports/324020

Log:
  Fixup build when using either GLIB or QT4.
  Use the new bsd.options.mk knobs.
  
  PR:		ports/180950
  Submitted by:	mat
  Approved by:	maintainer

Modified:
  head/devel/thrift/Makefile
  head/devel/thrift/pkg-plist

Modified: head/devel/thrift/Makefile
==============================================================================
--- head/devel/thrift/Makefile	Wed Jul 31 09:14:11 2013	(r324019)
+++ head/devel/thrift/Makefile	Wed Jul 31 09:17:08 2013	(r324020)
@@ -20,9 +20,8 @@ USE_AUTOTOOLS=	autoconf autoheader:env a
 ACLOCAL_ARGS=	-I${WRKSRC}/aclocal
 AUTOMAKE_ARGS=	--foreign --add-missing --copy
 
-USE_GNOME=	pkgconfig
+USES=		pkgconfig gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
@@ -34,6 +33,11 @@ CONFIGURE_ENV+=	${MAKE_ENV}
 OPTIONS_DEFINE=	GLIB QT4
 GLIB_DESC=	C (GLib) Library
 
+GLIB_CONFIGURE_ENABLE=	c_glib
+GLIB_LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20
+QT4_CONFIGURE_ENABLE=	qt4
+OPTIONS_SUB=		yes
+
 # For Perl support, use devel/p5-Thrift.
 # For Python support, use devel/py-thrift.
 # For Ruby support, use devel/rubygem-thrift.
@@ -53,29 +57,14 @@ CONFIGURE_ARGS+=	\
 		--without-ruby
 
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-.include "bsd.thrift.mk"
-
-.if ${PORT_OPTIONS:MGLIB}
-    CONFIGURE_ARGS+=	--with-c_glib
-    LIB_DEPENDS+=	glib-2.0:${PORTSDIR}/devel/glib20
-    PLIST_SUB+=		GLIB=""
-    WITH_GLIB=		true
-.else
-    CONFIGURE_ARGS+=	--without-c_glib
-    PLIST_SUB+=		GLIB="@comment "
-.endif
 
 .if ${PORT_OPTIONS:MQT4}
-    CONFIGURE_ARGS+=	--with-qt4
     USE_QT4=		network moc_build qmake_build rcc_build uic_build
-    PLIST_SUB+=		QT=""
-    WITH_QT=		true
-.else
-    CONFIGURE_ARGS+=	--without-qt4
-    PLIST_SUB+=		QT="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+.include "bsd.thrift.mk"
+
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"

Modified: head/devel/thrift/pkg-plist
==============================================================================
--- head/devel/thrift/pkg-plist	Wed Jul 31 09:14:11 2013	(r324019)
+++ head/devel/thrift/pkg-plist	Wed Jul 31 09:17:08 2013	(r324020)
@@ -23,10 +23,10 @@ include/thrift/concurrency/Thread.h
 include/thrift/concurrency/ThreadManager.h
 include/thrift/concurrency/TimerManager.h
 include/thrift/concurrency/Util.h
-%%GLIB%%include/thrift/config.h
+%%GLIB%%include/thrift/c_glib/config.h
 include/thrift/processor/PeekProcessor.h
 include/thrift/processor/StatsProcessor.h
-%%GLIB%%include/thrift/processor/thrift_processor.h
+%%GLIB%%include/thrift/c_glib/processor/thrift_processor.h
 include/thrift/protocol/TBase64Utils.h
 include/thrift/protocol/TBinaryProtocol.h
 include/thrift/protocol/TBinaryProtocol.tcc
@@ -39,10 +39,10 @@ include/thrift/protocol/TProtocol.h
 include/thrift/protocol/TProtocolException.h
 include/thrift/protocol/TProtocolTap.h
 include/thrift/protocol/TVirtualProtocol.h
-%%GLIB%%include/thrift/protocol/thrift_binary_protocol.h
-%%GLIB%%include/thrift/protocol/thrift_binary_protocol_factory.h
-%%GLIB%%include/thrift/protocol/thrift_protocol.h
-%%GLIB%%include/thrift/protocol/thrift_protocol_factory.h
+%%GLIB%%include/thrift/c_glib/protocol/thrift_binary_protocol.h
+%%GLIB%%include/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
+%%GLIB%%include/thrift/c_glib/protocol/thrift_protocol.h
+%%GLIB%%include/thrift/c_glib/protocol/thrift_protocol_factory.h
 include/thrift/qt/TQIODeviceTransport.h
 include/thrift/qt/TQTcpServer.h
 include/thrift/server/TNonblockingServer.h
@@ -50,11 +50,11 @@ include/thrift/server/TServer.h
 include/thrift/server/TSimpleServer.h
 include/thrift/server/TThreadPoolServer.h
 include/thrift/server/TThreadedServer.h
-%%GLIB%%include/thrift/server/thrift_server.h
-%%GLIB%%include/thrift/server/thrift_simple_server.h
-%%GLIB%%include/thrift/thrift.h
-%%GLIB%%include/thrift/thrift_application_exception.h
-%%GLIB%%include/thrift/thrift_struct.h
+%%GLIB%%include/thrift/c_glib/server/thrift_server.h
+%%GLIB%%include/thrift/c_glib/server/thrift_simple_server.h
+%%GLIB%%include/thrift/c_glib/thrift.h
+%%GLIB%%include/thrift/c_glib/thrift_application_exception.h
+%%GLIB%%include/thrift/c_glib/thrift_struct.h
 include/thrift/transport/TBufferTransports.h
 include/thrift/transport/TFDTransport.h
 include/thrift/transport/TFileTransport.h
@@ -76,14 +76,14 @@ include/thrift/transport/TTransportExcep
 include/thrift/transport/TTransportUtils.h
 include/thrift/transport/TVirtualTransport.h
 include/thrift/transport/TZlibTransport.h
-%%GLIB%%include/thrift/transport/thrift_buffered_transport.h
-%%GLIB%%include/thrift/transport/thrift_framed_transport.h
-%%GLIB%%include/thrift/transport/thrift_memory_buffer.h
-%%GLIB%%include/thrift/transport/thrift_server_socket.h
-%%GLIB%%include/thrift/transport/thrift_server_transport.h
-%%GLIB%%include/thrift/transport/thrift_socket.h
-%%GLIB%%include/thrift/transport/thrift_transport.h
-%%GLIB%%include/thrift/transport/thrift_transport_factory.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_buffered_transport.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_framed_transport.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_memory_buffer.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_server_socket.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_server_transport.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_socket.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_transport.h
+%%GLIB%%include/thrift/c_glib/transport/thrift_transport_factory.h
 lib/libthrift.a
 lib/libthrift.la
 lib/libthrift.so
@@ -98,21 +98,25 @@ lib/libthriftnb.la
 lib/libthriftnb.so
 lib/libthriftnb.so.0
 lib/libthriftnb-%%PORTVERSION%%.so
-%%QT%%lib/libthriftqt-%%PORTVERSION%%.so
-%%QT%%lib/libthriftqt.a
-%%QT%%lib/libthriftqt.la
-%%QT%%lib/libthriftqt.so
+%%QT4%%lib/libthriftqt-%%PORTVERSION%%.so
+%%QT4%%lib/libthriftqt.a
+%%QT4%%lib/libthriftqt.la
+%%QT4%%lib/libthriftqt.so
 lib/libthriftz-%%PORTVERSION%%.so
 lib/libthriftz.a
 lib/libthriftz.la
 lib/libthriftz.so
 lib/libthriftz.so.0
-%%QT%%libdata/ldconfig/qt4-network
 libdata/pkgconfig/thrift-nb.pc
-%%QT%%libdata/pkgconfig/thrift-qt.pc
+%%QT4%%libdata/pkgconfig/thrift-qt.pc
 libdata/pkgconfig/thrift-z.pc
 libdata/pkgconfig/thrift.pc
 %%GLIB%%libdata/pkgconfig/thrift_c_glib.pc
+%%GLIB%%@dirrm include/thrift/c_glib/processor
+%%GLIB%%@dirrm include/thrift/c_glib/protocol
+%%GLIB%%@dirrm include/thrift/c_glib/server
+%%GLIB%%@dirrm include/thrift/c_glib/transport
+%%GLIB%%@dirrm include/thrift/c_glib
 @dirrm include/thrift/transport
 @dirrm include/thrift/server
 @dirrm include/thrift/qt

More information about the svn-ports-all mailing list