cvs commit: ports/math/freemat Makefile ports/math/freemat/files
patch-libs__thirdparty__pcre__pcreposix.c ports/www/apache20 Makefile
ports/www/apache20/files
patch-server__util_pcre.c ports/www/apache22 Makefile
ports/www/apache22/files patch-server__util_pcre.c ...
Philip M. Gollucci
pgollucci at gmail.com
Tue Feb 14 16:40:32 UTC 2012
nevermind.
On 02/14/12 12:44, Martin Matuska wrote:
> mm 2012-02-14 12:44:23 UTC
>
> FreeBSD ports repository
>
> Modified files:
> math/freemat Makefile
> www/apache20 Makefile
> www/apache20/files patch-server__util_pcre.c
> www/apache22 Makefile
> www/httest Makefile
> www/hypermail Makefile
> lang/php5 Makefile
> lang/php52 Makefile
> devel/php52-pcre/files patch-php_pcre.c
> Added files:
> math/freemat/files patch-libs__thirdparty__pcre__pcreposix.c
> www/apache22/files patch-server__util_pcre.c
> www/httest/files patch-src-regex.c
> www/hypermail/files patch-src-pcre-pcreposix.c
> patch-src-pcre-pcretest.c
> lang/php5/files patch-ext-pcre-php_pcre.c
> Log:
> Bump pcre library dependency due to 8.30 update
> Add (vendor) patch for deprecated pcre_info()
>
> Revision Changes Path
> 1.2 +21 -0 ports/devel/php52-pcre/files/patch-php_pcre.c
> 1.168 +2 -2 ports/lang/php5/Makefile
> 1.1 +23 -0 ports/lang/php5/files/patch-ext-pcre-php_pcre.c (new)
> http://cvsweb.FreeBSD.org/ports/lang/php5/files/patch-ext-pcre-php_pcre.c?rev=1.1&content-type=text/x-cvsweb-markup
> 1.27 +1 -1 ports/lang/php52/Makefile
> 1.38 +2 -2 ports/math/freemat/Makefile
> 1.1 +12 -0 ports/math/freemat/files/patch-libs__thirdparty__pcre__pcreposix.c (new)
> http://cvsweb.FreeBSD.org/ports/math/freemat/files/patch-libs__thirdparty__pcre__pcreposix.c?rev=1.1&content-type=text/x-cvsweb-markup
> 1.306 +2 -2 ports/www/apache20/Makefile
> 1.2 +2 -2 ports/www/apache20/files/patch-server__util_pcre.c
> 1.299 +2 -2 ports/www/apache22/Makefile
> 1.1 +12 -0 ports/www/apache22/files/patch-server__util_pcre.c (new)
> http://cvsweb.FreeBSD.org/ports/www/apache22/files/patch-server__util_pcre.c?rev=1.1&content-type=text/x-cvsweb-markup
> 1.8 +2 -1 ports/www/httest/Makefile
> 1.1 +12 -0 ports/www/httest/files/patch-src-regex.c (new)
> http://cvsweb.FreeBSD.org/ports/www/httest/files/patch-src-regex.c?rev=1.1&content-type=text/x-cvsweb-markup
> 1.25 +2 -2 ports/www/hypermail/Makefile
> 1.1 +12 -0 ports/www/hypermail/files/patch-src-pcre-pcreposix.c (new)
> http://cvsweb.FreeBSD.org/ports/www/hypermail/files/patch-src-pcre-pcreposix.c?rev=1.1&content-type=text/x-cvsweb-markup
> 1.1 +27 -0 ports/www/hypermail/files/patch-src-pcre-pcretest.c (new)
> http://cvsweb.FreeBSD.org/ports/www/hypermail/files/patch-src-pcre-pcretest.c?rev=1.1&content-type=text/x-cvsweb-markup
>
> http://cvsweb.FreeBSD.org/ports/devel/php52-pcre/files/patch-php_pcre.c.diff?r1=1.1&r2=1.2&f=h
> | --- ports/devel/php52-pcre/files/patch-php_pcre.c 2010/04/23 15:09:07 1.1
> | +++ ports/devel/php52-pcre/files/patch-php_pcre.c 2012/02/14 12:44:23 1.2
> | @@ -11,3 +11,24 @@
> | #include "php.h"
> | #include "php_ini.h"
> | #include "php_globals.h"
> | +@@ -241,6 +241,7 @@
> | + char *pattern;
> | + int do_study = 0;
> | + int poptions = 0;
> | ++ int count = 0;
> | + unsigned const char *tables = NULL;
> | + #if HAVE_SETLOCALE
> | + char *locale = setlocale(LC_CTYPE, NULL);
> | +@@ -252,10 +253,10 @@
> | + back the compiled pattern, otherwise go on and compile it. */
> | + if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
> | + /*
> | +- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
> | ++ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
> | + * is, we flush it and compile the pattern from scratch.
> | + */
> | +- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
> | ++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
> | + zend_hash_clean(&PCRE_G(pcre_cache));
> | + } else {
> | + #if HAVE_SETLOCALE
> http://cvsweb.FreeBSD.org/ports/lang/php5/Makefile.diff?r1=1.167&r2=1.168&f=h
> | --- ports/lang/php5/Makefile 2012/02/03 09:03:06 1.167
> | +++ ports/lang/php5/Makefile 2012/02/14 12:44:23 1.168
> | @@ -2,12 +2,12 @@
> | # Date created: Tue Feb 18 11:17:13 CET 2003
> | # Whom: Alex Dupre <sysadmin at alexdupre.com>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/lang/php5/Makefile,v 1.167 2012/02/03 09:03:06 ale Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/lang/php5/Makefile,v 1.168 2012/02/14 12:44:23 mm Exp $
> | #
> |
> | PORTNAME= php5
> | PORTVERSION= 5.3.10
> | -PORTREVISION?= 0
> | +PORTREVISION?= 1
> | CATEGORIES?= lang devel www
> | MASTER_SITES= ${MASTER_SITE_PHP}
> | MASTER_SITE_SUBDIR= distributions
> | @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes
> | .if !defined(PKGNAMESUFFIX)
> | USE_AUTOTOOLS= autoconf
> |
> | -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
> | +LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre
> |
> | CONFIGURE_ARGS= \
> | --with-layout=GNU \
> http://cvsweb.FreeBSD.org/ports/lang/php52/Makefile.diff?r1=1.26&r2=1.27&f=h
> | --- ports/lang/php52/Makefile 2012/01/18 17:27:09 1.26
> | +++ ports/lang/php52/Makefile 2012/02/14 12:44:23 1.27
> | @@ -2,12 +2,12 @@
> | # Date created: 17 Apr 2010
> | # Whom: Alex Keda <admin at lissyara.su>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/lang/php52/Makefile,v 1.26 2012/01/18 17:27:09 lwhsu Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/lang/php52/Makefile,v 1.27 2012/02/14 12:44:23 mm Exp $
> | #
> |
> | PORTNAME= php52
> | PORTVERSION= 5.2.17
> | -PORTREVISION= 6
> | +PORTREVISION= 7
> | CATEGORIES?= lang devel www
> | MASTER_SITES= ${MASTER_SITE_PHP}
> | MASTER_SITE_SUBDIR= distributions
> http://cvsweb.FreeBSD.org/ports/math/freemat/Makefile.diff?r1=1.37&r2=1.38&f=h
> | --- ports/math/freemat/Makefile 2011/11/22 11:14:05 1.37
> | +++ ports/math/freemat/Makefile 2012/02/14 12:44:21 1.38
> | @@ -2,13 +2,13 @@
> | # Date created: Sat 26 mar 2005
> | # Whom: Thierry Thomas <thierry at pompo.net>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/math/freemat/Makefile,v 1.37 2011/11/22 11:14:05 bf Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/math/freemat/Makefile,v 1.38 2012/02/14 12:44:21 mm Exp $
> | #
> |
> | PORTNAME= FreeMat
> | PORTVERSION= 4.0
> | DISTVERSIONSUFFIX= -Source
> | -PORTREVISION= 2
> | +PORTREVISION= 3
> | CATEGORIES= math science
> | MASTER_SITES= SF
> | MASTER_SITE_SUBDIR= freemat/FreeMat4
> | @@ -20,7 +20,7 @@ MAINTAINER= glarkin at FreeBSD.org
> | COMMENT= An environment for rapid engineering and scientific processing
> |
> | LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \
> | - pcre.0:${PORTSDIR}/devel/pcre
> | + pcre.1:${PORTSDIR}/devel/pcre
> | BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
> |
> | LICENSE= GPLv2
> http://cvsweb.FreeBSD.org/ports/www/apache20/Makefile.diff?r1=1.305&r2=1.306&f=h
> | --- ports/www/apache20/Makefile 2012/02/08 05:02:15 1.305
> | +++ ports/www/apache20/Makefile 2012/02/14 12:44:22 1.306
> | @@ -2,14 +2,14 @@
> | # Date created: 7 April 2001
> | # Whom: Hye-Shik Chang <perky at fallin.lv>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/Makefile,v 1.305 2012/02/08 05:02:15 pgollucci Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/Makefile,v 1.306 2012/02/14 12:44:22 mm Exp $
> | #
> | # For more information, please read Makefile.doc
> | #
> |
> | PORTNAME= apache
> | PORTVERSION= 2.0.64
> | -PORTREVISION= 2
> | +PORTREVISION= 3
> | CATEGORIES= www
> | MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
> | ${MASTER_SITE_LOCAL:S/$/:powerlogo/}
> | @@ -23,7 +23,7 @@ MAINTAINER?= apache at FreeBSD.org
> | COMMENT?= Version 2.0.x of Apache web server with ${WITH_MPM:L} MPM.
> |
> | LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
> | - pcre.0:${PORTSDIR}/devel/pcre \
> | + pcre.1:${PORTSDIR}/devel/pcre \
> | apr-0:${PORTSDIR}/devel/apr0
> |
> | MAKE_JOBS_SAFE= yes
> http://cvsweb.FreeBSD.org/ports/www/apache20/files/patch-server__util_pcre.c.diff?r1=1.1&r2=1.2&f=h
> | --- ports/www/apache20/files/patch-server__util_pcre.c 2010/10/21 05:55:24 1.1
> | +++ ports/www/apache20/files/patch-server__util_pcre.c 2012/02/14 12:44:22 1.2
> | @@ -142,13 +142,13 @@
> | +
> | +if (preg->re_pcre == NULL) return AP_REG_INVARG;
> | +
> | -+preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
> | ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
> | ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub));
> | +return 0;
> | +}
> | +
> | +
> | +
> | -+
> | +/*************************************************
> | +* Match a regular expression *
> | +*************************************************/
> http://cvsweb.FreeBSD.org/ports/www/apache22/Makefile.diff?r1=1.298&r2=1.299&f=h
> | --- ports/www/apache22/Makefile 2012/02/09 02:49:54 1.298
> | +++ ports/www/apache22/Makefile 2012/02/14 12:44:22 1.299
> | @@ -2,14 +2,14 @@
> | # Date created: Dec 11 2004
> | # Whom: Clement Laforet <clement at FreeBSD.org>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile,v 1.298 2012/02/09 02:49:54 pgollucci Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile,v 1.299 2012/02/14 12:44:22 mm Exp $
> | #
> | # For more information, please read Makefile.doc
> | #
> |
> | PORTNAME= apache
> | PORTVERSION= 2.2.22
> | -PORTREVISION= 4
> | +PORTREVISION= 5
> | CATEGORIES= www
> | MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
> | DISTNAME= httpd-${PORTVERSION}
> | @@ -20,7 +20,7 @@ COMMENT?= Version 2.2.x of Apache web se
> |
> | LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
> | apr-1:${PORTSDIR}/devel/apr1 \
> | - pcre.0:${PORTSDIR}/devel/pcre
> | + pcre.1:${PORTSDIR}/devel/pcre
> |
> | MAKE_JOBS_SAFE= yes
> |
> http://cvsweb.FreeBSD.org/ports/www/httest/Makefile.diff?r1=1.7&r2=1.8&f=h
> | --- ports/www/httest/Makefile 2012/01/25 08:35:36 1.7
> | +++ ports/www/httest/Makefile 2012/02/14 12:44:22 1.8
> | @@ -2,11 +2,12 @@
> | # Date created: Jun 15, 2011
> | # Whom: Martin Matuska <mm at FreeBSD.org>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/httest/Makefile,v 1.7 2012/01/25 08:35:36 mm Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/httest/Makefile,v 1.8 2012/02/14 12:44:22 mm Exp $
> | #
> |
> | PORTNAME= httest
> | PORTVERSION= 2.1.12
> | +PORTREVISION= 1
> | CATEGORIES= www
> | MASTER_SITES= SF
> | MASTER_SITE_SUBDIR= htt/htt2.1/${PORTNAME}-${PORTVERSION}
> | @@ -15,7 +16,7 @@ MAINTAINER= mm at FreeBSD.org
> | COMMENT= HTTP Test Tool
> |
> | LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 \
> | - pcre.0:${PORTSDIR}/devel/pcre
> | + pcre.1:${PORTSDIR}/devel/pcre
> |
> | LICENSE= AL2
> |
> http://cvsweb.FreeBSD.org/ports/www/hypermail/Makefile.diff?r1=1.24&r2=1.25&f=h
> | --- ports/www/hypermail/Makefile 2011/09/12 13:46:58 1.24
> | +++ ports/www/hypermail/Makefile 2012/02/14 12:44:23 1.25
> | @@ -2,12 +2,12 @@
> | # Date created: 23 Dec 1997
> | # Whom: mjhsieh
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/hypermail/Makefile,v 1.24 2011/09/12 13:46:58 gabor Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/hypermail/Makefile,v 1.25 2012/02/14 12:44:23 mm Exp $
> | #
> |
> | PORTNAME= hypermail
> | PORTVERSION= 2.2.0
> | -PORTREVISION= 1
> | +PORTREVISION= 2
> | CATEGORIES= www mail
> | MASTER_SITES= SF
> |
> | @@ -15,7 +15,7 @@ MAINTAINER= dan at langille.org
> | COMMENT= A program to generate a cross-referenced HTML mail archive
> |
> | LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm \
> | - pcre.0:${PORTSDIR}/devel/pcre
> | + pcre.1:${PORTSDIR}/devel/pcre
> |
> | GNU_CONFIGURE= yes
> | CONFIGURE_ARGS= --with-htmldir=${PREFIX}/share/doc/hypermail \
--
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci at p6m7g8.com) c: 703.336.9354
Member, Apache Software Foundation
Committer, FreeBSD Foundation
Consultant, P6M7G8 Inc.
Director Operations, Ridecharge Inc.
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://lists.freebsd.org/pipermail/cvs-ports/attachments/20120214/6eb10063/signature.pgp
More information about the cvs-ports
mailing list