From owner-svn-ports-all@freebsd.org Wed Oct 19 00:55:10 2016 Return-Path: Delivered-To: svn-ports-all@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 1A635C1559E; Wed, 19 Oct 2016 00:55:10 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B9DBE268; Wed, 19 Oct 2016 00:55:09 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id wf9tbLcw7Ijjwwf9ubjeVm; Tue, 18 Oct 2016 18:55:07 -0600 X-Authority-Analysis: v=2.2 cv=dtuZMBo4 c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=CH0kA5CcgfcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=VR9KRUxRMx1hLMCHjj0A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id 0BAE6ABE; Tue, 18 Oct 2016 17:55:04 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id u9J0smAA062884; Tue, 18 Oct 2016 17:54:48 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201610190054.u9J0smAA062884@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Sergey A. Osokin" cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r424223 - in head/www: nginx nginx-devel In-Reply-To: Message from "Sergey A. Osokin" of "Tue, 18 Oct 2016 23:10:35 -0000." <201610182310.u9INAZXc030793@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 18 Oct 2016 17:54:48 -0700 X-CMAE-Envelope: MS4wfD6oZfMGbQaAv3QjC8oTIuVgE/8rn4MFB/BYbayMOmemc6FLGt2qXJdjHLeDeV/zVM6mZB/GvYN3e/N+ZB6XefmjwZ65NBpd/6f6WOTnBhkEqeorXi5L EKofCDdGK4JDNBkHwq/OIl2BVKmONL9jo0J7oFR0flGXfgp/ZXS4DxMaPWE9/KalI6yd3p2UQHpzoU4U5BWGZVoRh+HWXk2UcHY2jTHGRhfchYLsu7CWNi9W /DseZhTW6EEV/JlXGRUXCOOVYZwIxUfWc7iev0pUjp7SSCbg6BqD2Vg40yEXMUJI X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2016 00:55:10 -0000 In message <201610182310.u9INAZXc030793@repo.freebsd.org>, "Sergey A. Osokin" w rites: > Author: osa > Date: Tue Oct 18 23:10:35 2016 > New Revision: 424223 > URL: https://svnweb.freebsd.org/changeset/ports/424223 > > Log: > Use ImageMagick-nox11 instead of original one as it's more > convenient for the server-based product. > > Do not bump PORTREVISION because this change affects disabled by > default third-party modules only. > > Modified: > head/www/nginx-devel/Makefile > head/www/nginx/Makefile > > Modified: head/www/nginx-devel/Makefile > ============================================================================= > = > --- head/www/nginx-devel/Makefile Tue Oct 18 23:01:42 2016 (r42422 > 2) > +++ head/www/nginx-devel/Makefile Tue Oct 18 23:10:35 2016 (r42422 > 3) > @@ -714,7 +714,7 @@ LIB_DEPENDS+= libjpeg.so:graphics/jpeg > libavcodec.so:multimedia/ffmpeg \ > libavutil.so:multimedia/ffmpeg \ > libswscale.so:multimedia/ffmpeg \ > - libMagickWand-6.so:graphics/ImageMagick > + libMagickWand-6.so:graphics/ImageMagick-nox11 > GH_ACCOUNT+= wandenberg:vte > GH_PROJECT+= nginx-video-thumbextractor-module:vte > GH_TAGNAME+= ${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte > @@ -947,8 +947,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n > > .if ${PORT_OPTIONS:MSMALL_LIGHT} > NGINX_SMALL_LIGHT_VERSION= 0.8.0 > -LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick \ > - libMagickWand-6.so:graphics/ImageMagick \ > +LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick-nox11 \ > + libMagickWand-6.so:graphics/ImageMagick-nox11 \ > libpcre.so:devel/pcre This is great if you don't already have an Imagemagick already installed but if graphics/Imagemagick is a prerequisite for other installed packages a conflict will result. Can the dependency be an option (that can be specified in poudriere options)? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.