From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 13 14:52:48 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E42AE5C8;
 Sat, 13 Oct 2012 14:52:48 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id CD4F18FC14;
 Sat, 13 Oct 2012 14:52:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9DEqmhi039774;
 Sat, 13 Oct 2012 14:52:48 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9DEqmi5039772;
 Sat, 13 Oct 2012 14:52:48 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201210131452.q9DEqmi5039772@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sat, 13 Oct 2012 14:52:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305834 - head/www/mediawiki
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.14
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, 13 Oct 2012 14:52:49 -0000

Author: wen
Date: Sat Oct 13 14:52:48 2012
New Revision: 305834
URL: http://svn.freebsd.org/changeset/ports/305834

Log:
  - Add missing option
  
  PR:		172659
  Submitted by:	Spil <spil.oss@gmail.com>
  Feature safe:	yes

Modified:
  head/www/mediawiki/Makefile

Modified: head/www/mediawiki/Makefile
==============================================================================
--- head/www/mediawiki/Makefile	Sat Oct 13 14:16:02 2012	(r305833)
+++ head/www/mediawiki/Makefile	Sat Oct 13 14:52:48 2012	(r305834)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.19.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
 
@@ -21,12 +22,13 @@ MEDIAWIKIDIR?=	www/mediawiki
 
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL IMAGICK
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK
 OPTIONS_DEFAULT=MYSQL APC
 
 MEMCACHED_DESC=	use memcached
 APC_DESC=	use pecl-APC(Mediawiki recommended)
 EACCEL_DESC=	use eAccelerator (instead of pecl-APC)
+XCACHE_DESC=	use xCache (instead of pecl-APC)
 IMAGICK_DESC=	use ImageMagick
 
 .include <bsd.port.options.mk>
@@ -56,14 +58,12 @@ RUN_DEPENDS=	memcached:${PORTSDIR}/datab
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
 .endif
 
-.if ${PORT_OPTIONS:MAPC} || ${PORTS_OPTIONS:MEACCEL} || ${PORTS_OPTIONS:MXCACHE}
-.if ${PORT_OPTIONS:MEACCEL}
+.if ${PORT_OPTIONS:MAPC}
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+.elif ${PORT_OPTIONS:MEACCEL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccelerator
 .elif ${PORT_OPTIONS:MXCACHE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
-.else
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
-.endif
 .endif
 
 do-install: