From owner-svn-ports-all@freebsd.org Wed Sep 9 06:39:24 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 006CD9CC47B; Wed, 9 Sep 2015 06:39:24 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.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 D8AF0147D; Wed, 9 Sep 2015 06:39:23 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t896dNKD030126; Wed, 9 Sep 2015 06:39:23 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t896dNhl030121; Wed, 9 Sep 2015 06:39:23 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201509090639.t896dNhl030121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Wed, 9 Sep 2015 06:39:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396452 - in head/www: mediawiki123 mediawiki124 mediawiki125 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2015 06:39:24 -0000 Author: wen Date: Wed Sep 9 06:39:22 2015 New Revision: 396452 URL: https://svnweb.freebsd.org/changeset/ports/396452 Log: - Add php-sockets depends. (Mediawiki needs php-sockets for Squid/Varnish/etc cache invalidation.) Submitted by: feld@(via email) Modified: head/www/mediawiki123/Makefile head/www/mediawiki124/Makefile head/www/mediawiki125/Makefile Modified: head/www/mediawiki123/Makefile ============================================================================== --- head/www/mediawiki123/Makefile Wed Sep 9 01:07:34 2015 (r396451) +++ head/www/mediawiki123/Makefile Wed Sep 9 06:39:22 2015 (r396452) @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.23.10 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 123 @@ -30,13 +31,14 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK -OPTIONS_DEFAULT=MYSQL +OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK SOCKETS +OPTIONS_DEFAULT=MYSQL SOCKETS MEMCACHED_DESC= Use memcached APC_DESC= Use pecl-APC (Mediawiki recommended) XCACHE_DESC= Use xCache (instead of pecl-APC) IMAGICK_DESC= Use ImageMagick +SOCKETS_DESC= Use sockets .include @@ -67,12 +69,14 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP .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 +.if ${PORT_OPTIONS:MSOCKETS} +USE_PHP+= sockets +.endif + pre-install: @${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST} @${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST} Modified: head/www/mediawiki124/Makefile ============================================================================== --- head/www/mediawiki124/Makefile Wed Sep 9 01:07:34 2015 (r396451) +++ head/www/mediawiki124/Makefile Wed Sep 9 06:39:22 2015 (r396452) @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.24.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 124 @@ -30,13 +31,14 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK -OPTIONS_DEFAULT=MYSQL +OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK SOCKETS +OPTIONS_DEFAULT=MYSQL SOCKETS MEMCACHED_DESC= Use memcached APC_DESC= Use pecl-APC (Mediawiki recommended) XCACHE_DESC= Use xCache (instead of pecl-APC) IMAGICK_DESC= Use ImageMagick +SOCKETS_DESC= Use sockets .include @@ -71,6 +73,10 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache .endif +.if ${PORT_OPTIONS:MSOCKETS} +USE_PHP+= sockets +.endif + pre-install: @${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST} @${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST} Modified: head/www/mediawiki125/Makefile ============================================================================== --- head/www/mediawiki125/Makefile Wed Sep 9 01:07:34 2015 (r396451) +++ head/www/mediawiki125/Makefile Wed Sep 9 06:39:22 2015 (r396452) @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.25.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 125 @@ -35,22 +36,24 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK +OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE OPTIONS_RADIO= ACCEL OPTIONS_RADIO_ACCEL= APC XCACHE -OPTIONS_DEFAULT= MYSQL +OPTIONS_DEFAULT= MYSQL SOCKETS MEMCACHED_DESC= Use memcached APC_DESC= Use pecl-APC (Mediawiki recommended) XCACHE_DESC= Use xCache (instead of pecl-APC) IMAGICK_DESC= Use ImageMagick +SOCKETS_DESC= Use sockets MYSQL_USE= mysql=client php=mysql PGSQL_USE= php=pgsql SQLITE_USE= php=sqlite3 LDAP_USE= php=ldap +SOCKETS_USE= php=sockets MEMCACHED_RUN_DEPENDS= memcached:${PORTSDIR}/databases/memcached IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick