diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-27 09:29:23 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-27 09:29:23 +0000 |
commit | cb15e80656df1f725c107a67075b85fde3213766 (patch) | |
tree | a407beaebe1195e009b98c77d8eb648d13ef7834 | |
parent | Import a patch to fix compress("::") calls (diff) |
Remove obsolete PHP versions checks.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=424753
-rw-r--r-- | databases/sqlitemanager/Makefile | 2 | ||||
-rw-r--r-- | ftp/php56-fastdfs/Makefile | 2 | ||||
-rw-r--r-- | ftp/php70-fastdfs/Makefile | 2 | ||||
-rw-r--r-- | graphics/mapserver/Makefile | 2 | ||||
-rw-r--r-- | lang/php56/Makefile.ext | 2 | ||||
-rw-r--r-- | lang/php70/Makefile | 2 | ||||
-rw-r--r-- | lang/php70/Makefile.ext | 2 | ||||
-rw-r--r-- | www/sams2/Makefile | 6 | ||||
-rw-r--r-- | www/zend-framework/Makefile | 8 | ||||
-rw-r--r-- | www/zend-framework1/Makefile | 8 |
10 files changed, 10 insertions, 26 deletions
diff --git a/databases/sqlitemanager/Makefile b/databases/sqlitemanager/Makefile index a42c178e69b8..48318227d10e 100644 --- a/databases/sqlitemanager/Makefile +++ b/databases/sqlitemanager/Makefile @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/SQLiteManager-${PORTVERSION} USES= dos2unix NO_BUILD= yes PLIST_SUB+= WWWDIR_REL="${WWWDIR_REL}" -USE_PHP= sqlite${PHP_VER:S/^53$$//:C/^.+$$/3/} +USE_PHP= sqlite3 EXTRACT_AFTER_ARGS=--exclude TODO do-install: diff --git a/ftp/php56-fastdfs/Makefile b/ftp/php56-fastdfs/Makefile index 36010f780e58..ce2d42be3b60 100644 --- a/ftp/php56-fastdfs/Makefile +++ b/ftp/php56-fastdfs/Makefile @@ -18,7 +18,7 @@ GH_PROJECT= fastdfs GH_TAGNAME= 87659981148a362812912b6d4752d281ac05f0b6 USES= php:ext -IGNORE_WITH_PHP= 55 70 +IGNORE_WITH_PHP= 70 PHP_DEFAULT= 5.6 WRKSRC_SUBDIR= php_client diff --git a/ftp/php70-fastdfs/Makefile b/ftp/php70-fastdfs/Makefile index cea1b934524b..cf4f689bbe30 100644 --- a/ftp/php70-fastdfs/Makefile +++ b/ftp/php70-fastdfs/Makefile @@ -18,7 +18,7 @@ GH_PROJECT= fastdfs GH_TAGNAME= 87659981148a362812912b6d4752d281ac05f0b6 USES= php:ext -IGNORE_WITH_PHP= 55 56 +IGNORE_WITH_PHP= 56 PHP_DEFAULT= 7.0 WRKSRC_SUBDIR= php_client diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 60e2db03fa56..64bc630f2086 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -126,7 +126,7 @@ CMAKE_ARGS+= -DWITH_POSTGIS=0 .if ${PORT_OPTIONS:MPHP} USES+= php:build -IGNORE_WITH_PHP= 55 70 +IGNORE_WITH_PHP= 70 CMAKE_ARGS+= -DWITH_PHP=1 PLIST_SUB+= PHP="" .else diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index a95862fd98d4..41655003897c 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -3,7 +3,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 56 -IGNORE_WITH_PHP= 55 70 +IGNORE_WITH_PHP= 70 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} diff --git a/lang/php70/Makefile b/lang/php70/Makefile index 161ac332a27e..80460e0d6046 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--enable-fpm \ .if defined(PKGNAMEPREFIX) USES+= php PHP_VER= 70 -IGNORE_WITH_PHP= 55 56 +IGNORE_WITH_PHP= 56 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext index fe44bd932ce3..f581ac4038d0 100644 --- a/lang/php70/Makefile.ext +++ b/lang/php70/Makefile.ext @@ -3,7 +3,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 70 -IGNORE_WITH_PHP= 55 56 +IGNORE_WITH_PHP= 56 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} diff --git a/www/sams2/Makefile b/www/sams2/Makefile index daaf45c78dde..124a15378b1d 100644 --- a/www/sams2/Makefile +++ b/www/sams2/Makefile @@ -35,12 +35,6 @@ APACHE_USE= APACHE=22+ .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MAPACHE} -. if ${PHP_VER} == "54" && (${APACHE_VERSION} >= 24) -RUN_DEPENDS+= mod_php5>=0:www/mod_php5 -. endif -. if ${PHP_VER} == "55" && (${APACHE_VERSION} >= 24) -RUN_DEPENDS+= mod_php55>=0:www/mod_php55 -. endif . if ${APACHE_VERSION} >= 24 AP24= "" . endif diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile index 5a38d6669489..3eebd3c6142a 100644 --- a/www/zend-framework/Makefile +++ b/www/zend-framework/Makefile @@ -42,13 +42,7 @@ PORTDOCS= CHANGELOG.md INSTALL.md README-GIT.md CONTRIBUTING.md README.md # if chosen by the user. .if ${PORT_OPTIONS:MREQPHP} USE_PHP+= ctype curl dom gd hash iconv mbstring ldap mcrypt \ - opcache pcre pdo session simplexml soap wddx xml zlib -.if ${PHP_VER} == 52 -USE_PHP+= sqlite -.else -USE_PHP+= sqlite3 -.endif - + opcache pcre pdo session simplexml soap sqlite3 wddx xml zlib .endif .if ${PORT_OPTIONS:MOPTPHP} diff --git a/www/zend-framework1/Makefile b/www/zend-framework1/Makefile index 32676fe65eaf..84ebe8b2e389 100644 --- a/www/zend-framework1/Makefile +++ b/www/zend-framework1/Makefile @@ -53,13 +53,9 @@ INSTALL_DIRS= library extras/library externals/dojo/dijit \ .if ${PORT_OPTIONS:MREQPHP} USE_PHP+= ctype curl dom gd hash iconv mbstring ldap mcrypt \ - opcache pcre pdo session simplexml soap \ + opcache pcre pdo session simplexml soap sqlite3 \ wddx xml zlib -.if ${PHP_VER} == 52 -USE_PHP+= sqlite -.else -USE_PHP+= sqlite3 -.endif + RUN_DEPENDS+= pecl-memcache>=0:databases/pecl-memcache \ pecl-memcached>=0:databases/pecl-memcached .endif |