Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Dec 2016 15:52:40 +0000 (UTC)
From:      Bartek Rutkowski <robak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427624 - head/www/nginx-devel
Message-ID:  <201612031552.uB3FqeaY078464@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612031552.uB3FqeaY078464>