Date: Fri, 21 Oct 2016 15:33:54 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424428 - in head: net/freeswitch www/nginx www/nginx-devel Message-ID: <201610211533.u9LFXspb045134@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Oct 21 15:33:53 2016 New Revision: 424428 URL: https://svnweb.freebsd.org/changeset/ports/424428 Log: Fix the three ports not handling the ImageMagick-nox11 dependency correctly. Sponsored by: Absolight Modified: head/net/freeswitch/Makefile (contents, props changed) head/www/nginx-devel/Makefile (contents, props changed) head/www/nginx/Makefile (contents, props changed) Modified: head/net/freeswitch/Makefile ============================================================================== --- head/net/freeswitch/Makefile Fri Oct 21 15:21:13 2016 (r424427) +++ head/net/freeswitch/Makefile Fri Oct 21 15:33:53 2016 (r424428) @@ -3,7 +3,7 @@ PORTNAME= freeswitch PORTVERSION= 1.6.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds @@ -33,6 +33,7 @@ USES= gmake jpeg pkgconfig lua perl5 li USE_LDCONFIG= yes ALL_MODULES_DESC= Build all modules +X11_DESC= graphics/ImageMagick[-nox11] dependency 8K_DESC= 8kHz Audio Files 16K_DESC= 16kHz Audio Files 32K_DESC= 32kHz Audio Files @@ -41,7 +42,7 @@ ENGLISH_DESC= US English Language Sounds FRENCH_DESC= French Canadian Language Sounds RUSSIAN_DESC= Russian Language Sounds -OPTIONS_DEFINE= ALL_MODULES +OPTIONS_DEFINE= ALL_MODULES X11 OPTIONS_MULTI= BITRATE LANGUAGE OPTIONS_MULTI_BITRATE= 8K 16K 32K 48K OPTIONS_MULTI_LANGUAGE= ENGLISH FRENCH RUSSIAN @@ -85,10 +86,14 @@ LIB_DEPENDS+= libavformat.so:multimedia/ libmp3lame.so:audio/lame \ libnetsnmp.so:net-mgmt/net-snmp \ libvlc.so:multimedia/vlc \ - libyaml.so:textproc/libyaml \ - libMagickWand-6.so:graphics/ImageMagick-nox11 + libyaml.so:textproc/libyaml USE_OPENLDAP= yes USE_OPENSSL= yes +.if ${PORT_OPTIONS:MX11} +LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick +.else +LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick-nox11 +.endif .endif EDPRE= freeswitch-sounds Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Fri Oct 21 15:21:13 2016 (r424427) +++ head/www/nginx-devel/Makefile Fri Oct 21 15:33:53 2016 (r424428) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.11.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -121,6 +122,7 @@ OPTIONS_DEFINE= \ SRCACHE \ STATSD \ UDPLOG \ + X11 \ XRID_HEADER \ XSS @@ -228,6 +230,7 @@ SMALL_LIGHT_DESC= 3rd party small_light SRCACHE_DESC= 3rd party srcache module STATSD_DESC= 3rd party statsd module UDPLOG_DESC= 3rd party udplog (syslog) module +X11_DESC= graphics/ImageMagick[-nox11] dependency XRID_HEADER_DESC= 3rd party x-rid header module XSS_DESC= 3rd party xss module VIDEO_DESC= Video module support @@ -236,6 +239,12 @@ WANT_GNOME= yes .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MX11} +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +.else +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 +.endif + .if ${PORT_OPTIONS:MPASSENGER} CATEGORIES+= ruby USE_RUBY= yes @@ -714,7 +723,7 @@ LIB_DEPENDS+= libjpeg.so:graphics/jpeg libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ - libMagickWand-6.so:graphics/ImageMagick-nox11 + ${IMAGEMAGICK_LIB_DEPENDS} GH_ACCOUNT+= wandenberg:vte GH_PROJECT+= nginx-video-thumbextractor-module:vte GH_TAGNAME+= ${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte @@ -947,8 +956,7 @@ 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-nox11 \ - libMagickWand-6.so:graphics/ImageMagick-nox11 \ +LIB_DEPENDS+= ${IMAGEMAGICK_LIB_DEPENDS} \ libpcre.so:devel/pcre GH_ACCOUNT+= cubicdaiya:small_light GH_PROJECT+= ngx_small_light:small_light Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Oct 21 15:21:13 2016 (r424427) +++ head/www/nginx/Makefile Fri Oct 21 15:33:53 2016 (r424428) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.10.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -121,6 +122,7 @@ OPTIONS_DEFINE= \ SRCACHE \ STATSD \ UDPLOG \ + X11 \ XRID_HEADER \ XSS @@ -228,6 +230,7 @@ SMALL_LIGHT_DESC= 3rd party small_light SRCACHE_DESC= 3rd party srcache module STATSD_DESC= 3rd party statsd module UDPLOG_DESC= 3rd party udplog (syslog) module +X11_DESC= graphics/ImageMagick[-nox11] dependency XRID_HEADER_DESC= 3rd party x-rid header module XSS_DESC= 3rd party xss module VIDEO_DESC= Video module support @@ -236,6 +239,12 @@ WANT_GNOME= yes .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MX11} +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +.else +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 +.endif + .if ${PORT_OPTIONS:MPASSENGER} CATEGORIES+= ruby USE_RUBY= yes @@ -710,7 +719,7 @@ LIB_DEPENDS+= libjpeg.so:graphics/jpeg libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ - libMagickWand-6.so:graphics/ImageMagick-nox11 + ${IMAGEMAGICK_LIB_DEPENDS} GH_ACCOUNT+= wandenberg:vte GH_PROJECT+= nginx-video-thumbextractor-module:vte GH_TAGNAME+= ${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte @@ -942,8 +951,7 @@ 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-nox11 \ - libMagickWand-6.so:graphics/ImageMagick-nox11 \ +LIB_DEPENDS+= ${IMAGEMAGICK_LIB_DEPENDS} \ libpcre.so:devel/pcre GH_ACCOUNT+= cubicdaiya:small_light GH_PROJECT+= ngx_small_light:small_light
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610211533.u9LFXspb045134>