svn commit: r442978 - in head: graphics/php71-gd lang/php71

[Torsten Zuehlsdorff]

Author: tz
Date: Fri Jun  9 09:44:33 2017
New Revision: 442978
URL: https://svnweb.freebsd.org/changeset/ports/442978

Log:
  graphics/php71-gd: remove options T1LIB and VPX, add option WEBP
  
  Support for T1LIB and VPX was removed in PHP 7.0
  Support for WebP support was added in PHP 7.0
  
  PR:           219837
  Submitted by: Dani <i.dani at outlook.com>

Modified:
  head/graphics/php71-gd/Makefile
  head/lang/php71/Makefile.ext

Modified: head/graphics/php71-gd/Makefile
==============================================================================
--- head/graphics/php71-gd/Makefile	Fri Jun  9 09:43:51 2017	(r442977)
+++ head/graphics/php71-gd/Makefile	Fri Jun  9 09:44:33 2017	(r442978)
@@ -4,6 +4,8 @@ CATEGORIES=	graphics
 
 MASTERDIR=	${.CURDIR}/../../lang/php71
 
+PORTREVISION=	1
+
 PKGNAMESUFFIX=	-gd
 
 .include "${MASTERDIR}/Makefile"

Modified: head/lang/php71/Makefile.ext
==============================================================================
--- head/lang/php71/Makefile.ext	Fri Jun  9 09:43:51 2017	(r442977)
+++ head/lang/php71/Makefile.ext	Fri Jun  9 09:44:33 2017	(r442978)
@@ -100,14 +100,13 @@ CONFIGURE_ARGS+=--with-gd \
 		--with-png-dir=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
-OPTIONS_DEFINE=	T1LIB TRUETYPE JIS X11 VPX
-OPTIONS_DEFAULT=T1LIB TRUETYPE X11
+OPTIONS_DEFINE=TRUETYPE JIS WEBP X11
+OPTIONS_DEFAULT=TRUETYPE X11
 
-T1LIB_DESC=	Include T1lib support
 TRUETYPE_DESC=	Enable TrueType string function
 JIS_DESC=	Enable JIS-mapped Japanese font support
+WEBP_DESC=  Enable WebP image format support
 X11_DESC=	Enable XPM support
-VPX_DESC=	Enable VP8 codec support
 
 PHP_HEADER_DIRS=libgd
 .endif
@@ -505,26 +504,21 @@ USES+=	mysql
 .include <bsd.port.pre.mk>
 
 .if ${PHP_MODNAME} == "gd"
-.	if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:devel/t1lib
-
-CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
-.	endif
 .	if ${PORT_OPTIONS:MTRUETYPE}
 CONFIGURE_ARGS+=--enable-gd-native-ttf
 .	endif
 .	if ${PORT_OPTIONS:MJIS}
 CONFIGURE_ARGS+=--enable-gd-jis-conv
 .	endif
+.   if ${PORT_OPTIONS:MWEBP}
+LIB_DEPENDS+=   libwebp.so:graphics/webp
+
+CONFIGURE_ARGS+=--with-webp-dir=${LOCALBASE}
+.   endif
 .	if ${PORT_OPTIONS:MX11}
 USE_XORG=	xpm
 
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
-.	endif
-.	if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
-
-CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 .	endif
 .endif