- Update thrift to 0.8.0 [1]

- Add bsd.thrift.mk file with portversion number to allow for sync of thrift ports [2]
- pet portlint

PR:		ports/163131 [1]
Submitted by:	scheidell [2]
Approved by:	gabor (mentor)

9 files changed, 78 insertions, 47 deletions

diff --git a/UPDATING b/UPDATING
index ef266348b946..777107d129d0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120104:
+  AFFECTS: users of devel/thrift, py-thrift, php5-thrift, p5-thrift
+  AUTHOR: scheidell@FreeBSD.org
+
+  Users upgrading thrift from 0.6.1, please take note: library structure
+  and versions have changed, and are not compatible with 0.7.0+
+
 20111231:
   AFFECTS: users of lang/newlisp
   AUTHOR: olgeni@FreeBSD.org
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 74b17045f1ae..28570e1ca455 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	0.7.0
+PORTVERSION=	${THRIFT_PORTVERSION}	# get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE
@@ -39,7 +39,7 @@ OPTIONS=	GLIB "Building C (GLib) Library" off
 
 # For Perl support, use devel/p5-Thrift.
 # For Python support, use devel/py-thrift.
-# For Ruby support, use devel/ruby-thrift.
+# For Ruby support, use devel/rubygem-thrift.
 # For PHP support, use devel/php5-thrift.
 # Other languages are not yet supported, please feel free to contribute
 # using one of the leaf ports as an example.
@@ -55,17 +55,20 @@ CONFIGURE_ARGS+=	\
 		--without-python \
 		--without-ruby
 
+.include <bsd.port.pre.mk>
+.include "bsd.thrift.mk"
+
 .if !defined(WITHOUT_GLIB)
     CONFIGURE_ARGS+=	--with-c_glib
     LIB_DEPENDS+=	glib-2.0:${PORTSDIR}/devel/glib20
-    MAKE_ENV+=	WITH_GLIB=1
-    PLIST_SUB+=	WITH_GLIB=""
+    PLIST_SUB+=		GLIB=""
+    WITH_GLIB=		true
 .else
     CONFIGURE_ARGS+=	--without-c_glib
-    PLIST_SUB+=	WITH_GLIB="@comment "
+    PLIST_SUB+=		GLIB="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
@@ -73,17 +76,15 @@ BROKEN=		Does not compile on ia64, powerpc, or sparc64
 
 post-patch:
 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
+	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am
 
 pre-configure:
 	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
-	${CHMOD} 774 ${WRKSRC}/configure
-	${CHMOD} 774 ${WRKSRC}/install-sh
-	${CHMOD} 774 ${WRKSRC}/lib/php/src/ext/thrift_protocol/build/shtool
 
 post-install:
-	@${LN} -sf ${PREFIX}/lib/libthrift.so.0 ${PREFIX}/lib/libthrift.so
-	@${LN} -sf ${PREFIX}/lib/libthriftnb.so.0 ${PREFIX}/lib/libthriftnb.so
-	@${LN} -sf ${PREFIX}/lib/libthriftz.so.0 ${PREFIX}/lib/libthriftz.so
+	@${LN} -sf ${PREFIX}/lib/libthrift-${PORTVERSION}.so ${PREFIX}/lib/libthrift.so.0
+	@${LN} -sf ${PREFIX}/lib/libthriftnb-${PORTVERSION}.so ${PREFIX}/lib/libthriftnb.so.0
+	@${LN} -sf ${PREFIX}/lib/libthriftz-${PORTVERSION}.so ${PREFIX}/lib/libthriftz.so.0
 	@${ECHO_MSG}
 	@${ECHO_MSG} "For use with C++, the same compiler as used to build this port must be used"
 	@${ECHO_MSG} "to compile and link your generated IDL bindings."
