Date: Sat, 9 Nov 2013 15:19:59 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333300 - in head/devel/fb303: . files Message-ID: <201311091519.rA9FJxqq020865@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Nov 9 15:19:58 2013 New Revision: 333300 URL: http://svnweb.freebsd.org/changeset/ports/333300 Log: devel/fb303: catch up with thrift update PR: ports/183056 Submitted by: maintainer Added: head/devel/fb303/files/ head/devel/fb303/files/extra_patch-cpp__Makefile.am (contents, props changed) head/devel/fb303/files/patch-cpp__FacebookBase.cpp (contents, props changed) Modified: head/devel/fb303/Makefile head/devel/fb303/distinfo head/devel/fb303/pkg-plist Modified: head/devel/fb303/Makefile ============================================================================== --- head/devel/fb303/Makefile Sat Nov 9 15:18:18 2013 (r333299) +++ head/devel/fb303/Makefile Sat Nov 9 15:19:58 2013 (r333300) @@ -3,7 +3,6 @@ PORTNAME= fb303 PORTVERSION= ${THRIFT_PORTVERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE @@ -15,22 +14,32 @@ COMMENT= Facebook Bassline LICENSE= AL2 -LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \ - thrift:${PORTSDIR}/devel/thrift +LIB_DEPENDS= libthrift.so:${PORTSDIR}/devel/thrift-cpp +BUILD_DEPENDS= thrift:${PORTSDIR}/devel/thrift ACLOCAL_ARGS= -I ./aclocal AUTOMAKE_ARGS= -a CONFIGURE_ARGS= PY_PREFIX="${PREFIX}" -USE_AUTOTOOLS= aclocal automake autoconf -USE_GMAKE= yes -USES= perl5 +USE_AUTOTOOLS= autoconf autoheader:env aclocal automake + +USES= gmake perl5 compiler USE_PERL5= run USE_PYTHON= yes WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/fb303 PLIST_SUB+= PORTVERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}" +CONFIGURE_ARGS+= --without-php + NO_STAGE= yes + +.include <bsd.port.pre.mk> + +.if ${COMPILER_TYPE} == clang +USE_CXXSTD= c++11 +EXTRA_PATCHES+= ${FILESDIR}/extra_patch-cpp__Makefile.am +.endif + post-build: (cd ${WRKSRC} && ${LOCALBASE}/bin/thrift --gen perl ${WRKSRC}/if/fb303.thrift) Modified: head/devel/fb303/distinfo ============================================================================== --- head/devel/fb303/distinfo Sat Nov 9 15:18:18 2013 (r333299) +++ head/devel/fb303/distinfo Sat Nov 9 15:19:58 2013 (r333300) @@ -1,2 +1,2 @@ -SHA256 (thrift-0.9.0.tar.gz) = 71d129c49a2616069d9e7a93268cdba59518f77b3c41e763e09537cb3f3f0aac -SIZE (thrift-0.9.0.tar.gz) = 2794605 +SHA256 (thrift-0.9.1.tar.gz) = ac175080c8cac567b0331e394f23ac306472c071628396db2850cb00c41b0017 +SIZE (thrift-0.9.1.tar.gz) = 3402353 Added: head/devel/fb303/files/extra_patch-cpp__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/fb303/files/extra_patch-cpp__Makefile.am Sat Nov 9 15:19:58 2013 (r333300) @@ -0,0 +1,11 @@ +--- ./cpp/Makefile.am.orig 2013-08-15 18:04:29.000000000 +0400 ++++ ./cpp/Makefile.am 2013-10-17 19:36:43.000000000 +0400 +@@ -37,7 +37,7 @@ + # USE flags AM_CXXFLAGS, AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, LDADD in this section. + + AM_CPPFLAGS = -I.. +-AM_CPPFLAGS += -Igen-cpp ++AM_CPPFLAGS += -Igen-cpp -std=c++11 + AM_CPPFLAGS += -I$(thrift_home)/include/thrift + AM_CPPFLAGS += $(BOOST_CPPFLAGS) + AM_CPPFLAGS += $(FB_CPPFLAGS) $(DEBUG_CPPFLAGS) Added: head/devel/fb303/files/patch-cpp__FacebookBase.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/fb303/files/patch-cpp__FacebookBase.cpp Sat Nov 9 15:19:58 2013 (r333300) @@ -0,0 +1,20 @@ +--- ./cpp/FacebookBase.cpp.orig 2013-08-15 18:04:29.000000000 +0400 ++++ ./cpp/FacebookBase.cpp 2013-10-17 19:36:22.000000000 +0400 +@@ -27,7 +27,7 @@ + aliveSince_ = (int64_t) time(NULL); + } + +-inline void FacebookBase::getName(std::string& _return) { ++void FacebookBase::getName(std::string& _return) { + _return = name_; + } + +@@ -118,7 +118,7 @@ + return rv; + } + +-inline int64_t FacebookBase::aliveSince() { ++int64_t FacebookBase::aliveSince() { + return aliveSince_; + } + Modified: head/devel/fb303/pkg-plist ============================================================================== --- head/devel/fb303/pkg-plist Sat Nov 9 15:18:18 2013 (r333299) +++ head/devel/fb303/pkg-plist Sat Nov 9 15:19:58 2013 (r333300) @@ -21,7 +21,7 @@ lib/libfb303.a %%PYTHON_SITELIBDIR%%/fb303_scripts/__init__.pyc %%PYTHON_SITELIBDIR%%/fb303_scripts/fb303_simple_mgmt.py %%PYTHON_SITELIBDIR%%/fb303_scripts/fb303_simple_mgmt.pyc -%%PYTHON_SITELIBDIR%%/thrift-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info +%%PYTHON_SITELIBDIR%%/thrift_fb303-1.0.0_dev-py%%PYTHON_VER%%.egg-info %%DATADIR%%/if/fb303.thrift @dirrm %%DATADIR%%/if @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311091519.rA9FJxqq020865>