Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Feb 2013 16:17:27 +0000 (UTC)
From:      Michael Scheidell <scheidell@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r312988 - in head/devel/thrift: . files
Message-ID:  <201302261617.r1QGHRbP073880@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: scheidell
Date: Tue Feb 26 16:17:26 2013
New Revision: 312988
URL: http://svnweb.freebsd.org/changeset/ports/312988

Log:
  - Update to to version 0.9.0[1]
  - Update to new Makefile Header[2]
  
  PR:		ports/172806
  Reviewed by:	scheidell (me) [2]
  Approved by:	maintainer [1]

Added:
  head/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h   (contents, props changed)
  head/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h   (contents, props changed)
  head/devel/thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc   (contents, props changed)
  head/devel/thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h   (contents, props changed)
Deleted:
  head/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h
  head/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h
  head/devel/thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc
  head/devel/thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h
Modified:
  head/devel/thrift/Makefile   (contents, props changed)
  head/devel/thrift/bsd.thrift.mk   (contents, props changed)
  head/devel/thrift/distinfo   (contents, props changed)
  head/devel/thrift/pkg-plist   (contents, props changed)

Modified: head/devel/thrift/Makefile
==============================================================================
--- head/devel/thrift/Makefile	Tue Feb 26 15:59:15 2013	(r312987)
+++ head/devel/thrift/Makefile	Tue Feb 26 16:17:26 2013	(r312988)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	thrift
-# Date created:	   27 September 2007
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION}	# get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies
@@ -35,8 +31,8 @@ CONFIGURE_ARGS=	--with-boost=${LOCALBASE
 		--enable-shared --enable-static --with-zlib
 CONFIGURE_ENV+=	${MAKE_ENV}
 
-OPTIONS=	GLIB "Building C (GLib) Library" off
-
+OPTIONS=	GLIB "Building C (GLib) Library" off \
+		QT "Building Qt Library" off
 # For Perl support, use devel/p5-Thrift.
 # For Python support, use devel/py-thrift.
 # For Ruby support, use devel/rubygem-thrift.
@@ -68,6 +64,16 @@ CONFIGURE_ARGS+=	\
     PLIST_SUB+=		GLIB="@comment "
 .endif
 
+.if !defined(WITHOUT_QT)
+    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
+
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"

Modified: head/devel/thrift/bsd.thrift.mk
==============================================================================
--- head/devel/thrift/bsd.thrift.mk	Tue Feb 26 15:59:15 2013	(r312987)
+++ head/devel/thrift/bsd.thrift.mk	Tue Feb 26 16:17:26 2013	(r312988)
@@ -5,4 +5,4 @@
 # in your makefile, set:
 # PORTVERSION=	${THRIFT_PORTVERSION}
 # see $PORTSDIR/devel/thrift for examples 
-THRIFT_PORTVERSION=	0.8.0
+THRIFT_PORTVERSION=	0.9.0

Modified: head/devel/thrift/distinfo
==============================================================================
--- head/devel/thrift/distinfo	Tue Feb 26 15:59:15 2013	(r312987)
+++ head/devel/thrift/distinfo	Tue Feb 26 16:17:26 2013	(r312988)
@@ -1,2 +1,2 @@
-SHA256 (thrift-0.8.0.tar.gz) = 5e280097d88400f5e2db75595a04e1981538e48869cd6915bb9c4831605f0793
-SIZE (thrift-0.8.0.tar.gz) = 2336261
+SHA256 (thrift-0.9.0.tar.gz) = 71d129c49a2616069d9e7a93268cdba59518f77b3c41e763e09537cb3f3f0aac
+SIZE (thrift-0.9.0.tar.gz) = 2794605

Added: head/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h	Tue Feb 26 16:17:26 2013	(r312988)
@@ -0,0 +1,10 @@
+--- ./lib/c_glib/src/thrift/transport/thrift_framed_transport.h.orig	2012-10-12 04:58:04.000000000 +0400
++++ ./lib/c_glib/src/thrift/transport/thrift_framed_transport.h	2012-10-16 16:40:46.811818260 +0400
+@@ -22,6 +22,7 @@
+ 
+ #include <glib.h>
+ #include <glib-object.h>
++#include <netinet/in.h>
+ 
+ #include <thrift/transport/thrift_transport.h>
+ 

Added: head/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h	Tue Feb 26 16:17:26 2013	(r312988)
@@ -0,0 +1,11 @@
+--- ./lib/c_glib/src/thrift/transport/thrift_socket.h.orig	2012-10-12 04:58:04.000000000 +0400
++++ ./lib/c_glib/src/thrift/transport/thrift_socket.h	2012-10-16 16:39:22.000000000 +0400
+@@ -21,6 +21,8 @@
+ #define _THRIFT_SOCKET_H
+ 
+ #include <glib-object.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ 
+ #include <thrift/transport/thrift_transport.h>
+ 

Added: head/devel/thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc	Tue Feb 26 16:17:26 2013	(r312988)
@@ -0,0 +1,11 @@
+--- ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig	2012-10-12 04:58:06.000000000 +0400
++++ ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc	2012-10-16 16:41:57.890819558 +0400
+@@ -23,7 +23,7 @@
+ #include "TBinaryProtocol.h"
+ 
+ #include <limits>
+-
++#include <netinet/in.h>
+ 
+ namespace apache { namespace thrift { namespace protocol {
+ 

Added: head/devel/thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h	Tue Feb 26 16:17:26 2013	(r312988)
@@ -0,0 +1,12 @@
+--- ./lib/cpp/src/thrift/server/TNonblockingServer.h.orig	2012-10-12 04:58:06.000000000 +0400
++++ ./lib/cpp/src/thrift/server/TNonblockingServer.h	2012-10-16 16:42:27.884820801 +0400
+@@ -38,7 +38,8 @@
+ #include <unistd.h>
+ #endif
+ #include <event.h>
+-
++#include <sys/types.h>
++#include <sys/socket.h>
+ 
+ 
+ namespace apache { namespace thrift { namespace server {

Modified: head/devel/thrift/pkg-plist
==============================================================================
--- head/devel/thrift/pkg-plist	Tue Feb 26 15:59:15 2013	(r312987)
+++ head/devel/thrift/pkg-plist	Tue Feb 26 16:17:26 2013	(r312988)
@@ -1,11 +1,13 @@
 bin/thrift
 include/thrift/TApplicationException.h
+include/thrift/TDispatchProcessor.h
 include/thrift/TLogging.h
 include/thrift/TProcessor.h
 include/thrift/TReflectionLocal.h
 include/thrift/Thrift.h
 include/thrift/async/TAsyncBufferProcessor.h
 include/thrift/async/TAsyncChannel.h
+include/thrift/async/TAsyncDispatchProcessor.h
 include/thrift/async/TAsyncProcessor.h
 include/thrift/async/TAsyncProtocolProcessor.h
 include/thrift/async/TEvhttpClientChannel.h
@@ -41,6 +43,8 @@ include/thrift/protocol/TVirtualProtocol
 %%GLIB%%include/thrift/protocol/thrift_binary_protocol_factory.h
 %%GLIB%%include/thrift/protocol/thrift_protocol.h
 %%GLIB%%include/thrift/protocol/thrift_protocol_factory.h
+include/thrift/qt/TQIODeviceTransport.h
+include/thrift/qt/TQTcpServer.h
 include/thrift/server/TNonblockingServer.h
 include/thrift/server/TServer.h
 include/thrift/server/TSimpleServer.h
@@ -57,6 +61,8 @@ include/thrift/transport/TFileTransport.
 include/thrift/transport/THttpClient.h
 include/thrift/transport/THttpServer.h
 include/thrift/transport/THttpTransport.h
+include/thrift/transport/TPipe.h
+include/thrift/transport/TPipeServer.h
 include/thrift/transport/TSSLServerSocket.h
 include/thrift/transport/TSSLSocket.h
 include/thrift/transport/TServerSocket.h
@@ -92,17 +98,24 @@ 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
+lib/libthriftz-%%PORTVERSION%%.so
 lib/libthriftz.a
 lib/libthriftz.la
 lib/libthriftz.so
 lib/libthriftz.so.0
-lib/libthriftz-%%PORTVERSION%%.so
+%%QT%%libdata/ldconfig/qt4-network
 libdata/pkgconfig/thrift-nb.pc
+%%QT%%libdata/pkgconfig/thrift-qt.pc
 libdata/pkgconfig/thrift-z.pc
 libdata/pkgconfig/thrift.pc
 %%GLIB%%libdata/pkgconfig/thrift_c_glib.pc
 @dirrm include/thrift/transport
 @dirrm include/thrift/server
+@dirrm include/thrift/qt
 @dirrm include/thrift/protocol
 @dirrm include/thrift/processor
 @dirrm include/thrift/concurrency



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302261617.r1QGHRbP073880>