svn commit: r343924 - in head/www/mediawiki121: . files

Wen Heping wen at FreeBSD.org
Wed Feb 12 14:31:59 UTC 2014


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 at 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 {


More information about the svn-ports-all mailing list