Date: Sun, 16 Jul 2017 14:44:15 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446008 - head/www/nginx Message-ID: <201707161444.v6GEiF7Y098057@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Sun Jul 16 14:44:15 2017 New Revision: 446008 URL: https://svnweb.freebsd.org/changeset/ports/446008 Log: - Pet portlint - Add CONFLICTD - Also set portscout limit to avoid notices about www/nginx-devel - Bump PORTREVISION Approved by: miwi (mentor) Differential Revision: https://reviews.freebsd.org/D11605 Modified: head/www/nginx/Makefile Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Jul 16 14:38:54 2017 (r446007) +++ head/www/nginx/Makefile Sun Jul 16 14:44:15 2017 (r446008) @@ -14,6 +14,10 @@ COMMENT?= Robust and small WWW server LICENSE= BSD2CLAUSE +CONFLICTS_INSTALL= nginx-devel + +PORTSCOUT= limit:^1\.12\.[0-9]* + USES+= cpe CPE_VENDOR= nginx @@ -239,9 +243,9 @@ WANT_GNOME= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick .else -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 .endif .if ${PORT_OPTIONS:MPASSENGER} @@ -465,11 +469,11 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_echo_ .endif .if ${PORT_OPTIONS:MFASTDFS} -NGINX_FASTDFS_VERSION= 5a8110f -GH_ACCOUNT+= happyfish100:fastdfs -GH_PROJECT+= fastdfs-nginx-module:fastdfs -GH_TAGNAME+= ${NGINX_FASTDFS_VERSION}:fastdfs -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config +NGINX_FASTDFS_VERSION= 5a8110f +GH_ACCOUNT+= happyfish100:fastdfs +GH_PROJECT+= fastdfs-nginx-module:fastdfs +GH_TAGNAME+= ${NGINX_FASTDFS_VERSION}:fastdfs +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \ ${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707161444.v6GEiF7Y098057>