From owner-svn-ports-all@FreeBSD.ORG  Wed Feb 12 14:31:59 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 247BA504;
 Wed, 12 Feb 2014 14:31:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D6411915;
 Wed, 12 Feb 2014 14:31:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CEVwtU029264;
 Wed, 12 Feb 2014 14:31:58 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CEVw18029262;
 Wed, 12 Feb 2014 14:31:58 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201402121431.s1CEVw18029262@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Wed, 12 Feb 2014 14:31:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343924 - in head/www/mediawiki121: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Feb 2014 14:31:59 -0000

Author: wen
Date: Wed Feb 12 14:31:58 2014
New Revision: 343924
URL: http://svnweb.freebsd.org/changeset/ports/343924
QAT: https://qat.redports.org/buildarchive/r343924/

Log:
  - Apply a patch from upstream to fix pcre-8.34 incompatible:
  https://bugzilla.wikimedia.org/show_bug.cgi?id=58640
  
  PR:		186607
  Submitted by:	Robbert Klarenbeek <robbertkl@renbeek.nl>

Added:
  head/www/mediawiki121/files/
  head/www/mediawiki121/files/patch-includes-MagicWord.php   (contents, props changed)
Modified:
  head/www/mediawiki121/Makefile

Modified: head/www/mediawiki121/Makefile
==============================================================================
--- head/www/mediawiki121/Makefile	Wed Feb 12 14:03:25 2014	(r343923)
+++ head/www/mediawiki121/Makefile	Wed Feb 12 14:31:58 2014	(r343924)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.21.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
 

Added: head/www/mediawiki121/files/patch-includes-MagicWord.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mediawiki121/files/patch-includes-MagicWord.php	Wed Feb 12 14:31:58 2014	(r343924)
@@ -0,0 +1,13 @@
+--- includes/MagicWord.php.orig	2014-02-12 22:03:25.000000000 +0800
++++ includes/MagicWord.php	2014-02-12 22:05:10.000000000 +0800
+@@ -704,7 +704,9 @@
+ 				$magic = MagicWord::get( $name );
+ 				$case = intval( $magic->isCaseSensitive() );
+ 				foreach ( $magic->getSynonyms() as $i => $syn ) {
+-					$group = "(?P<{$i}_{$name}>" . preg_quote( $syn, '/' ) . ')';
++					// Group name must start with a non-digit in PCRE 8.34+
++					$it = strtr( $i, '0123456789', 'abcdefghij' );
++					$group = "(?P<{$it}_{$name}>" . preg_quote( $syn, '/' ) . ')';
+ 					if ( $this->baseRegex[$case] === '' ) {
+ 						$this->baseRegex[$case] = $group;
+ 					} else {