From owner-svn-ports-head@freebsd.org Fri Nov 25 07:46:57 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DB28C544A6; Fri, 25 Nov 2016 07:46:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 596371366; Fri, 25 Nov 2016 07:46:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAP7kuf9095711; Fri, 25 Nov 2016 07:46:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAP7kuHA095709; Fri, 25 Nov 2016 07:46:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611250746.uAP7kuHA095709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 25 Nov 2016 07:46:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427081 - in head/www: nginx nginx-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2016 07:46:57 -0000 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 ^ 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}