Date: Tue, 18 Oct 2016 17:54:48 -0700 From: Cy Schubert <Cy.Schubert@komquats.com> To: "Sergey A. Osokin" <osa@FreeBSD.org> 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 Message-ID: <201610190054.u9J0smAA062884@slippy.cwsent.com> In-Reply-To: Message from "Sergey A. Osokin" <osa@FreeBSD.org> of "Tue, 18 Oct 2016 23:10:35 -0000." <201610182310.u9INAZXc030793@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610190054.u9J0smAA062884>