Date: Fri, 25 Nov 2016 06:44:26 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427079 - in head/www: nginx nginx-devel Message-ID: <201611250644.uAP6iQHN070978@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Nov 25 06:44:26 2016 New Revision: 427079 URL: https://svnweb.freebsd.org/changeset/ports/427079 Log: www/nginx: apply r390310 =======================<phase: lib-depends >============================ ===> nginx-1.10.2_1,2 depends on shared library: libjpeg.so - not found ===> Installing existing package /packages/All/jpeg-8_6.txz Installing jpeg-8_6... Extracting jpeg-8_6: .......... done ===> nginx-1.10.2_1,2 depends on shared library: libjpeg.so - found (/usr/local/lib/libjpeg.so) ===> Returning to build of nginx-1.10.2_1,2 ===> nginx-1.10.2_1,2 depends on shared library: libavformat.so - not found ===> Installing existing package /packages/All/ffmpeg-3.2,1.txz Installing ffmpeg-3.2,1... `-- Installing libv4l-1.6.3_2... | `-- Installing jpeg-turbo-1.5.1... pkg-static: jpeg-turbo-1.5.1 conflicts with jpeg-8_6 (installs files into the same place). Problematic file: /usr/local/bin/cjpeg Failed to install the following 1 package(s): /packages/All/ffmpeg-3.2,1.txz *** Error code 70 PR: 207547 Reported by: antoine (via exp-run) Approved by: portmgr blanket 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 06:13:00 2016 (r427078) +++ head/www/nginx-devel/Makefile Fri Nov 25 06:44:26 2016 (r427079) @@ -751,12 +751,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR} NGINX_VIDEO_THUMBEXTRACTOR_VERSION= 0.7.0 -LIB_DEPENDS+= libjpeg.so:graphics/jpeg \ - libavformat.so:multimedia/ffmpeg \ +LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg \ libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ ${IMAGEMAGICK_LIB_DEPENDS} +USES+= jpeg GH_ACCOUNT+= wandenberg:vte GH_PROJECT+= nginx-video-thumbextractor-module:vte GH_TAGNAME+= ${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Nov 25 06:13:00 2016 (r427078) +++ head/www/nginx/Makefile Fri Nov 25 06:44:26 2016 (r427079) @@ -747,12 +747,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR} NGINX_VIDEO_THUMBEXTRACTOR_VERSION= 0.7.0 -LIB_DEPENDS+= libjpeg.so:graphics/jpeg \ - libavformat.so:multimedia/ffmpeg \ +LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg \ libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ ${IMAGEMAGICK_LIB_DEPENDS} +USES+= jpeg GH_ACCOUNT+= wandenberg:vte GH_PROJECT+= nginx-video-thumbextractor-module:vte GH_TAGNAME+= ${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611250644.uAP6iQHN070978>