Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Feb 2012 16:40:25 +0000
From:      "Philip M. Gollucci" <pgollucci@gmail.com>
To:        Martin Matuska <mm@FreeBSD.org>
Cc:        cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject:   Re: 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 ...
Message-ID:  <4F3A8E79.4030706@p6m7g8.com>
In-Reply-To: <201202141244.q1ECiNPj062941@repoman.freebsd.org>
References:  <201202141244.q1ECiNPj062941@repoman.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig48920BBA8A16F195D80227EA
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

nevermind.

On 02/14/12 12:44, Martin Matuska wrote:
> mm          2012-02-14 12:44:23 UTC
>=20
>   FreeBSD ports repository
>=20
>   Modified files:
>     math/freemat         Makefile=20
>     www/apache20         Makefile=20
>     www/apache20/files   patch-server__util_pcre.c=20
>     www/apache22         Makefile=20
>     www/httest           Makefile=20
>     www/hypermail        Makefile=20
>     lang/php5            Makefile=20
>     lang/php52           Makefile=20
>     devel/php52-pcre/files patch-php_pcre.c=20
>   Added files:
>     math/freemat/files   patch-libs__thirdparty__pcre__pcreposix.c=20
>     www/apache22/files   patch-server__util_pcre.c=20
>     www/httest/files     patch-src-regex.c=20
>     www/hypermail/files  patch-src-pcre-pcreposix.c=20
>                          patch-src-pcre-pcretest.c=20
>     lang/php5/files      patch-ext-pcre-php_pcre.c=20
>   Log:
>   Bump pcre library dependency due to 8.30 update
>   Add (vendor) patch for deprecated pcre_info()
>  =20
>   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=
=2Ec?rev=3D1.1&content-type=3Dtext/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__thirdpar=
ty__pcre__pcreposix.c?rev=3D1.1&content-type=3Dtext/x-cvsweb-markup
>   1.306     +2 -2      ports/www/apache20/Makefile
>   1.2       +2 -2      ports/www/apache20/files/patch-server__util_pcre=
=2Ec
>   1.299     +2 -2      ports/www/apache22/Makefile
>   1.1       +12 -0     ports/www/apache22/files/patch-server__util_pcre=
=2Ec (new)
> http://cvsweb.FreeBSD.org/ports/www/apache22/files/patch-server__util_p=
cre.c?rev=3D1.1&content-type=3Dtext/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=3D=
1.1&content-type=3Dtext/x-cvsweb-markup
>   1.25      +2 -2      ports/www/hypermail/Makefile
>   1.1       +12 -0     ports/www/hypermail/files/patch-src-pcre-pcrepos=
ix.c (new)
> http://cvsweb.FreeBSD.org/ports/www/hypermail/files/patch-src-pcre-pcre=
posix.c?rev=3D1.1&content-type=3Dtext/x-cvsweb-markup
>   1.1       +27 -0     ports/www/hypermail/files/patch-src-pcre-pcretes=
t.c (new)
> http://cvsweb.FreeBSD.org/ports/www/hypermail/files/patch-src-pcre-pcre=
test.c?rev=3D1.1&content-type=3Dtext/x-cvsweb-markup
>=20
> http://cvsweb.FreeBSD.org/ports/devel/php52-pcre/files/patch-php_pcre.c=
=2Ediff?r1=3D1.1&r2=3D1.2&f=3Dh
> | --- 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 =3D 0;
> | + 	int					 poptions =3D 0;
> | ++	int				count =3D 0;
> | + 	unsigned const char *tables =3D NULL;
> | + #if HAVE_SETLOCALE
> | + 	char				*locale =3D 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) =3D=3D SUCCESS) {
> | + 		/*
> | +-		 * We use a quick pcre_info() check to see whether cache is corru=
pted, and if it
> | ++		 * We use a quick pcre_fullinfo() check to see whether cache is c=
orrupted, and if it
> | + 		 * is, we flush it and compile the pattern from scratch.
> | + 		 */
> | +-		if (pcre_info(pce->re, NULL, NULL) =3D=3D PCRE_ERROR_BADMAGIC) {
> | ++		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) =
=3D=3D PCRE_ERROR_BADMAGIC) {
> | + 			zend_hash_clean(&PCRE_G(pcre_cache));
> | + 		} else {
> | + #if HAVE_SETLOCALE
> http://cvsweb.FreeBSD.org/ports/lang/php5/Makefile.diff?r1=3D1.167&r2=3D=
1.168&f=3Dh
> | --- 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@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 $
> |  #
> | =20
> |  PORTNAME=3D	php5
> |  PORTVERSION=3D	5.3.10
> | -PORTREVISION?=3D	0
> | +PORTREVISION?=3D	1
> |  CATEGORIES?=3D	lang devel www
> |  MASTER_SITES=3D	${MASTER_SITE_PHP}
> |  MASTER_SITE_SUBDIR=3D	distributions
> | @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE=3D	yes
> |  .if !defined(PKGNAMESUFFIX)
> |  USE_AUTOTOOLS=3D	autoconf
> | =20
> | -LIB_DEPENDS=3D	pcre.0:${PORTSDIR}/devel/pcre
> | +LIB_DEPENDS=3D	pcre.1:${PORTSDIR}/devel/pcre
> | =20
> |  CONFIGURE_ARGS=3D	\
> |  		--with-layout=3DGNU \
> http://cvsweb.FreeBSD.org/ports/lang/php52/Makefile.diff?r1=3D1.26&r2=3D=
1.27&f=3Dh
> | --- 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@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 $
> |  #
> | =20
> |  PORTNAME=3D	php52
> |  PORTVERSION=3D	5.2.17
> | -PORTREVISION=3D	6
> | +PORTREVISION=3D	7
> |  CATEGORIES?=3D	lang devel www
> |  MASTER_SITES=3D	${MASTER_SITE_PHP}
> |  MASTER_SITE_SUBDIR=3D	distributions
> http://cvsweb.FreeBSD.org/ports/math/freemat/Makefile.diff?r1=3D1.37&r2=
=3D1.38&f=3Dh
> | --- 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@pompo.net>
> |  #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/math/freemat/Makefi=
le,v 1.37 2011/11/22 11:14:05 bf Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/math/freemat/Makefi=
le,v 1.38 2012/02/14 12:44:21 mm Exp $
> |  #
> | =20
> |  PORTNAME=3D		FreeMat
> |  PORTVERSION=3D		4.0
> |  DISTVERSIONSUFFIX=3D	-Source
> | -PORTREVISION=3D		2
> | +PORTREVISION=3D		3
> |  CATEGORIES=3D		math science
> |  MASTER_SITES=3D		SF
> |  MASTER_SITE_SUBDIR=3D	freemat/FreeMat4
> | @@ -20,7 +20,7 @@ MAINTAINER=3D		glarkin@FreeBSD.org
> |  COMMENT=3D		An environment for rapid engineering and scientific proc=
essing
> | =20
> |  LIB_DEPENDS=3D		lapack.4:${PORTSDIR}/math/lapack	\
> | -			pcre.0:${PORTSDIR}/devel/pcre
> | +			pcre.1:${PORTSDIR}/devel/pcre
> |  BUILD_DEPENDS=3D		pkg-config:${PORTSDIR}/devel/pkg-config
> | =20
> |  LICENSE=3D		GPLv2
> http://cvsweb.FreeBSD.org/ports/www/apache20/Makefile.diff?r1=3D1.305&r=
2=3D1.306&f=3Dh
> | --- 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@fallin.lv>
> |  #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/Makefi=
le,v 1.305 2012/02/08 05:02:15 pgollucci Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/Makefi=
le,v 1.306 2012/02/14 12:44:22 mm Exp $
> |  #
> |  # For more information, please read Makefile.doc
> |  #
> | =20
> |  PORTNAME=3D	apache
> |  PORTVERSION=3D	2.0.64
> | -PORTREVISION=3D	2
> | +PORTREVISION=3D	3
> |  CATEGORIES=3D	www
> |  MASTER_SITES=3D	${MASTER_SITE_APACHE_HTTPD} \
> |  		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
> | @@ -23,7 +23,7 @@ MAINTAINER?=3D	apache@FreeBSD.org
> |  COMMENT?=3D	Version 2.0.x of Apache web server with ${WITH_MPM:L} MP=
M.
> | =20
> |  LIB_DEPENDS=3D	expat.6:${PORTSDIR}/textproc/expat2 \
> | -	pcre.0:${PORTSDIR}/devel/pcre \
> | +	pcre.1:${PORTSDIR}/devel/pcre \
> |  	apr-0:${PORTSDIR}/devel/apr0
> | =20
> |  MAKE_JOBS_SAFE=3D	yes
> http://cvsweb.FreeBSD.org/ports/www/apache20/files/patch-server__util_p=
cre.c.diff?r1=3D1.1&r2=3D1.2&f=3Dh
> | --- 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 =3D=3D NULL) return AP_REG_INVARG;
> |  +
> | -+preg->re_nsub =3D 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=3D1.298&r=
2=3D1.299&f=3Dh
> | --- 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@FreeBSD.org>
> |  #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefi=
le,v 1.298 2012/02/09 02:49:54 pgollucci Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefi=
le,v 1.299 2012/02/14 12:44:22 mm Exp $
> |  #
> |  # For more information, please read Makefile.doc
> |  #
> | =20
> |  PORTNAME=3D	apache
> |  PORTVERSION=3D	2.2.22
> | -PORTREVISION=3D	4
> | +PORTREVISION=3D	5
> |  CATEGORIES=3D	www
> |  MASTER_SITES=3D	${MASTER_SITE_APACHE_HTTPD}
> |  DISTNAME=3D	httpd-${PORTVERSION}
> | @@ -20,7 +20,7 @@ COMMENT?=3D	Version 2.2.x of Apache web se
> | =20
> |  LIB_DEPENDS=3D	expat.6:${PORTSDIR}/textproc/expat2 \
> |  		apr-1:${PORTSDIR}/devel/apr1 \
> | -		pcre.0:${PORTSDIR}/devel/pcre
> | +		pcre.1:${PORTSDIR}/devel/pcre
> | =20
> |  MAKE_JOBS_SAFE=3D	yes
> | =20
> http://cvsweb.FreeBSD.org/ports/www/httest/Makefile.diff?r1=3D1.7&r2=3D=
1.8&f=3Dh
> | --- 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@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 $
> |  #
> | =20
> |  PORTNAME=3D	httest
> |  PORTVERSION=3D	2.1.12
> | +PORTREVISION=3D	1
> |  CATEGORIES=3D	www
> |  MASTER_SITES=3D	SF
> |  MASTER_SITE_SUBDIR=3D	htt/htt2.1/${PORTNAME}-${PORTVERSION}
> | @@ -15,7 +16,7 @@ MAINTAINER=3D	mm@FreeBSD.org
> |  COMMENT=3D	HTTP Test Tool
> | =20
> |  LIB_DEPENDS+=3D	apr-1:${PORTSDIR}/devel/apr1 \
> | -		pcre.0:${PORTSDIR}/devel/pcre
> | +		pcre.1:${PORTSDIR}/devel/pcre
> | =20
> |  LICENSE=3D	AL2
> | =20
> http://cvsweb.FreeBSD.org/ports/www/hypermail/Makefile.diff?r1=3D1.24&r=
2=3D1.25&f=3Dh
> | --- 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/Makef=
ile,v 1.24 2011/09/12 13:46:58 gabor Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/hypermail/Makef=
ile,v 1.25 2012/02/14 12:44:23 mm Exp $
> |  #
> | =20
> |  PORTNAME=3D	hypermail
> |  PORTVERSION=3D	2.2.0
> | -PORTREVISION=3D	1
> | +PORTREVISION=3D	2
> |  CATEGORIES=3D	www mail
> |  MASTER_SITES=3D	SF
> | =20
> | @@ -15,7 +15,7 @@ MAINTAINER=3D	dan@langille.org
> |  COMMENT=3D	A program to generate a cross-referenced HTML mail archiv=
e
> | =20
> |  LIB_DEPENDS+=3D	gdbm.4:${PORTSDIR}/databases/gdbm \
> | -		pcre.0:${PORTSDIR}/devel/pcre
> | +		pcre.1:${PORTSDIR}/devel/pcre
> | =20
> |  GNU_CONFIGURE=3D	yes
> |  CONFIGURE_ARGS=3D	--with-htmldir=3D${PREFIX}/share/doc/hypermail \


--=20
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@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.


--------------enig48920BBA8A16F195D80227EA
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iD8DBQFPOo55dbiP+9ubjBwRAuIeAJ9ycWqnX6YG24hdt/RIAmo2bpwWGQCggQ3M
IlmmQJvXKIfvhy9RGeIiMoM=
=1nF1
-----END PGP SIGNATURE-----

--------------enig48920BBA8A16F195D80227EA--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F3A8E79.4030706>