Attachment 166157 Details for Bug 205749 – patch file

[patch] patch file

php5-pdo_cassandra.patch (text/plain), 2.33 KB, created by Gasol Wu on 2016-01-26 19:34:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gasol Wu

Created: 2016-01-26 19:34:01 UTC

Size: 2.33 KB

patch

obsolete

>diff -ruN /var/cache/portshaker/ports//databases/php5-pdo_cassandra/Makefile ./Makefile
>--- /var/cache/portshaker/ports//databases/php5-pdo_cassandra/Makefile	2015-11-14 06:13:24.000000000 +0800
>+++ ./Makefile	2016-01-25 10:45:47.894865000 +0800
>@@ -1,9 +1,9 @@
> # Created by: Gasol Wu <gasol.wu@gmail.com>
>-# $FreeBSD: head/databases/php5-pdo_cassandra/Makefile 401553 2015-11-13 22:13:24Z antoine $
>+# $FreeBSD: head/databases/php5-pdo_cassandra/Makefile 367888 2014-09-10 20:50:31Z gerald $
> 
> PORTNAME=	pdo_cassandra
> PORTVERSION=	0.2.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	databases
> PKGNAMEPREFIX=	php5-
> 
>@@ -12,10 +12,6 @@
> 
> 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_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 @@
> .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 -ruN /var/cache/portshaker/ports//databases/php5-pdo_cassandra/files/patch-config.m4 ./files/patch-config.m4
>--- /var/cache/portshaker/ports//databases/php5-pdo_cassandra/files/patch-config.m4	2013-11-16 01:55:27.000000000 +0800
>+++ ./files/patch-config.m4	2016-01-25 10:45:47.901779000 +0800
>@@ -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}])

Flags:

gasol.wu: maintainer-approval+

Actions: View | Diff

Attachments on bug 205749: 164889 | 166157 | 166158 | 166159