From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 23 13:13:38 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 EA186D78;
 Mon, 23 Jun 2014 13:13:38 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D770B266A;
 Mon, 23 Jun 2014 13:13:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NDDcCO027184;
 Mon, 23 Jun 2014 13:13:38 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NDDcbK027183;
 Mon, 23 Jun 2014 13:13:38 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201406231313.s5NDDcbK027183@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Mon, 23 Jun 2014 13:13:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358935 - head/www/mediawiki122
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.18
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: Mon, 23 Jun 2014 13:13:39 -0000

Author: wen
Date: Mon Jun 23 13:13:38 2014
New Revision: 358935
URL: http://svnweb.freebsd.org/changeset/ports/358935
QAT: https://qat.redports.org/buildarchive/r358935/

Log:
  - Fix build with php-5.5 by removing APC from OPTIONS_DEFAULT [1]
  - Adjust CONFLICTS to welcome mediawiki123
  
  PR:		191124 [1]
  Submitted by:	Mark Felder <feld@FreeBSD.org> [1]

Modified:
  head/www/mediawiki122/Makefile

Modified: head/www/mediawiki122/Makefile
==============================================================================
--- head/www/mediawiki122/Makefile	Mon Jun 23 13:13:19 2014	(r358934)
+++ head/www/mediawiki122/Makefile	Mon Jun 23 13:13:38 2014	(r358935)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.22.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
 PKGNAMESUFFIX=	122
@@ -12,7 +13,7 @@ COMMENT=	The wiki engine used by Wikiped
 
 LICENSE=	GPLv2
 
-CONFLICTS=	mediawiki119-[0-9]* mediawiki12[01]-[0-9]*
+CONFLICTS=	mediawiki119-[0-9]* mediawiki121-[0-9]* mediawiki123-[0-9]*
 
 USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom json
 WANT_PHP_WEB=	yes
@@ -21,7 +22,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)