Date: Mon, 2 Mar 2015 14:14:32 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380263 - in branches/2015Q1: databases/php-adodb-ext lang/php5 lang/php55 lang/php55/files lang/php56 lang/php56/files Message-ID: <201503021414.t22EEWi0083401@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Mon Mar 2 14:14:31 2015 New Revision: 380263 URL: https://svnweb.freebsd.org/changeset/ports/380263 QAT: https://qat.redports.org/buildarchive/r380263/ Log: - Update PHP 5.4 to 5.4.38 release - Update PHP 5.5 to 5.5.22 release - Update PHP 5.6 to 5.6.6 release MFH: r377396,377730-377731,379433 Approved by: ports-secteam With hat: ports-secteam Deleted: branches/2015Q1/lang/php55/files/patch-sapi_fpm_Makefile.frag branches/2015Q1/lang/php55/files/patch-sapi_fpm_php-fpm.conf.in branches/2015Q1/lang/php56/files/patch-sapi_fpm_Makefile.frag branches/2015Q1/lang/php56/files/patch-sapi_fpm_php-fpm.conf.in Modified: branches/2015Q1/databases/php-adodb-ext/Makefile branches/2015Q1/lang/php5/Makefile branches/2015Q1/lang/php5/Makefile.ext branches/2015Q1/lang/php5/distinfo branches/2015Q1/lang/php55/Makefile branches/2015Q1/lang/php55/Makefile.ext branches/2015Q1/lang/php55/distinfo branches/2015Q1/lang/php55/pkg-plist branches/2015Q1/lang/php56/Makefile branches/2015Q1/lang/php56/Makefile.ext branches/2015Q1/lang/php56/distinfo branches/2015Q1/lang/php56/pkg-plist Modified: branches/2015Q1/databases/php-adodb-ext/Makefile ============================================================================== --- branches/2015Q1/databases/php-adodb-ext/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/databases/php-adodb-ext/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -18,6 +18,8 @@ USES= dos2unix zip USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= adodb +PHP_DEFAULT= 55 +IGNORE_WITH_PHP=56 SUB_FILES= pkg-message Modified: branches/2015Q1/lang/php5/Makefile ============================================================================== --- branches/2015Q1/lang/php5/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php5/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.37 +PORTVERSION= 5.4.38 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php5/Makefile.ext ============================================================================== --- branches/2015Q1/lang/php5/Makefile.ext Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php5/Makefile.ext Mon Mar 2 14:14:31 2015 (r380263) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -524,6 +523,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: branches/2015Q1/lang/php5/distinfo ============================================================================== --- branches/2015Q1/lang/php5/distinfo Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php5/distinfo Mon Mar 2 14:14:31 2015 (r380263) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.37.tar.bz2) = 857bf6675eeb0ae9c3cd6f9ccdb2a9b7bf89dcfda7f0a80857638fe023f3a8ad -SIZE (php-5.4.37.tar.bz2) = 12275113 +SHA256 (php-5.4.38.tar.bz2) = abf37db0cfadc9bb814f9df35f6aa966ad63f4f4c4475e432ec625568a5d3e88 +SIZE (php-5.4.38.tar.bz2) = 12273298 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 Modified: branches/2015Q1/lang/php55/Makefile ============================================================================== --- branches/2015Q1/lang/php55/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.20 +PORTVERSION= 5.5.22 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php55/Makefile.ext ============================================================================== --- branches/2015Q1/lang/php55/Makefile.ext Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/Makefile.ext Mon Mar 2 14:14:31 2015 (r380263) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -524,6 +523,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: branches/2015Q1/lang/php55/distinfo ============================================================================== --- branches/2015Q1/lang/php55/distinfo Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/distinfo Mon Mar 2 14:14:31 2015 (r380263) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.20.tar.bz2) = f28a150d1cd8991bd1a41dce4fdff4e343d1dbe01a48b9b44bea74532ce0391a -SIZE (php-5.5.20.tar.bz2) = 13240796 +SHA256 (php-5.5.22.tar.bz2) = c218c184bef2905bc79fcdda6040f3d1738261395fb706396935d1c6f6e162bb +SIZE (php-5.5.22.tar.bz2) = 13305486 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Modified: branches/2015Q1/lang/php55/pkg-plist ============================================================================== --- branches/2015Q1/lang/php55/pkg-plist Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/pkg-plist Mon Mar 2 14:14:31 2015 (r380263) @@ -91,6 +91,7 @@ include/php/ext/ereg/regex/regex2.h include/php/ext/ereg/regex/utils.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h +include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h Modified: branches/2015Q1/lang/php56/Makefile ============================================================================== --- branches/2015Q1/lang/php56/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.4 +PORTVERSION= 5.6.6 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php56/Makefile.ext ============================================================================== --- branches/2015Q1/lang/php56/Makefile.ext Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/Makefile.ext Mon Mar 2 14:14:31 2015 (r380263) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -527,6 +526,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: branches/2015Q1/lang/php56/distinfo ============================================================================== --- branches/2015Q1/lang/php56/distinfo Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/distinfo Mon Mar 2 14:14:31 2015 (r380263) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.4.tar.bz2) = 576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1 -SIZE (php-5.6.4.tar.bz2) = 13498882 +SHA256 (php-5.6.6.tar.bz2) = 09625c9b65e0c8198dc76995a35f0feec0e13ea4489526e64a00954b12adbb4c +SIZE (php-5.6.6.tar.bz2) = 13687928 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Modified: branches/2015Q1/lang/php56/pkg-plist ============================================================================== --- branches/2015Q1/lang/php56/pkg-plist Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/pkg-plist Mon Mar 2 14:14:31 2015 (r380263) @@ -93,6 +93,7 @@ include/php/ext/ereg/regex/regex2.h include/php/ext/ereg/regex/utils.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h +include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503021414.t22EEWi0083401>