From owner-svn-ports-all@FreeBSD.ORG  Sat Mar  8 15:26:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5270CA0E;
 Sat,  8 Mar 2014 15:26:06 +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 2630EC4D;
 Sat,  8 Mar 2014 15:26:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s28FQ6ab000843;
 Sat, 8 Mar 2014 15:26:06 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s28FQ5Ct000840;
 Sat, 8 Mar 2014 15:26:05 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201403081526.s28FQ5Ct000840@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sat, 8 Mar 2014 15:26:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347510 - in head/www/mediawiki119: . 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: Sat, 08 Mar 2014 15:26:06 -0000

Author: wen
Date: Sat Mar  8 15:26:05 2014
New Revision: 347510
URL: http://svnweb.freebsd.org/changeset/ports/347510
QAT: https://qat.redports.org/buildarchive/r347510/

Log:
  - Update to 1.19.12
  - Apply the patch from upstream to fix the run error with pcre-8.34
  - Update CONFLICTS

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

Modified: head/www/mediawiki119/Makefile
==============================================================================
--- head/www/mediawiki119/Makefile	Sat Mar  8 15:25:21 2014	(r347509)
+++ head/www/mediawiki119/Makefile	Sat Mar  8 15:26:05 2014	(r347510)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.19.11
+PORTVERSION=	1.19.12
 CATEGORIES=	www
-MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
+MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
 PKGNAMESUFFIX=	119
 
 MAINTAINER=	wen@FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT=	The wiki engine used by Wikiped
 
 LICENSE=	GPLv2
 
-CONFLICTS=	mediawiki-1.2[0-9].*
+CONFLICTS=	mediawiki-1.2[0-9].* mediawiki12[0-9]-*
 
 USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom
 WANT_PHP_WEB=	yes

Modified: head/www/mediawiki119/distinfo
==============================================================================
--- head/www/mediawiki119/distinfo	Sat Mar  8 15:25:21 2014	(r347509)
+++ head/www/mediawiki119/distinfo	Sat Mar  8 15:26:05 2014	(r347510)
@@ -1,2 +1,2 @@
-SHA256 (mediawiki-1.19.11.tar.gz) = e9f30fba255beaa8c724f946d7408e6a2b04efb5a6439fd1658e56ad4a2d43a0
-SIZE (mediawiki-1.19.11.tar.gz) = 18737405
+SHA256 (mediawiki-1.19.12.tar.gz) = 72e799e996e7a4bbcd749484f62ec3dd263f07d858aab8a81bf1a91846dcad76
+SIZE (mediawiki-1.19.12.tar.gz) = 18708973

Added: head/www/mediawiki119/files/patch-includes-MagicWord.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mediawiki119/files/patch-includes-MagicWord.php	Sat Mar  8 15:26:05 2014	(r347510)
@@ -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 {