svn commit: r454753 - in head/lang: php70 php71

[Torsten Zuehlsdorff]

Author: tz
Date: Thu Nov 23 11:38:59 2017
New Revision: 454753
URL: https://svnweb.freebsd.org/changeset/ports/454753

Log:
  lang/php70 and lang/php71: Add mail header patch
  
  While here to some improvements:
  - Remove CONFLICTS of no longer existing PHP 5.5
  - Add CONFLICTS to PHP 7.2
  - Remove IPV6_DESC in order to use default one
  
  PR:           219321
  Submitted by: Karsten Schmidt <bsd at guggemand.dk>

Modified:
  head/lang/php70/Makefile
  head/lang/php70/distinfo
  head/lang/php71/Makefile
  head/lang/php71/distinfo

Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile	Thu Nov 23 10:35:15 2017	(r454752)
+++ head/lang/php70/Makefile	Thu Nov 23 11:38:59 2017	(r454753)
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 
 USE_GNOME=	libxml2
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM LINKTHR DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=FPM
@@ -55,14 +55,22 @@ EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 PHPDBG_DESC=	Interactive PHP debugger
 DTRACE_DESC=	Enable DTrace support
+MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
-CONFLICTS=	php55-5* php56-*
+CONFLICTS=	php56-* php71-* php72-*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
+
+PATCH_DIST_STRIP=	-p1
+
+.if ${PORT_OPTIONS:MMAILHEAD}
+PATCHFILES+=	php-7.0.x-mail-header.patch:mail
+PATCH_SITES+=	http://choon.net/opensource/php/:mail
+.endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli

Modified: head/lang/php70/distinfo
==============================================================================
--- head/lang/php70/distinfo	Thu Nov 23 10:35:15 2017	(r454752)
+++ head/lang/php70/distinfo	Thu Nov 23 11:38:59 2017	(r454753)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1509003114
+TIMESTAMP = 1511432256
 SHA256 (php-7.0.25.tar.xz) = 5cc14bd20fb2226f6d34465662425cd100441bde9042ea1cef2e4506d6ded8cc
 SIZE (php-7.0.25.tar.xz) = 11963668
+SHA256 (php-7.0.x-mail-header.patch) = b78cd5a36a4709ea4e43e5babe73648ae6ace870cc0e34a5417177045834b4f0
+SIZE (php-7.0.x-mail-header.patch) = 4504

Modified: head/lang/php71/Makefile
==============================================================================
--- head/lang/php71/Makefile	Thu Nov 23 10:35:15 2017	(r454752)
+++ head/lang/php71/Makefile	Thu Nov 23 11:38:59 2017	(r454753)
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 
 USE_GNOME=	libxml2
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM LINKTHR DTRACE
 
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
@@ -57,15 +57,22 @@ EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 PHPDBG_DESC=	Interactive PHP debugger
 DTRACE_DESC=	Enable DTrace support
-IPV6_DESC=	Enable ipv6 support
+MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
-CONFLICTS=	php56-* php70-*
+CONFLICTS=	php56-* php70-* php72-*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
+
+PATCH_DIST_STRIP=	-p1
+
+.if ${PORT_OPTIONS:MMAILHEAD}
+PATCHFILES+=	php-7.1.x-mail-header.patch:mail
+PATCH_SITES+=	http://choon.net/opensource/php/:mail
+.endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli

Modified: head/lang/php71/distinfo
==============================================================================
--- head/lang/php71/distinfo	Thu Nov 23 10:35:15 2017	(r454752)
+++ head/lang/php71/distinfo	Thu Nov 23 11:38:59 2017	(r454753)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1509003128
+TIMESTAMP = 1511432195
 SHA256 (php-7.1.11.tar.xz) = 074093e9d7d21afedc5106904218a80a47b854abe368d2728ed22184c884893e
 SIZE (php-7.1.11.tar.xz) = 12169884
+SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7
+SIZE (php-7.1.x-mail-header.patch) = 4504