aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2016-01-27 06:58:37 +0800
committerrene <rene@FreeBSD.org>2016-01-27 06:58:37 +0800
commit0a191696b9dfc89f28ce954779fb5b859d5bf566 (patch)
tree7bd1eb2e1afc316c472caad73e5d0379c185a790 /databases
parent1298729e997cd88104777149ad13dcfb773d72ef (diff)
downloadfreebsd-ports-gnome-0a191696b9dfc89f28ce954779fb5b859d5bf566.tar.gz
freebsd-ports-gnome-0a191696b9dfc89f28ce954779fb5b859d5bf566.tar.zst
freebsd-ports-gnome-0a191696b9dfc89f28ce954779fb5b859d5bf566.zip
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
Diffstat (limited to 'databases')
-rw-r--r--databases/php5-pdo_cassandra/Makefile17
-rw-r--r--databases/php5-pdo_cassandra/files/patch-config.m46
2 files changed, 8 insertions, 15 deletions
diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile
index 9d4e9321b4f3..608c87c2ce8c 100644
--- a/databases/php5-pdo_cassandra/Makefile
+++ b/databases/php5-pdo_cassandra/Makefile
@@ -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 <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/thrift/bsd.thrift.mk"
@@ -46,9 +40,8 @@ LIB_DEPENDS+= libthrift.so:${PORTSDIR}/devel/thrift
.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 <bsd.port.post.mk>
diff --git a/databases/php5-pdo_cassandra/files/patch-config.m4 b/databases/php5-pdo_cassandra/files/patch-config.m4
index 0e2fb8f3ef4a..84200cd4df31 100644
--- a/databases/php5-pdo_cassandra/files/patch-config.m4
+++ b/databases/php5-pdo_cassandra/files/patch-config.m4
@@ -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}])