diff --git a/devel/thrift/bsd.thrift.mk b/devel/thrift/bsd.thrift.mk
new file mode 100644
index 000000000000..b2913889c973
--- /dev/null
+++ b/devel/thrift/bsd.thrift.mk
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+# to use:
+# in your makefile, set:
+# PORTVERSION=	${THRIFT_PORTVERSION}
+# see $PORTSDIR/devel/thrift for examples 
+THRIFT_PORTVERSION=	0.8.0
diff --git a/devel/thrift/distinfo b/devel/thrift/distinfo
index 6d10b1d384a2..fb6450f653bd 100644
--- a/devel/thrift/distinfo
+++ b/devel/thrift/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thrift-0.7.0.tar.gz) = ca830156f6f1f94e77823eb5db6ff8f532ed5ccb9e913df83d0c3d6c4ddb9009
-SIZE (thrift-0.7.0.tar.gz) = 2248326
+SHA256 (thrift-0.8.0.tar.gz) = 5e280097d88400f5e2db75595a04e1981538e48869cd6915bb9c4831605f0793
+SIZE (thrift-0.8.0.tar.gz) = 2336261
diff --git a/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h b/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h
index 6bc412c72c5c..6350127415c0 100644
--- a/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h
+++ b/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h
@@ -1,5 +1,5 @@
---- ./lib/c_glib/src/transport/thrift_framed_transport.h.orig	2011-08-11 17:18:58.000000000 +0400
-+++ ./lib/c_glib/src/transport/thrift_framed_transport.h	2011-08-26 12:00:03.000000000 +0400
+--- ./lib/c_glib/src/transport/thrift_framed_transport.h.orig	2011-11-26 23:00:36.000000000 +0400
++++ ./lib/c_glib/src/transport/thrift_framed_transport.h	2011-12-25 15:09:17.000000000 +0400
 @@ -22,6 +22,7 @@
  
  #include <glib.h>
diff --git a/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h b/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h
index 698e4eae6c15..a0511c8bf066 100644
--- a/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h
+++ b/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h
@@ -1,5 +1,5 @@
---- ./lib/c_glib/src/transport/thrift_socket.h.orig	2011-08-11 17:18:58.000000000 +0400
-+++ ./lib/c_glib/src/transport/thrift_socket.h	2011-08-26 11:58:33.000000000 +0400
+--- ./lib/c_glib/src/transport/thrift_socket.h.orig	2011-11-26 23:00:36.000000000 +0400
++++ ./lib/c_glib/src/transport/thrift_socket.h	2011-12-25 15:09:17.000000000 +0400
 @@ -21,6 +21,8 @@
  #define _THRIFT_SOCKET_H
  
diff --git a/devel/thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc b/devel/thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc
new file mode 100644
index 000000000000..74260d5280af
--- /dev/null
+++ b/devel/thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc
@@ -0,0 +1,11 @@
+--- ./lib/cpp/src/protocol/TBinaryProtocol.tcc.orig       2011-11-26 23:00:40.000000000 +0400
++++ ./lib/cpp/src/protocol/TBinaryProtocol.tcc     2011-12-08 23:53:23.000000000 +0400
+@@ -23,7 +23,7 @@
+ #include "TBinaryProtocol.h"
+ 
+ #include <limits>
+-
++#include <netinet/in.h>
+ 
+ namespace apache { namespace thrift { namespace protocol {
+ 
diff --git a/devel/thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h b/devel/thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h
index 1d92c3997951..312ded952b20 100644
--- a/devel/thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h
+++ b/devel/thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h
@@ -1,7 +1,7 @@
---- ./lib/cpp/src/server/TNonblockingServer.h.orig	2011-08-11 17:18:59.000000000 +0400
-+++ ./lib/cpp/src/server/TNonblockingServer.h	2011-08-26 11:47:01.000000000 +0400
-@@ -33,6 +33,9 @@
- #include <unistd.h>
+--- ./lib/cpp/src/server/TNonblockingServer.h.orig	2011-11-26 23:00:40.000000000 +0400
++++ ./lib/cpp/src/server/TNonblockingServer.h	2011-12-25 15:09:17.000000000 +0400
+@@ -35,6 +35,9 @@
+ #endif
  #include <event.h>
  
 +#include <sys/types.h>
diff --git a/devel/thrift/pkg-plist b/devel/thrift/pkg-plist
index 9ce0afa763a0..d152941189d5 100644
--- a/devel/thrift/pkg-plist
+++ b/devel/thrift/pkg-plist
@@ -10,19 +10,21 @@ include/thrift/async/TAsyncProcessor.h
 include/thrift/async/TAsyncProtocolProcessor.h
 include/thrift/async/TEvhttpClientChannel.h
 include/thrift/async/TEvhttpServer.h
+include/thrift/concurrency/BoostThreadFactory.h
 include/thrift/concurrency/Exception.h
 include/thrift/concurrency/FunctionRunner.h
 include/thrift/concurrency/Monitor.h
 include/thrift/concurrency/Mutex.h
+include/thrift/concurrency/PlatformThreadFactory.h
 include/thrift/concurrency/PosixThreadFactory.h
 include/thrift/concurrency/Thread.h
 include/thrift/concurrency/ThreadManager.h
 include/thrift/concurrency/TimerManager.h
 include/thrift/concurrency/Util.h
-%%WITH_GLIB%%include/thrift/config.h
+%%GLIB%%include/thrift/config.h
 include/thrift/processor/PeekProcessor.h
 include/thrift/processor/StatsProcessor.h
-%%WITH_GLIB%%include/thrift/processor/thrift_processor.h
+%%GLIB%%include/thrift/processor/thrift_processor.h
 include/thrift/protocol/TBase64Utils.h
 include/thrift/protocol/TBinaryProtocol.h
 include/thrift/protocol/TBinaryProtocol.tcc
@@ -35,20 +37,20 @@ include/thrift/protocol/TProtocol.h
 include/thrift/protocol/TProtocolException.h
 include/thrift/protocol/TProtocolTap.h
 include/thrift/protocol/TVirtualProtocol.h
-%%WITH_GLIB%%include/thrift/protocol/thrift_binary_protocol.h
-%%WITH_GLIB%%include/thrift/protocol/thrift_binary_protocol_factory.h
-%%WITH_GLIB%%include/thrift/protocol/thrift_protocol.h
-%%WITH_GLIB%%include/thrift/protocol/thrift_protocol_factory.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
 include/thrift/server/TNonblockingServer.h
 include/thrift/server/TServer.h
 include/thrift/server/TSimpleServer.h
 include/thrift/server/TThreadPoolServer.h
 include/thrift/server/TThreadedServer.h
-%%WITH_GLIB%%include/thrift/server/thrift_server.h
-%%WITH_GLIB%%include/thrift/server/thrift_simple_server.h
-%%WITH_GLIB%%include/thrift/thrift.h
-%%WITH_GLIB%%include/thrift/thrift_application_exception.h
-%%WITH_GLIB%%include/thrift/thrift_struct.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
 include/thrift/transport/TBufferTransports.h
 include/thrift/transport/TFDTransport.h
 include/thrift/transport/TFileTransport.h
@@ -68,35 +70,37 @@ include/thrift/transport/TTransportException.h
 include/thrift/transport/TTransportUtils.h
 include/thrift/transport/TVirtualTransport.h
 include/thrift/transport/TZlibTransport.h
-%%WITH_GLIB%%include/thrift/transport/thrift_buffered_transport.h
-%%WITH_GLIB%%include/thrift/transport/thrift_framed_transport.h
-%%WITH_GLIB%%include/thrift/transport/thrift_memory_buffer.h
-%%WITH_GLIB%%include/thrift/transport/thrift_server_socket.h
-%%WITH_GLIB%%include/thrift/transport/thrift_server_transport.h
-%%WITH_GLIB%%include/thrift/transport/thrift_socket.h
-%%WITH_GLIB%%include/thrift/transport/thrift_transport.h
-%%WITH_GLIB%%include/thrift/transport/thrift_transport_factory.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
 lib/libthrift.a
 lib/libthrift.la
 lib/libthrift.so
 lib/libthrift.so.0
-%%WITH_GLIB%%lib/libthrift_c_glib.a
-%%WITH_GLIB%%lib/libthrift_c_glib.la
-%%WITH_GLIB%%lib/libthrift_c_glib.so
-%%WITH_GLIB%%lib/libthrift_c_glib.so.0
+lib/libthrift-%%PORTVERSION%%.so
+%%GLIB%%lib/libthrift_c_glib.a
+%%GLIB%%lib/libthrift_c_glib.la
+%%GLIB%%lib/libthrift_c_glib.so
+%%GLIB%%lib/libthrift_c_glib.so.0
 lib/libthriftnb.a
 lib/libthriftnb.la
 lib/libthriftnb.so
 lib/libthriftnb.so.0
+lib/libthriftnb-%%PORTVERSION%%.so
 lib/libthriftz.a
 lib/libthriftz.la
 lib/libthriftz.so
 lib/libthriftz.so.0
-%%WITH_GLIB%%lib/pkgconfig/thrift_c_glib.pc
-@dirrmtry %%WITH_GLIB%%lib/pkgconfig
+lib/libthriftz-%%PORTVERSION%%.so
 libdata/pkgconfig/thrift-nb.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/protocol