From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 17 13:50:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BCA22756 for ; Thu, 17 Oct 2013 13:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B5AC2158 for ; Thu, 17 Oct 2013 13:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HDo1No098469 for ; Thu, 17 Oct 2013 13:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9HDo1uQ098468; Thu, 17 Oct 2013 13:50:01 GMT (envelope-from gnats) Resent-Date: Thu, 17 Oct 2013 13:50:01 GMT Resent-Message-Id: <201310171350.r9HDo1uQ098468@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Valery Komarov Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 48787331 for ; Thu, 17 Oct 2013 13:45:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 36E6B20F0 for ; Thu, 17 Oct 2013 13:45:02 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9HDj2Yl025937 for ; Thu, 17 Oct 2013 13:45:02 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9HDj2EL025934; Thu, 17 Oct 2013 13:45:02 GMT (envelope-from nobody) Message-Id: <201310171345.r9HDj2EL025934@oldred.freebsd.org> Date: Thu, 17 Oct 2013 13:45:02 GMT From: Valery Komarov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/183056: [MAINTAINER] devel/fb303 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 13:50:01 -0000 >Number: 183056 >Category: ports >Synopsis: [MAINTAINER] devel/fb303 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 17 13:50:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Valery Komarov >Release: FreeBSD 10.0-ALPHA2 >Organization: >Environment: >Description: Upgrade to 0.9.1 ports: devel/fb303 devel/php5-thrift devel/py-thrift devel/rubygem-thrift net/scribe devel/thrift-c_glib devel/thrift-cpp devel/thrift must be committed together. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/devel/fb303/Makefile fb303/Makefile --- /usr/ports/devel/fb303/Makefile 2013-09-20 21:04:43.000000000 +0400 +++ fb303/Makefile 2013-10-17 20:43:11.000000000 +0400 @@ -3,7 +3,6 @@ PORTNAME= fb303 PORTVERSION= ${THRIFT_PORTVERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE @@ -15,22 +14,32 @@ LICENSE= AL2 -LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \ - thrift:${PORTSDIR}/devel/thrift +LIB_DEPENDS= thrift:${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 + +.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) diff -ruN /usr/ports/devel/fb303/distinfo fb303/distinfo --- /usr/ports/devel/fb303/distinfo 2013-02-26 20:20:16.000000000 +0400 +++ fb303/distinfo 2013-10-16 01:53:46.000000000 +0400 @@ -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 diff -ruN /usr/ports/devel/fb303/files/extra_patch-cpp__Makefile.am fb303/files/extra_patch-cpp__Makefile.am --- /usr/ports/devel/fb303/files/extra_patch-cpp__Makefile.am 1970-01-01 03:00:00.000000000 +0300 +++ fb303/files/extra_patch-cpp__Makefile.am 2013-10-17 19:36:48.000000000 +0400 @@ -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) diff -ruN /usr/ports/devel/fb303/files/patch-cpp__FacebookBase.cpp fb303/files/patch-cpp__FacebookBase.cpp --- /usr/ports/devel/fb303/files/patch-cpp__FacebookBase.cpp 1970-01-01 03:00:00.000000000 +0300 +++ fb303/files/patch-cpp__FacebookBase.cpp 2013-10-17 19:36:48.000000000 +0400 @@ -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_; + } + diff -ruN /usr/ports/devel/fb303/pkg-plist fb303/pkg-plist --- /usr/ports/devel/fb303/pkg-plist 2013-03-13 10:51:06.000000000 +0400 +++ fb303/pkg-plist 2013-10-17 18:31:12.000000000 +0400 @@ -21,7 +21,7 @@ %%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%% >Release-Note: >Audit-Trail: >Unformatted: