From 2d4f2b9c75a9f132ba4f5982b38b84cdeb95d498 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 15 Aug 2016 15:28:03 +0000 Subject: [PATCH] Remove www/pecl-APC, it doesn't work with PHP 5.5+. PR: 211344 Submitted by: rene Sponsored by: Absolight --- MOVED | 1 + Mk/Uses/php.mk | 3 +- deskutils/tine20/Makefile | 4 +-- devel/pear-Horde_Cache/Makefile | 5 ---- devel/pecl-memoize/Makefile | 5 +--- devel/pecl-memoize/pkg-descr | 1 - devel/phabricator/Makefile | 4 +-- devel/php-memoize/Makefile | 6 +--- devel/php-memoize/pkg-descr | 1 - www/Makefile | 1 - www/mediawiki123/Makefile | 9 ++---- www/mediawiki124/Makefile | 9 ++---- www/mediawiki125/Makefile | 8 ++---- www/mediawiki126/Makefile | 8 ++---- www/mediawiki127/Makefile | 8 ++---- www/pecl-APC/Makefile | 47 ------------------------------- www/pecl-APC/distinfo | 2 -- www/pecl-APC/files/pkg-message.in | 15 ---------- www/pecl-APC/pkg-descr | 6 ---- www/typo3-lts/Makefile | 4 +-- www/typo3/Makefile | 4 +-- 21 files changed, 20 insertions(+), 131 deletions(-) delete mode 100644 www/pecl-APC/Makefile delete mode 100644 www/pecl-APC/distinfo delete mode 100644 www/pecl-APC/files/pkg-message.in delete mode 100644 www/pecl-APC/pkg-descr diff --git a/MOVED b/MOVED index 823d0e02e74f..3829fabe2450 100644 --- a/MOVED +++ b/MOVED @@ -8617,3 +8617,4 @@ multimedia/linux-realplayer||2016-08-09|Has expired: Not maintained upstream, co cad/NASTRAN|cad/NASTRAN-95|2016-08-12|Rename to match PORTNAME and upstream name ports-mgmt/xps||2016-08-11|Has expired: Does not support pkg(8) math/bamg||2016-08-14|No longer maintained upstream as is now part of freefem++ +www/pecl-APC||2016-08-15|No longer maintained upstream, and not working with PHP > 5.4 diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 372bff44135e..cb038ad80797 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -288,7 +288,7 @@ add-plist-phpext: # Extensions . if defined(USE_PHP) && ${USE_PHP:tl} != "yes" # non-version specific components -_USE_PHP_ALL= apc bcmath bitset bz2 calendar ctype curl dba dom \ +_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ exif fileinfo filter ftp gd gettext gmp \ hash iconv igbinary imap interbase intl json ldap mbstring mcrypt \ memcache mysqli odbc opcache \ @@ -302,7 +302,6 @@ _USE_PHP_VER55= ${_USE_PHP_ALL} mssql mysql sybase_ct _USE_PHP_VER56= ${_USE_PHP_ALL} mssql mysql sybase_ct _USE_PHP_VER70= ${_USE_PHP_ALL} -apc_DEPENDS= www/pecl-APC bcmath_DEPENDS= math/php${PHP_VER}-bcmath . if ${PHP_VER} == 70 bitset_DEPENDS= math/pecl-bitset diff --git a/deskutils/tine20/Makefile b/deskutils/tine20/Makefile index 8f01b84f0fdc..caa5448fa970 100644 --- a/deskutils/tine20/Makefile +++ b/deskutils/tine20/Makefile @@ -20,8 +20,7 @@ EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions -C ${WRKSRC} SUB_FILES= pkg-message SUB_LIST= DISTNAME=${DISTNAME} -OPTIONS_DEFINE= LDAP APC MEMCACHE -APC_DESC= Enable pecl-APC support +OPTIONS_DEFINE= LDAP MEMCACHE MEMCACHE_DESC= Enable pecl-memcache support USE_MYSQL= yes @@ -29,7 +28,6 @@ USE_PHP= ctype dom gd iconv json mcrypt pdo_mysql simplexml \ spl xml zip WANT_PHP_WEB= yes -APC_USE= php=apc LDAP_USE= php=ldap MEMCACHE_USE= php=memcache diff --git a/devel/pear-Horde_Cache/Makefile b/devel/pear-Horde_Cache/Makefile index 09856c0818e7..f9ced7d8e929 100644 --- a/devel/pear-Horde_Cache/Makefile +++ b/devel/pear-Horde_Cache/Makefile @@ -8,9 +8,6 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Caching API -OPTIONS_DEFINE= APC -APC_DESC= Require APC PHP extension - USES= horde USE_HORDE_RUN= Horde_Compress_Fast \ Horde_Exception \ @@ -18,6 +15,4 @@ USE_HORDE_RUN= Horde_Compress_Fast \ Horde_Util USE_PHP= hash -APC_USE= PHP=apc - .include diff --git a/devel/pecl-memoize/Makefile b/devel/pecl-memoize/Makefile index 39a9bc6c8099..9302a3898b36 100644 --- a/devel/pecl-memoize/Makefile +++ b/devel/pecl-memoize/Makefile @@ -18,14 +18,11 @@ USES= php:ext tar:tgz CONFIGURE_ARGS= --enable-memoize IGNORE_WITH_PHP= 70 -OPTIONS_DEFINE= APC MEMCACHED MEMORY +OPTIONS_DEFINE= MEMCACHED MEMORY OPTIONS_DEFAULT=MEMORY -APC_DESC= Enable memoize APC module MEMCACHED_DESC= Enable memcached storage module MEMORY_DESC= Enable the memoize memory storage module -APC_CONFIGURE_ON= --enable-memoize-apc -APC_USE= PHP=apc:build MEMCACHED_CONFIGURE_ON= --with-memoize-memcached MEMCACHED_BUILD_DEPENDS=libmemcached>=0:databases/libmemcached MEMCACHED_RUN_DEPENDS= libmemcached>=0:databases/libmemcached diff --git a/devel/pecl-memoize/pkg-descr b/devel/pecl-memoize/pkg-descr index 17949567865a..5641a388d198 100644 --- a/devel/pecl-memoize/pkg-descr +++ b/devel/pecl-memoize/pkg-descr @@ -8,6 +8,5 @@ time: Since this is a per-request cache, neither TTLs specified in the `memoize()` call or `memoize.default_ttl` are used. - memcached: Uses libmemcached or the memcached PHP extension -- apc: Uses the APC PHP extension WWW: http://pecl.php.net/package/memoize diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile index dd3f591a9cca..0a0b3f62797b 100644 --- a/devel/phabricator/Makefile +++ b/devel/phabricator/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= php5-libphutil>0:devel/libphutil \ OPTIONS_DEFINE= GD OPCACHE OPTIONS_DEFAULT=OPCACHE -OPCACHE_DESC?= Use OPcache/APCu (APC on PHP < 5.5) to improve performance +OPCACHE_DESC?= Use OPcache to improve performance USES= shebangfix SHEBANG_FILES= externals/httpful/build \ @@ -36,8 +36,6 @@ GD_USE= PHP=gd . if ${PHP_EXT_DIR:C|[^0-9]||g} >= 20121212 USE_PHP+= opcache RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu -. else -USE_PHP+= apc . endif .endif diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile index cc9f3f049e8e..9445a395baf8 100644 --- a/devel/php-memoize/Makefile +++ b/devel/php-memoize/Makefile @@ -18,15 +18,11 @@ PHP_MODNAME= memoize IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-memoize -OPTIONS_DEFINE= APC MEMCACHED MEMORY +OPTIONS_DEFINE= MEMCACHED MEMORY OPTIONS_DEFAULT= MEMORY -APC_DESC= Enable memoize APC module MEMCACHED_DESC= Enable memcached storage module MEMORY_DESC= Enable the memoize memory storage module -APC_CONFIGURE_ENABLE= memoize-apc -APC_BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC - MEMCACHED_CONFIGURE_WITH= memoize-memcached MEMCACHED_BUILD_DEPENDS= libmemcached>0:databases/libmemcached MEMCACHED_RUN_DEPENDS= libmemcached>0:databases/libmemcached diff --git a/devel/php-memoize/pkg-descr b/devel/php-memoize/pkg-descr index 4a804c8d38b5..0ee3361d5081 100644 --- a/devel/php-memoize/pkg-descr +++ b/devel/php-memoize/pkg-descr @@ -8,6 +8,5 @@ time: Since this is a per-request cache, neither TTLs specified in the `memoize()` call or `memoize.default_ttl` are used. - memcached: Uses libmemcached or the memcached PHP extension -- apc: Uses the APC PHP extension WWW: https://github.com/arraypad/php-memoize diff --git a/www/Makefile b/www/Makefile index 113a151f6935..708034272b43 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1404,7 +1404,6 @@ SUBDIR += pear-XML_GRDDL SUBDIR += pear-twig SUBDIR += pebble - SUBDIR += pecl-APC SUBDIR += pecl-amfext SUBDIR += pecl-http SUBDIR += pecl-http1 diff --git a/www/mediawiki123/Makefile b/www/mediawiki123/Makefile index da05597a9df2..2406cb1eb30d 100644 --- a/www/mediawiki123/Makefile +++ b/www/mediawiki123/Makefile @@ -31,12 +31,11 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK SOCKETS +OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED 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) +XCACHE_DESC= Use xCache IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets @@ -69,9 +68,7 @@ RUN_DEPENDS= memcached:databases/memcached RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick .endif -.if ${PORT_OPTIONS:MAPC} -RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC -.elif ${PORT_OPTIONS:MXCACHE} +.if ${PORT_OPTIONS:MXCACHE} RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache .endif diff --git a/www/mediawiki124/Makefile b/www/mediawiki124/Makefile index 6124bea9bf07..c2dd46f37c44 100644 --- a/www/mediawiki124/Makefile +++ b/www/mediawiki124/Makefile @@ -34,12 +34,11 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC XCACHE IMAGICK SOCKETS +OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED 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) +XCACHE_DESC= Use xCache IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets @@ -72,9 +71,7 @@ RUN_DEPENDS= memcached:databases/memcached RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick .endif -.if ${PORT_OPTIONS:MAPC} -RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC -.elif ${PORT_OPTIONS:MXCACHE} +.if ${PORT_OPTIONS:MXCACHE} RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache .endif diff --git a/www/mediawiki125/Makefile b/www/mediawiki125/Makefile index 38c9db75feed..0c828348d1ad 100644 --- a/www/mediawiki125/Makefile +++ b/www/mediawiki125/Makefile @@ -38,16 +38,13 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS +OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS XCACHE OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE -OPTIONS_RADIO= ACCEL -OPTIONS_RADIO_ACCEL= APC XCACHE OPTIONS_DEFAULT= MYSQL SOCKETS MEMCACHED_DESC= Use memcached -APC_DESC= Use pecl-APC (Mediawiki recommended) -XCACHE_DESC= Use xCache (instead of pecl-APC) +XCACHE_DESC= Use xCache IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets @@ -60,7 +57,6 @@ SOCKETS_USE= php=sockets MEMCACHED_RUN_DEPENDS= memcached:databases/memcached IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick -APC_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache pre-install: diff --git a/www/mediawiki126/Makefile b/www/mediawiki126/Makefile index 00ce8f113227..f6811a9ae8ed 100644 --- a/www/mediawiki126/Makefile +++ b/www/mediawiki126/Makefile @@ -34,16 +34,13 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS +OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS XCACHE OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE -OPTIONS_RADIO= ACCEL -OPTIONS_RADIO_ACCEL= APC XCACHE OPTIONS_DEFAULT= MYSQL SOCKETS MEMCACHED_DESC= Use memcached -APC_DESC= Use pecl-APC (Mediawiki recommended) -XCACHE_DESC= Use xCache (instead of pecl-APC) +XCACHE_DESC= Use xCache IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets @@ -56,7 +53,6 @@ SOCKETS_USE= php=sockets MEMCACHED_RUN_DEPENDS= memcached:databases/memcached IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick -APC_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache pre-install: diff --git a/www/mediawiki127/Makefile b/www/mediawiki127/Makefile index f14934cc229f..fa649cfd00a0 100644 --- a/www/mediawiki127/Makefile +++ b/www/mediawiki127/Makefile @@ -34,16 +34,13 @@ PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message SUB_LIST= MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR} -OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS +OPTIONS_DEFINE= LDAP MEMCACHED IMAGICK SOCKETS XCACHE OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE -OPTIONS_RADIO= ACCEL -OPTIONS_RADIO_ACCEL= APC XCACHE OPTIONS_DEFAULT= MYSQL SOCKETS MEMCACHED_DESC= Use memcached -APC_DESC= Use pecl-APC (Mediawiki recommended) -XCACHE_DESC= Use xCache (instead of pecl-APC) +XCACHE_DESC= Use xCache IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets @@ -55,7 +52,6 @@ SOCKETS_USE= php=sockets MEMCACHED_RUN_DEPENDS= memcached:databases/memcached IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick -APC_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache pre-install: diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile deleted file mode 100644 index 85fa7c97ef0c..000000000000 --- a/www/pecl-APC/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Created by: Thierry Thomas -# $FreeBSD$ - -PORTNAME= APC -PORTVERSION= 3.1.14 -PORTREVISION= 2 -CATEGORIES= www -#MASTER_SITES= http://pecl.php.net/get/ -MASTER_SITES= LOCAL/sunpoet -PKGNAMEPREFIX= pecl- -DISTNAME= ${PORTNAME}-3.1.13 -DIST_SUBDIR= PECL - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Alternative PHP Cache - -LICENSE= PHP301 - -DEPRECATED= Unmaintained by upstream and not work for PHP 5.5+ -EXPIRATION_DATE=2016-03-15 - -OPTIONS_DEFINE= DOCS FILEHITS IPC SEMAPHORES SPINLOCKS -FILEHITS_DESC= Per request cache info -IPC_DESC= IPC shm memory support (default: mmap) -SEMAPHORES_DESC=System V IPC semaphores (default: fcntl) -SPINLOCKS_DESC= Spinlocks (experimental) - -CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS= --enable-apc -IGNORE_WITH_PHP=55 56 70 -PHP_MODNAME= ${PORTNAME:tl} -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message -USES= php:ext tar:tgz - -PORTDOCS= CHANGELOG INSTALL NOTICE apc.php - -FILEHITS_CONFIGURE_ARGS=--enable-apc-filehits -IPC_CONFIGURE_ARGS= --disable-apc-mmap -SEMAPHORES_CONFIGURE_ARGS= --enable-apc-sem -SPINLOCKS_CONFIGURE_ARGS= --enable-apc-spinlocks - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ - -.include diff --git a/www/pecl-APC/distinfo b/www/pecl-APC/distinfo deleted file mode 100644 index fe76008c33ec..000000000000 --- a/www/pecl-APC/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (PECL/APC-3.1.13.tgz) = 5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd -SIZE (PECL/APC-3.1.13.tgz) = 171591 diff --git a/www/pecl-APC/files/pkg-message.in b/www/pecl-APC/files/pkg-message.in deleted file mode 100644 index 4eaba38d6050..000000000000 --- a/www/pecl-APC/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -************************************************************************ -You may edit %%LOCALBASE%%/etc/php.ini to change this variables: - -apc.enabled="1" - ^^^ -> Default value - -apc.shm_size="30" - ^^^^ -> Default value - -* More information on %%DOCSDIR%%/INSTALL - -Then restart your web server and consult the output of phpinfo(). -If there is an informational section for APC, the installation was -successful. -************************************************************************ diff --git a/www/pecl-APC/pkg-descr b/www/pecl-APC/pkg-descr deleted file mode 100644 index 588547de5a3c..000000000000 --- a/www/pecl-APC/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -APC is the Alternative PHP Cache. - -It was conceived of to provide a free, open, and robust framework for -caching and optimizing PHP intermediate code. - -WWW: http://pecl.php.net/package/APC diff --git a/www/typo3-lts/Makefile b/www/typo3-lts/Makefile index 52b4b18c27ed..f5650a761ad7 100644 --- a/www/typo3-lts/Makefile +++ b/www/typo3-lts/Makefile @@ -33,14 +33,12 @@ GROUPS= ${WWWGRP} DISTFILES+= ${TYPO3SRC}${EXTRACT_SUFX} -OPTIONS_DEFINE= APC CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB -APC_DESC= Alternative PHP Cache +OPTIONS_DEFINE= CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB GD_DESC= GDlib/freetype support IMAGICK_DESC= ${IMAGEMAGICK_DESC} MBSTRING_DESC= ${MULTIBYTE_DESC} MYSQL_DESC= Install MySQL Server -APC_USE= PHP=apc CURL_USE= PHP=curl GD_USE= PHP=gd GMP_USE= PHP=gmp diff --git a/www/typo3/Makefile b/www/typo3/Makefile index e0aa5820fed8..0d2eb826c1af 100644 --- a/www/typo3/Makefile +++ b/www/typo3/Makefile @@ -29,15 +29,13 @@ GROUPS= ${WWWGRP} DISTFILES+= ${TYPO3SRC}${EXTRACT_SUFX} -OPTIONS_DEFINE= APC CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB +OPTIONS_DEFINE= CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB OPTIONS_DEFAULT= GD ZLIB -APC_DESC= Alternative PHP Cache GD_DESC= GDlib/freetype support IMAGICK_DESC= ${IMAGEMAGICK_DESC} MBSTRING_DESC= ${MULTIBYTE_DESC} MYSQL_DESC= Install MySQL Server -APC_USE= PHP=apc CURL_USE= PHP=curl GD_USE= PHP=gd GMP_USE= PHP=gmp