From owner-svn-ports-all@freebsd.org Sat Dec 3 15:52:41 2016 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 B8907C64F75; Sat, 3 Dec 2016 15:52:41 +0000 (UTC) (envelope-from robak@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 873F9C1A; Sat, 3 Dec 2016 15:52:41 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB3FqeDV078465; Sat, 3 Dec 2016 15:52:40 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB3FqeaY078464; Sat, 3 Dec 2016 15:52:40 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201612031552.uB3FqeaY078464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Sat, 3 Dec 2016 15:52:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427624 - head/www/nginx-devel X-SVN-Group: ports-head 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: Sat, 03 Dec 2016 15:52:41 -0000 Author: robak Date: Sat Dec 3 15:52:40 2016 New Revision: 427624 URL: https://svnweb.freebsd.org/changeset/ports/427624 Log: www/nginx-devel: make the port slave friendly and update CONFLICTS Approved by: osa Modified: head/www/nginx-devel/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sat Dec 3 15:48:13 2016 (r427623) +++ head/www/nginx-devel/Makefile Sat Dec 3 15:52:40 2016 (r427624) @@ -7,11 +7,11 @@ PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa -PKGNAMESUFFIX= -devel +PKGNAMESUFFIX?= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= osa@FreeBSD.org -COMMENT= Robust and small WWW server +MAINTAINER?= osa@FreeBSD.org +COMMENT?= Robust and small WWW server LICENSE= BSD2CLAUSE @@ -128,7 +128,7 @@ OPTIONS_DEFINE= \ XRID_HEADER \ XSS -OPTIONS_DEFAULT=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ +OPTIONS_DEFAULT?=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \ HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \ HTTP_SLICE HTTP_REWRITE HTTP_SSL HTTP_STATUS HTTP_SUB \ @@ -265,7 +265,10 @@ HTTP_PORT?= 80 NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log -CONFLICTS?= nginx-1.* +CONFLICTS?= nginx-1.* \ + nginx-full-1.* \ + nginx-lite-1.* \ + nginx-naxsi-1.* USE_RC_SUBR= nginx SUB_FILES= pkg-message SUB_LIST+= WWWOWN=${WWWOWN} \