From owner-svn-ports-all@freebsd.org Sun Jul 16 14:44:16 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1F15C08AC3; Sun, 16 Jul 2017 14:44:16 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69D4E7FD98; Sun, 16 Jul 2017 14:44:16 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6GEiF3k098058; Sun, 16 Jul 2017 14:44:15 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6GEiF7Y098057; Sun, 16 Jul 2017 14:44:15 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201707161444.v6GEiF7Y098057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Sun, 16 Jul 2017 14:44:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446008 - head/www/nginx X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/www/nginx X-SVN-Commit-Revision: 446008 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jul 2017 14:44:16 -0000 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 .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 \