diff options
| author | wen <wen@FreeBSD.org> | 2014-06-23 21:18:36 +0800 |
|---|---|---|
| committer | wen <wen@FreeBSD.org> | 2014-06-23 21:18:36 +0800 |
| commit | 224c039977025a1247b67bd6ca1622f0904e8d0a (patch) | |
| tree | 2021150e6915f8a64fa4ff886f11ee0f0699aa2f | |
| parent | c9f2b6495b5fcf971773294f053ca242270f7d86 (diff) | |
| download | freebsd-ports-gnome-224c039977025a1247b67bd6ca1622f0904e8d0a.tar.gz freebsd-ports-gnome-224c039977025a1247b67bd6ca1622f0904e8d0a.tar.zst freebsd-ports-gnome-224c039977025a1247b67bd6ca1622f0904e8d0a.zip | |
- Update to 1.19.16
- Fix build with php-5.5 by removing APC from OPTIONS_DEFAULT [1]
- Remove the patch which included into upstream now
PR: 191124 [1]
Submitted by: Mark Felder <feld@FreeBSD.org> [1]
| -rw-r--r-- | www/mediawiki119/Makefile | 6 | ||||
| -rw-r--r-- | www/mediawiki119/distinfo | 4 | ||||
| -rw-r--r-- | www/mediawiki119/files/patch-includes-MagicWord.php | 13 |
3 files changed, 5 insertions, 18 deletions
diff --git a/www/mediawiki119/Makefile b/www/mediawiki119/Makefile index 11e66950ee6b..8113aef43da5 100644 --- a/www/mediawiki119/Makefile +++ b/www/mediawiki119/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mediawiki -PORTVERSION= 1.19.14 +PORTVERSION= 1.19.16 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 119 @@ -12,7 +12,7 @@ COMMENT= The wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki-1.2[0-9].* mediawiki12[0-9]-* +CONFLICTS= mediawiki12[0-9]-* USE_PHP= ctype iconv mbstring pcre session xml zlib readline dom WANT_PHP_WEB= yes @@ -21,7 +21,7 @@ MEDIAWIKIDIR?= www/mediawiki NO_BUILD= yes OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK -OPTIONS_DEFAULT=MYSQL APC +OPTIONS_DEFAULT=MYSQL MEMCACHED_DESC= use memcached APC_DESC= use pecl-APC(Mediawiki recommended) diff --git a/www/mediawiki119/distinfo b/www/mediawiki119/distinfo index 563b21ee1c5a..79489be84f28 100644 --- a/www/mediawiki119/distinfo +++ b/www/mediawiki119/distinfo @@ -1,2 +1,2 @@ -SHA256 (mediawiki-1.19.14.tar.gz) = 0d87283986de3c591523cb506246294c89da1300ddb994a64c0c30a9dabb4c7e -SIZE (mediawiki-1.19.14.tar.gz) = 18649176 +SHA256 (mediawiki-1.19.16.tar.gz) = 29d8b66fec7919fb12a70540be77b0538dd7dfced6d2982e707082405f59b6d5 +SIZE (mediawiki-1.19.16.tar.gz) = 17933504 diff --git a/www/mediawiki119/files/patch-includes-MagicWord.php b/www/mediawiki119/files/patch-includes-MagicWord.php deleted file mode 100644 index 3996e767d188..000000000000 --- a/www/mediawiki119/files/patch-includes-MagicWord.php +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 { |