svn commit: r427081 - in head/www: nginx nginx-devel

[Jan Beich]

Author: jbeich
Date: Fri Nov 25 07:46:56 2016
New Revision: 427081
URL: https://svnweb.freebsd.org/changeset/ports/427081

Log:
  www/nginx: drop unused ImageMagick dependency
  
  nginx-video-thumbextractor-module-0.7.0/README.textile:
  
    h2(#0_5_0). v0.5.0
    * remove MagickWand dependency which cause memory leak
  
  which saved it from being BROKEN by r358176:
  
    In file included from src/ngx_http_video_thumbextractor_module.c:3:
    src/ngx_http_video_thumbextractor_module_utils.c:5:10: fatal error: 'wand/magick_wand.h' file not found
    #include <wand/magick_wand.h>
  	   ^
    1 error generated.
    *** Error code 1
  
  Reported by:	antoine (via exp-run for www/tengine)

Modified:
  head/www/nginx-devel/Makefile   (contents, props changed)
  head/www/nginx/Makefile   (contents, props changed)

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Fri Nov 25 07:40:04 2016	(r427080)
+++ head/www/nginx-devel/Makefile	Fri Nov 25 07:46:56 2016	(r427081)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.11.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -754,14 +755,12 @@ NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.
 LIB_DEPENDS+= 	libavformat.so:multimedia/ffmpeg \
 		libavcodec.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
-		libswscale.so:multimedia/ffmpeg \
-		${IMAGEMAGICK_LIB_DEPENDS}
+		libswscale.so:multimedia/ffmpeg
 USES+=		jpeg
 GH_ACCOUNT+=	wandenberg:vte
 GH_PROJECT+=	nginx-video-thumbextractor-module:vte
 GH_TAGNAME+=	${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte
-CONFIGURE_ARGS+=--add-module=${WRKSRC_vte} --with-cc-opt="-I ${LOCALBASE}/include \
-		-I ${LOCALBASE}/include/ImageMagick"
+CONFIGURE_ARGS+=--add-module=${WRKSRC_vte}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_XSLT}

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Fri Nov 25 07:40:04 2016	(r427080)
+++ head/www/nginx/Makefile	Fri Nov 25 07:46:56 2016	(r427081)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -750,14 +750,12 @@ NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.
 LIB_DEPENDS+= 	libavformat.so:multimedia/ffmpeg \
 		libavcodec.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
-		libswscale.so:multimedia/ffmpeg \
-		${IMAGEMAGICK_LIB_DEPENDS}
+		libswscale.so:multimedia/ffmpeg
 USES+=		jpeg
 GH_ACCOUNT+=	wandenberg:vte
 GH_PROJECT+=	nginx-video-thumbextractor-module:vte
 GH_TAGNAME+=	${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte
-CONFIGURE_ARGS+=--add-module=${WRKSRC_vte} --with-cc-opt="-I ${LOCALBASE}/include \
-		-I ${LOCALBASE}/include/ImageMagick"
+CONFIGURE_ARGS+=--add-module=${WRKSRC_vte}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_XSLT}