svn commit: r418050 - head/Mk

Adam Weinberger adamw at FreeBSD.org
Mon Jul 4 19:12:57 UTC 2016


Author: adamw
Date: Mon Jul  4 19:12:55 2016
New Revision: 418050
URL: https://svnweb.freebsd.org/changeset/ports/418050

Log:
  Extend the USES=php match so that it recognizes php:web as well, to prevent
  an erroneous deprecation warning.
  
  PR:		210822
  Approved by:	portmgr (mat)

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jul  4 19:02:26 2016	(r418049)
+++ head/Mk/bsd.port.mk	Mon Jul  4 19:12:55 2016	(r418050)
@@ -1357,7 +1357,7 @@ USES+=	ssl
 .include "${PORTSDIR}/Mk/bsd.emacs.mk"
 .endif
 
-.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp} ))
+.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
 DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
 USES+=	php
 .endif
@@ -1921,7 +1921,7 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfo
 .include "${PORTSDIR}/Mk/bsd.sdl.mk"
 .endif
 
-.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp} ))
+.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
 DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
 _USES_POST+=	php
 .endif


More information about the svn-ports-head mailing list