aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwen <wen@FreeBSD.org>2014-03-08 23:26:05 +0800
committerwen <wen@FreeBSD.org>2014-03-08 23:26:05 +0800
commit494a3056a235a7f667fe9e32ba02549f91f17c3d (patch)
tree56f315d4284e12b08589f9cc5a2a6baa00183494
parentfe762619583302b903cf3ca8512bc592c7f62928 (diff)
downloadfreebsd-ports-gnome-494a3056a235a7f667fe9e32ba02549f91f17c3d.tar.gz
freebsd-ports-gnome-494a3056a235a7f667fe9e32ba02549f91f17c3d.tar.zst
freebsd-ports-gnome-494a3056a235a7f667fe9e32ba02549f91f17c3d.zip
- Update to 1.19.12
- Apply the patch from upstream to fix the run error with pcre-8.34 - Update CONFLICTS
-rw-r--r--www/mediawiki119/Makefile6
-rw-r--r--www/mediawiki119/distinfo4
-rw-r--r--www/mediawiki119/files/patch-includes-MagicWord.php13
3 files changed, 18 insertions, 5 deletions
diff --git a/www/mediawiki119/Makefile b/www/mediawiki119/Makefile
index 747c04c06641..c29189e24da9 100644
--- a/www/mediawiki119/Makefile
+++ b/www/mediawiki119/Makefile
@@ -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 Wikipedia
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
diff --git a/www/mediawiki119/distinfo b/www/mediawiki119/distinfo
index 1e450c080ae1..da3b38b3cd5d 100644
--- a/www/mediawiki119/distinfo
+++ b/www/mediawiki119/distinfo
@@ -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
diff --git a/www/mediawiki119/files/patch-includes-MagicWord.php b/www/mediawiki119/files/patch-includes-MagicWord.php
new file mode 100644
index 000000000000..3996e767d188
--- /dev/null
+++ b/www/mediawiki119/files/patch-includes-MagicWord.php
@@ -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 {