From owner-svn-ports-head@freebsd.org Tue Jan 26 22:58:38 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D490CA6EC00; Tue, 26 Jan 2016 22:58:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 934557AA; Tue, 26 Jan 2016 22:58:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0QMwbsY099470; Tue, 26 Jan 2016 22:58:37 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0QMwbL4099468; Tue, 26 Jan 2016 22:58:37 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201601262258.u0QMwbL4099468@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Tue, 26 Jan 2016 22:58:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407323 - in head/databases/php5-pdo_cassandra: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2016 22:58:39 -0000 Author: rene Date: Tue Jan 26 22:58:37 2016 New Revision: 407323 URL: https://svnweb.freebsd.org/changeset/ports/407323 Log: databases/php5-pdo_cassandra: unbreak - Do not hardcode expired PHP version - Fix regression with Thrift 0.9.3, see https://issues.apache.org/jira/browse/THRIFT-3317 - Use C++11 compiler via the Ports framework instead of hardcoding GCC - Bump PORTREVISION PR: 205749 Submitted by: stephon@gmail.com Approved by: Gasol Wu (maintainer) MFH: 2016Q1 Modified: head/databases/php5-pdo_cassandra/Makefile head/databases/php5-pdo_cassandra/files/patch-config.m4 Modified: head/databases/php5-pdo_cassandra/Makefile ============================================================================== --- head/databases/php5-pdo_cassandra/Makefile Tue Jan 26 22:52:29 2016 (r407322) +++ head/databases/php5-pdo_cassandra/Makefile Tue Jan 26 22:58:37 2016 (r407323) @@ -3,7 +3,7 @@ PORTNAME= pdo_cassandra PORTVERSION= 0.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases PKGNAMEPREFIX= php5- @@ -12,10 +12,6 @@ COMMENT= PDO driver for Apache Cassandra LICENSE= APACHE20 -BROKEN= fails to compile -DEPRECATED= PHP 5.4 EOL reached -EXPIRATION_DATE= 2016-01-15 - LIB_DEPENDS= libboost_iostreams.so:${PORTSDIR}/devel/boost-libs USE_GITHUB= yes @@ -23,13 +19,11 @@ GH_ACCOUNT= mkoppanen GH_PROJECT= php-${PORTNAME} GH_TAGNAME= 7debd5b -USES= pkgconfig +USES= compiler:c++11-lang pkgconfig +USE_CXXSTD= c++11 USE_PHP_BUILD= yes USE_PHP= pdo USE_PHPEXT= yes -PHP_DEFAULT= 5.4 -IGNORE_WITH_PHP=52 -USE_GCC= yes .include .include "${PORTSDIR}/devel/thrift/bsd.thrift.mk" @@ -46,9 +40,8 @@ LIB_DEPENDS+= libthrift.so:${PORTSDIR}/d .endif post-configure: -.if ${THRIFT_PORTVERSION} == "0.8.0" - ${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.h ${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.cpp -.endif + ${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.h + ${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/cassandra_types.cpp .include Modified: head/databases/php5-pdo_cassandra/files/patch-config.m4 ============================================================================== --- head/databases/php5-pdo_cassandra/files/patch-config.m4 Tue Jan 26 22:52:29 2016 (r407322) +++ head/databases/php5-pdo_cassandra/files/patch-config.m4 Tue Jan 26 22:58:37 2016 (r407323) @@ -1,6 +1,6 @@ ---- ./config.m4.orig 2011-12-30 17:41:22.000000000 +0800 -+++ ./config.m4 2013-11-14 21:46:12.000000000 +0800 -@@ -38,8 +38,18 @@ +--- config.m4.orig 2011-12-30 09:41:22 UTC ++++ config.m4 +@@ -38,8 +38,18 @@ if test "x${PHP_PDO_CASSANDRA}" != "xno" PHP_THRIFT_VERSION=`${PKG_CONFIG} thrift --modversion` AC_MSG_RESULT([found version ${PHP_THRIFT_VERSION}])