From owner-svn-ports-head@FreeBSD.ORG Fri Nov 15 17:55:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 273738E5; Fri, 15 Nov 2013 17:55:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 16F632A92; Fri, 15 Nov 2013 17:55:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAFHtRBd014088; Fri, 15 Nov 2013 17:55:27 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAFHtRBA014082; Fri, 15 Nov 2013 17:55:27 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311151755.rAFHtRBA014082@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 15 Nov 2013 17:55:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333899 - 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.16 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: Fri, 15 Nov 2013 17:55:28 -0000 Author: sunpoet Date: Fri Nov 15 17:55:27 2013 New Revision: 333899 URL: http://svnweb.freebsd.org/changeset/ports/333899 Log: - Fix build with thrift-0.9.1 - Add LICENSE - Support STAGEDIR - Use single space after WWW: PR: ports/183982 Submitted by: Gasol Wu (maintainer) Added: head/databases/php5-pdo_cassandra/files/ head/databases/php5-pdo_cassandra/files/patch-config.m4 (contents, props changed) Modified: head/databases/php5-pdo_cassandra/Makefile head/databases/php5-pdo_cassandra/pkg-descr (contents, props changed) Modified: head/databases/php5-pdo_cassandra/Makefile ============================================================================== --- head/databases/php5-pdo_cassandra/Makefile Fri Nov 15 17:55:22 2013 (r333898) +++ head/databases/php5-pdo_cassandra/Makefile Fri Nov 15 17:55:27 2013 (r333899) @@ -3,7 +3,7 @@ PORTNAME= pdo_cassandra PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= https://github.com/${GITHUB_USER}/php-${PORTNAME}/tarball/${GITREVISION}/ PKGNAMEPREFIX= php5- @@ -12,8 +12,9 @@ DISTNAME= ${GITHUB_USER}-php-${PORTNAME} MAINTAINER= gasol.wu@gmail.com COMMENT= PDO driver for Apache Cassandra -LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \ - thrift:${PORTSDIR}/devel/thrift +LICENSE= AL2 + +LIB_DEPENDS= libboost_iostreams.so:${PORTSDIR}/devel/boost-libs GITREVISION= 7debd5b GITTAG= 0.8-support @@ -27,14 +28,25 @@ USE_PHP= pdo USE_PHPEXT= yes DEFAULT_PHP_VER=5 IGNORE_WITH_PHP=52 -THRIFT_CMD= ${LOCALBASE}/bin/thrift -NO_STAGE= yes +.include +.include "${PORTSDIR}/devel/thrift/bsd.thrift.mk" + +THRIFT_MAJOR_VER= ${THRIFT_PORTVERSION:R:R} +THRIFT_MINOR_VER= ${THRIFT_PORTVERSION:R:E} +THRIFT_PATCH_VER= ${THRIFT_PORTVERSION:E} + +.if ${THRIFT_MAJOR_VER} >= 0 || ${THRIFT_MINOR_VER} >= 9 || ${THRIFT_PATCH_VER} >= 1 +LIB_DEPENDS+= libthrift.so:${PORTSDIR}/devel/thrift-cpp +BUILD_DEPENDS+= ${LOCALBASE}/bin/thrift:${PORTSDIR}/devel/thrift +.else +LIB_DEPENDS+= libthrift.so:${PORTSDIR}/devel/thrift +.endif + post-configure: - thrift_version=`${THRIFT_CMD} -version | ${AWK} '{print $$3}'`; \ - if [ "$$thrift_version" = "0.8.0" ]; then \ - ${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; \ - fi +.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 -.include +.include Added: head/databases/php5-pdo_cassandra/files/patch-config.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php5-pdo_cassandra/files/patch-config.m4 Fri Nov 15 17:55:27 2013 (r333899) @@ -0,0 +1,22 @@ +--- ./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 @@ + PHP_THRIFT_VERSION=`${PKG_CONFIG} thrift --modversion` + + AC_MSG_RESULT([found version ${PHP_THRIFT_VERSION}]) ++ ac_IFS=$IFS ++ IFS="." ++ set $PHP_THRIFT_VERSION ++ IFS=$ac_IFS ++ dnl workaround for changes of THRIFT-1968 ++ THRIFT_VERSION=`expr [$]1 \* 10000 + [$]2 \* 100 + [$]3` ++ if test "$THRIFT_VERSION" -ge "901"; then ++ PHP_THRIFT_INCS="-I`${PKG_CONFIG} thrift --variable=includedir`/thrift" ++ else ++ PHP_THRIFT_INCS=`${PKG_CONFIG} thrift --cflags` ++ fi + PHP_THRIFT_LIBS=`${PKG_CONFIG} thrift --libs` +- PHP_THRIFT_INCS=`${PKG_CONFIG} thrift --cflags` + + PHP_EVAL_LIBLINE(${PHP_THRIFT_LIBS}, PDO_CASSANDRA_SHARED_LIBADD) + PHP_EVAL_INCLINE(${PHP_THRIFT_INCS}) Modified: head/databases/php5-pdo_cassandra/pkg-descr ============================================================================== --- head/databases/php5-pdo_cassandra/pkg-descr Fri Nov 15 17:55:22 2013 (r333898) +++ head/databases/php5-pdo_cassandra/pkg-descr Fri Nov 15 17:55:27 2013 (r333899) @@ -7,4 +7,4 @@ BigTable. Like Dynamo, Cassandra is even BigTable, Cassandra provides a ColumnFamily-based data model richer than typical key/value systems. -WWW: http://code.google.com/a/apache-extras.org/p/cassandra-pdo/ +WWW: http://code.google.com/a/apache-extras.org/p/cassandra-pdo/