Page MenuHomeFreeBSD
Files F153238526

D10181.diff
No OneTemporary
Actions

D10181.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9166,3 +9166,9 @@
print/abc2mtex||2017-03-27|Has expired: Depends on expiring print/musixtex
ftp/bareftp||2017-03-27|Has expired: Broken for more than 6 months
www/rubygem-jquery-rails4|www/rubygem-jquery-rails|2017-03-27|Remove PKGNAMESUFFIX
+security/php56-hash|lang/php56|2017-03-29|PHP hash module now built by default
+security/php70-hash|lang/php70|2017-03-29|PHP hash module now built by default
+security/php71-hash|lang/php71|2017-03-29|PHP hash module now built by default
+www/php56-session|lang/php56|2017-03-29|PHP session module now built by default
+www/php70-session|lang/php70|2017-03-29|PHP session module now built by default
+www/php71-session|lang/php71|2017-03-29|PHP session module now built by default
Index: Mk/Uses/php.mk
===================================================================
--- Mk/Uses/php.mk
+++ Mk/Uses/php.mk
@@ -325,7 +325,7 @@
gd_DEPENDS= graphics/php${PHP_VER}-gd
gettext_DEPENDS=devel/php${PHP_VER}-gettext
gmp_DEPENDS= math/php${PHP_VER}-gmp
-hash_DEPENDS= security/php${PHP_VER}-hash
+hash_DEPENDS= lang/php${PHP_VER}
iconv_DEPENDS= converters/php${PHP_VER}-iconv
igbinary_DEPENDS= converters/pecl-igbinary
imap_DEPENDS= mail/php${PHP_VER}-imap
@@ -374,7 +374,7 @@
readline_DEPENDS= devel/php${PHP_VER}-readline
recode_DEPENDS= converters/php${PHP_VER}-recode
redis_DEPENDS= databases/pecl-redis
-session_DEPENDS=www/php${PHP_VER}-session
+session_DEPENDS=lang/php${PHP_VER}
shmop_DEPENDS= devel/php${PHP_VER}-shmop
simplexml_DEPENDS= textproc/php${PHP_VER}-simplexml
snmp_DEPENDS= net-mgmt/php${PHP_VER}-snmp
Index: lang/php56/Makefile
===================================================================
--- lang/php56/Makefile
+++ lang/php56/Makefile
@@ -3,7 +3,7 @@
PORTNAME= php56
PORTVERSION= 5.6.30
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
@@ -25,9 +25,12 @@
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \
+ --enable-hash \
--enable-libxml \
--enable-mysqlnd \
+ --enable-session \
--with-libxml-dir=${LOCALBASE} \
+ --with-mhash \
--with-pcre-regex=${LOCALBASE} \
--with-zlib-dir=/usr \
--program-prefix=""
Index: lang/php56/Makefile.ext
===================================================================
--- lang/php56/Makefile.ext
+++ lang/php56/Makefile.ext
@@ -124,11 +124,6 @@
CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif
-.if ${PHP_MODNAME} == "hash"
-CONFIGURE_ARGS+=--enable-hash \
- --with-mhash
-.endif
-
.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
@@ -318,11 +313,6 @@
CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
.endif
-.if ${PHP_MODNAME} == "session"
-CONFIGURE_ARGS+=--enable-session
-PHP_MOD_PRIO= 18
-.endif
-
.if ${PHP_MODNAME} == "shmop"
CONFIGURE_ARGS+=--enable-shmop
.endif
Index: lang/php70/Makefile
===================================================================
--- lang/php70/Makefile
+++ lang/php70/Makefile
@@ -3,7 +3,7 @@
PORTNAME= php70
PORTVERSION= 7.0.17
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
@@ -28,9 +28,12 @@
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \
+ --enable-hash \
--enable-libxml \
--enable-mysqlnd \
+ --enable-session \
--with-libxml-dir=${LOCALBASE} \
+ --with-mhash \
--with-pcre-regex=${LOCALBASE} \
--program-prefix=""
Index: lang/php70/Makefile.ext
===================================================================
--- lang/php70/Makefile.ext
+++ lang/php70/Makefile.ext
@@ -124,11 +124,6 @@
CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif
-.if ${PHP_MODNAME} == "hash"
-CONFIGURE_ARGS+=--enable-hash \
- --with-mhash
-.endif
-
.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
@@ -310,11 +305,6 @@
CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
.endif
-.if ${PHP_MODNAME} == "session"
-CONFIGURE_ARGS+=--enable-session
-PHP_MOD_PRIO= 18
-.endif
-
.if ${PHP_MODNAME} == "shmop"
CONFIGURE_ARGS+=--enable-shmop
.endif
Index: lang/php71/Makefile
===================================================================
--- lang/php71/Makefile
+++ lang/php71/Makefile
@@ -3,7 +3,7 @@
PORTNAME= php71
PORTVERSION= 7.1.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
@@ -29,9 +29,12 @@
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \
+ --enable-hash \
--enable-libxml \
--enable-mysqlnd \
+ --enable-session \
--with-libxml-dir=${LOCALBASE} \
+ --with-mhash \
--with-pcre-regex=${LOCALBASE} \
--program-prefix=""
Index: lang/php71/Makefile.ext
===================================================================
--- lang/php71/Makefile.ext
+++ lang/php71/Makefile.ext
@@ -124,11 +124,6 @@
CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif
-.if ${PHP_MODNAME} == "hash"
-CONFIGURE_ARGS+=--enable-hash \
- --with-mhash
-.endif
-
.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
@@ -310,11 +305,6 @@
CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
.endif
-.if ${PHP_MODNAME} == "session"
-CONFIGURE_ARGS+=--enable-session
-PHP_MOD_PRIO= 18
-.endif
-
.if ${PHP_MODNAME} == "shmop"
CONFIGURE_ARGS+=--enable-shmop
.endif
Index: security/Makefile
===================================================================
--- security/Makefile
+++ security/Makefile
@@ -782,15 +782,12 @@
SUBDIR += pgpin
SUBDIR += php-suhosin
SUBDIR += php56-filter
- SUBDIR += php56-hash
SUBDIR += php56-mcrypt
SUBDIR += php56-openssl
SUBDIR += php70-filter
- SUBDIR += php70-hash
SUBDIR += php70-mcrypt
SUBDIR += php70-openssl
SUBDIR += php71-filter
- SUBDIR += php71-hash
SUBDIR += php71-mcrypt
SUBDIR += php71-openssl
SUBDIR += phpdeadlock
Index: security/php56-hash/Makefile
===================================================================
--- security/php56-hash/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php56
-
-PKGNAMESUFFIX= -hash
-
-.include "${MASTERDIR}/Makefile"
Index: security/php70-hash/Makefile
===================================================================
--- security/php70-hash/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php70
-
-PKGNAMESUFFIX= -hash
-
-.include "${MASTERDIR}/Makefile"
Index: security/php71-hash/Makefile
===================================================================
--- security/php71-hash/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php71
-
-PKGNAMESUFFIX= -hash
-
-.include "${MASTERDIR}/Makefile"
Index: www/Makefile
===================================================================
--- www/Makefile
+++ www/Makefile
@@ -1467,13 +1467,10 @@
SUBDIR += php-screw
SUBDIR += php-templates
SUBDIR += php56-opcache
- SUBDIR += php56-session
SUBDIR += php56-tidy
SUBDIR += php70-opcache
- SUBDIR += php70-session
SUBDIR += php70-tidy
SUBDIR += php71-opcache
- SUBDIR += php71-session
SUBDIR += php71-tidy
SUBDIR += phpbb
SUBDIR += phpbb3
Index: www/php56-session/Makefile
===================================================================
--- www/php56-session/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= www
-
-MASTERDIR= ${.CURDIR}/../../lang/php56
-
-PKGNAMESUFFIX= -session
-
-.include "${MASTERDIR}/Makefile"
Index: www/php70-session/Makefile
===================================================================
--- www/php70-session/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= www
-
-MASTERDIR= ${.CURDIR}/../../lang/php70
-
-PKGNAMESUFFIX= -session
-
-.include "${MASTERDIR}/Makefile"
Index: www/php71-session/Makefile
===================================================================
--- www/php71-session/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES= www
-
-MASTERDIR= ${.CURDIR}/../../lang/php71
-
-PKGNAMESUFFIX= -session
-
-.include "${MASTERDIR}/Makefile"

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 12:16 AM (11 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31871218
Default Alt Text
D10181.diff (8 KB)

Event Timeline