Index: branches/2015Q3/www/mediawiki123/Makefile
===================================================================
--- branches/2015Q3/www/mediawiki123/Makefile	(revision 395143)
+++ branches/2015Q3/www/mediawiki123/Makefile	(revision 395144)
@@ -1,90 +1,84 @@
 # Created by: Gerrit Beine <tux@pinguru.net>
 # $FreeBSD$
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.23.9
-PORTREVISION=	1
+PORTVERSION=	1.23.10
 CATEGORIES=	www
 MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
 PKGNAMESUFFIX=	123
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Wiki engine used by Wikipedia
 
 LICENSE=	GPLv2
 
 CONFLICTS=	mediawiki119-[0-9]* mediawiki12[45]-[0-9]*
 
 USES=		shebangfix
 SHEBANG_FILES=	maintenance/dev/*.sh \
 		maintenance/hiphop/run-server
 SHEBANG_LANG=	hhvm
 hhvm_OLD_CMD=	/usr/bin/hhvm
 hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
 USE_PHP=	ctype hash iconv mbstring pcre session xml zlib readline dom json
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 
 SUB_FILES=	pkg-message
 SUB_LIST=	MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR}
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK
 OPTIONS_DEFAULT=MYSQL
 
 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>
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	client
 USE_PHP+=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
 RUN_DEPENDS=	memcached:${PORTSDIR}/databases/memcached
 .endif
 
 .if ${PORT_OPTIONS:MIMAGICK}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
 .endif
 
 .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
 .endif
 
 pre-install:
-	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
-	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
 	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
-	@${ECHO_CMD} "@group" >> ${PLIST}
-	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
 
 .include <bsd.port.mk>
Index: branches/2015Q3/www/mediawiki123/distinfo
===================================================================
--- branches/2015Q3/www/mediawiki123/distinfo	(revision 395143)
+++ branches/2015Q3/www/mediawiki123/distinfo	(revision 395144)
@@ -1,2 +1,2 @@
-SHA256 (mediawiki-1.23.9.tar.gz) = 14af72b5b01b8c08e62d893db08519440372ba115c94ecf2f622fd77c123f3d0
-SIZE (mediawiki-1.23.9.tar.gz) = 20979505
+SHA256 (mediawiki-1.23.10.tar.gz) = d25a5cfaeb78abe2b86c10404d321f18cfd573754e1e3eaeeea4fa2b41fefda0
+SIZE (mediawiki-1.23.10.tar.gz) = 21044267
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 395143)
+++ branches/2015Q3	(revision 395144)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r394265