Attachment 117307 Details for Bug 159380 – thrift-0.6.1,1.patch

[patch] thrift-0.6.1,1.patch

thrift-0.6.1,1.patch (text/plain), 11.40 KB, created by Gasol Wu on 2011-08-02 12:00:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gasol Wu

Created: 2011-08-02 12:00:22 UTC

Size: 11.40 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/thrift/Makefile /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/Makefile
>--- /usr/ports/devel/thrift/Makefile	2010-12-11 07:05:04.000000000 +0800
>+++ /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/Makefile	2011-08-02 15:45:41.927864000 +0800
>@@ -6,21 +6,21 @@
> #
> 
> PORTNAME=	thrift
>-PORTVERSION=	0.4.0
>+PORTVERSION=	0.6.1
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	APACHE
>-MASTER_SITE_SUBDIR=	incubator/thrift/${PORTVERSION}-incubating
>-DISTNAME=	thrift-${PORTVERSION}
>+MASTER_SITE_SUBDIR=	/thrift/${PORTVERSION}
> 
> MAINTAINER=	skv@FreeBSD.org
> COMMENT=	Framework for scalable cross-language services development
> 
>-LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost-libs \
>-		event-1.4:${PORTSDIR}/devel/libevent
>+LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost-libs
>+
>+USE_AUTOTOOLS=	autoconf autoheader:env aclocal automake libtool
>+ACLOCAL_ARGS=	-I${WRKSRC}/aclocal
>+AUTOMAKE_ARGS=	--foreign --add-missing --copy
> 
>-USE_AUTOTOOLS=	autoconf:env autoheader:env aclocal:env \
>-		automake:env libtool:env
> USE_GNOME=	pkgconfig
> USE_GCC=	4.2+
> GNU_CONFIGURE=	yes
>@@ -29,8 +29,7 @@
> MAKE_JOBS_UNSAFE=	yes
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-CONFIGURE_ARGS=	--with-boost=${LOCALBASE} --with-libevent=${LOCALBASE} \
>-		--enable-shared --enable-static --with-zlib
>+CONFIGURE_ARGS=	--with-boost=${LOCALBASE} --enable-shared --enable-static
> CONFIGURE_ENV+=	${MAKE_ENV}
> 
> # For Erlang support, use devel/erlang-thrift.
>@@ -40,13 +39,16 @@
> # Other languages are not yet supported, please feel free to contribute
> # using one of the leaf ports as an example.
> CONFIGURE_ARGS+=	\
>+		--with-cpp \
> 		--without-csharp \
> 		--without-erlang \
> 		--without-java \
> 		--without-perl \
> 		--without-php \
>-		--without-py \
>-		--without-ruby
>+		--without-php_extension \
>+		--without-python \
>+		--without-ruby \
>+		--without-haskell
> 
> .include <bsd.port.pre.mk>
> 
>@@ -54,22 +56,22 @@
> BROKEN=		Does not compile on sparc64
> .endif
> 
>+.if !defined(WITHOUT_EVENT)
>+LIB_DEPENDS+=		event-1.4:${PORTSDIR}/devel/libevent
>+CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
>-
>-pre-configure:
>-	@(cd ${WRKSRC} && ./bootstrap.sh)
>+	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
> 
> 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
> 	@${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."
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "Note: The Thrift white paper may be downloaded from:"
>-	@${ECHO_MSG} "http://incubator.apache.org/thrift/static/thrift-20070401.pdf"
>+	@${ECHO_MSG} "http://thrift.apache.org/static/thrift-20070401.pdf"
> 	@${ECHO_MSG}
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/devel/thrift/distinfo /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/distinfo
>--- /usr/ports/devel/thrift/distinfo	2011-07-03 22:59:16.000000000 +0800
>+++ /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/distinfo	2011-08-01 17:18:12.844880000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (thrift-0.4.0.tar.gz) = 7cb8825a8888686ed6a9e229c9e9fcd9878a4af623785e1b22cdcc01a578d248
>-SIZE (thrift-0.4.0.tar.gz) = 1206710
>+SHA256 (thrift-0.6.1.tar.gz) = 1bed1ea17bf31c861fa8dd6e0182360eb8234383f32d0e4a36b70047b2e6b313
>+SIZE (thrift-0.6.1.tar.gz) = 2034583
>diff -ruN --exclude=CVS /usr/ports/devel/thrift/files/patch-configure.ac /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/files/patch-configure.ac
>--- /usr/ports/devel/thrift/files/patch-configure.ac	1970-01-01 08:00:00.000000000 +0800
>+++ /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/files/patch-configure.ac	2011-08-02 12:09:10.267239000 +0800
>@@ -0,0 +1,11 @@
>+--- ./configure.ac.orig	2011-08-02 12:08:58.444207000 +0800
>++++ ./configure.ac	2011-08-02 12:09:05.875591000 +0800
>+@@ -85,7 +85,7 @@
>+ have_cpp=no
>+ if test "$with_cpp" = "yes";  then
>+   AX_BOOST_BASE([1.33.1])
>+-  if test "x$succeeded" == "xyes" ; then
>++  if test "x$succeeded" = "xyes" ; then
>+     have_cpp="yes"
>+   fi
>+ 
>diff -ruN --exclude=CVS /usr/ports/devel/thrift/pkg-descr /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/pkg-descr
>--- /usr/ports/devel/thrift/pkg-descr	2009-06-24 06:20:17.000000000 +0800
>+++ /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/pkg-descr	2011-08-02 01:19:42.151416000 +0800
>@@ -9,4 +9,4 @@
> Thrift is specifically designed to support non-atomic version changes
> across client and server code.
> 
>-WWW: http://incubator.apache.org/thrift/
>+WWW: http://thrift.apache.org
>diff -ruN --exclude=CVS /usr/ports/devel/thrift/pkg-plist /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/pkg-plist
>--- /usr/ports/devel/thrift/pkg-plist	2010-12-11 07:05:04.000000000 +0800
>+++ /.amd_mnt/10.1.1.100/vol/users/pixuser/gasol/ports/devel/thrift/pkg-plist	2011-08-02 15:36:08.133574000 +0800
>@@ -1,71 +1,87 @@
>-@comment $FreeBSD: ports/devel/thrift/pkg-plist,v 1.4 2010/12/10 23:05:04 pgollucci Exp $
>-bin/thrift
>-include/thrift/TApplicationException.h
>-include/thrift/TLogging.h
>-include/thrift/TProcessor.h
>-include/thrift/TReflectionLocal.h
>-include/thrift/Thrift.h
>-include/thrift/concurrency/Exception.h
>-include/thrift/concurrency/FunctionRunner.h
>-include/thrift/concurrency/Monitor.h
>-include/thrift/concurrency/Mutex.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
>-include/thrift/config.h
>-include/thrift/processor/PeekProcessor.h
>-include/thrift/processor/StatsProcessor.h
>-include/thrift/protocol/TBase64Utils.h
>-include/thrift/protocol/TBinaryProtocol.h
>-include/thrift/protocol/TCompactProtocol.h
>-include/thrift/protocol/TDebugProtocol.h
>-include/thrift/protocol/TDenseProtocol.h
>-include/thrift/protocol/TJSONProtocol.h
>-include/thrift/protocol/TOneWayProtocol.h
>-include/thrift/protocol/TProtocol.h
>-include/thrift/protocol/TProtocolException.h
>-include/thrift/protocol/TProtocolTap.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
>-include/thrift/transport/TBufferTransports.h
>-include/thrift/transport/TFDTransport.h
>-include/thrift/transport/TFileTransport.h
>-include/thrift/transport/THttpClient.h
>-include/thrift/transport/THttpServer.h
>-include/thrift/transport/THttpTransport.h
>-include/thrift/transport/TServerSocket.h
>-include/thrift/transport/TServerTransport.h
>-include/thrift/transport/TShortReadTransport.h
>-include/thrift/transport/TSimpleFileTransport.h
>-include/thrift/transport/TSocket.h
>-include/thrift/transport/TSocketPool.h
>-include/thrift/transport/TTransport.h
>-include/thrift/transport/TTransportException.h
>-include/thrift/transport/TTransportUtils.h
>-include/thrift/transport/TZlibTransport.h
>-lib/libthrift.a
>-lib/libthrift.la
>-lib/libthrift.so
>-lib/libthrift.so.0
>-lib/libthriftnb.a
>-lib/libthriftnb.la
>-lib/libthriftnb.so
>-lib/libthriftnb.so.0
>-lib/libthriftz.a
>-lib/libthriftz.la
>-lib/libthriftz.so
>-lib/libthriftz.so.0
>-libdata/pkgconfig/thrift-nb.pc
>-libdata/pkgconfig/thrift-z.pc
>-libdata/pkgconfig/thrift.pc
>-@dirrm include/thrift/transport
>-@dirrm include/thrift/server
>-@dirrm include/thrift/protocol
>-@dirrm include/thrift/processor
>-@dirrm include/thrift/concurrency
>-@dirrm include/thrift
>+usr/local/bin/thrift
>+usr/local/include/thrift/TApplicationException.h
>+usr/local/include/thrift/TLogging.h
>+usr/local/include/thrift/TProcessor.h
>+usr/local/include/thrift/TReflectionLocal.h
>+usr/local/include/thrift/Thrift.h
>+usr/local/include/thrift/async/SimpleCallback.h
>+usr/local/include/thrift/async/TAsyncBufferProcessor.h
>+usr/local/include/thrift/async/TAsyncChannel.h
>+usr/local/include/thrift/async/TAsyncProcessor.h
>+usr/local/include/thrift/async/TAsyncProtocolProcessor.h
>+usr/local/include/thrift/async/TEvhttpClientChannel.h
>+usr/local/include/thrift/async/TEvhttpServer.h
>+usr/local/include/thrift/concurrency/Exception.h
>+usr/local/include/thrift/concurrency/FunctionRunner.h
>+usr/local/include/thrift/concurrency/Monitor.h
>+usr/local/include/thrift/concurrency/Mutex.h
>+usr/local/include/thrift/concurrency/PosixThreadFactory.h
>+usr/local/include/thrift/concurrency/Thread.h
>+usr/local/include/thrift/concurrency/ThreadManager.h
>+usr/local/include/thrift/concurrency/TimerManager.h
>+usr/local/include/thrift/concurrency/Util.h
>+usr/local/include/thrift/processor/PeekProcessor.h
>+usr/local/include/thrift/processor/StatsProcessor.h
>+usr/local/include/thrift/protocol/TBase64Utils.h
>+usr/local/include/thrift/protocol/TBinaryProtocol.h
>+usr/local/include/thrift/protocol/TBinaryProtocol.tcc
>+usr/local/include/thrift/protocol/TCompactProtocol.h
>+usr/local/include/thrift/protocol/TCompactProtocol.tcc
>+usr/local/include/thrift/protocol/TDebugProtocol.h
>+usr/local/include/thrift/protocol/TDenseProtocol.h
>+usr/local/include/thrift/protocol/TJSONProtocol.h
>+usr/local/include/thrift/protocol/TProtocol.h
>+usr/local/include/thrift/protocol/TProtocolException.h
>+usr/local/include/thrift/protocol/TProtocolTap.h
>+usr/local/include/thrift/protocol/TVirtualProtocol.h
>+usr/local/include/thrift/server/TNonblockingServer.h
>+usr/local/include/thrift/server/TServer.h
>+usr/local/include/thrift/server/TSimpleServer.h
>+usr/local/include/thrift/server/TThreadPoolServer.h
>+usr/local/include/thrift/server/TThreadedServer.h
>+usr/local/include/thrift/transport/TBufferTransports.h
>+usr/local/include/thrift/transport/TFDTransport.h
>+usr/local/include/thrift/transport/TFileTransport.h
>+usr/local/include/thrift/transport/THttpClient.h
>+usr/local/include/thrift/transport/THttpServer.h
>+usr/local/include/thrift/transport/THttpTransport.h
>+usr/local/include/thrift/transport/TServerSocket.h
>+usr/local/include/thrift/transport/TServerTransport.h
>+usr/local/include/thrift/transport/TShortReadTransport.h
>+usr/local/include/thrift/transport/TSimpleFileTransport.h
>+usr/local/include/thrift/transport/TSocket.h
>+usr/local/include/thrift/transport/TSocketPool.h
>+usr/local/include/thrift/transport/TTransport.h
>+usr/local/include/thrift/transport/TTransportException.h
>+usr/local/include/thrift/transport/TTransportUtils.h
>+usr/local/include/thrift/transport/TVirtualTransport.h
>+usr/local/include/thrift/transport/TZlibTransport.h
>+usr/local/lib/libthrift.a
>+usr/local/lib/libthrift.la
>+usr/local/lib/libthrift.so
>+usr/local/lib/libthrift.so.0
>+usr/local/lib/libthriftnb.a
>+usr/local/lib/libthriftnb.la
>+usr/local/lib/libthriftnb.so
>+usr/local/lib/libthriftnb.so.0
>+usr/local/lib/libthriftz.a
>+usr/local/lib/libthriftz.la
>+usr/local/lib/libthriftz.so
>+usr/local/lib/libthriftz.so.0
>+usr/local/libdata/pkgconfig/thrift-nb.pc
>+usr/local/libdata/pkgconfig/thrift-z.pc
>+usr/local/libdata/pkgconfig/thrift.pc
>+@dirrm usr/local/libdata/pkgconfig
>+@dirrm usr/local/libdata
>+@dirrm usr/local/lib
>+@dirrm usr/local/include/thrift/transport
>+@dirrm usr/local/include/thrift/server
>+@dirrm usr/local/include/thrift/protocol
>+@dirrm usr/local/include/thrift/processor
>+@dirrm usr/local/include/thrift/concurrency
>+@dirrm usr/local/include/thrift/async
>+@dirrm usr/local/include/thrift
>+@dirrm usr/local/include
>+@dirrm usr/local/bin
>+@dirrm usr/local
>+@dirrm usr

Actions: View | Diff

Attachments on bug 159380: 117307