Date: Thu, 20 Oct 2016 23:26:53 +0000 From: "Sergey A. Osokin" <osa@FreeBSD.org> To: Cy Schubert <Cy.Schubert@komquats.com> 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: <20161020232653.GD75495@FreeBSD.org> In-Reply-To: <201610190054.u9J0smAA062884@slippy.cwsent.com> References: <osa@FreeBSD.org> <201610182310.u9INAZXc030793@repo.freebsd.org> <201610190054.u9J0smAA062884@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 18, 2016 at 05:54:48PM -0700, Cy Schubert wrote: > 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. I don't think this is an issue of this port only, it looks like this is an issue for all ports tree system, isn't it? > Can the dependency be an option (that can be specified in poudriere options)? As a workaround, probably yes, but I'm not totally sure. Please note this change is affected only "custom" builds from a ports tree because this module is disabled by default. -- Sergey A. Osokin osa@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20161020232653.GD75495>