summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/nginx/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 722359ce12e2..6af874e6a5a8 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nginx
PORTVERSION= 0.5.25
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://sysoev.ru/nginx/
MASTER_SITES+= ${MASTER_SITE_LOCAL}
@@ -26,6 +26,7 @@ HTTP_PORT?= 80
USE_PERL5= yes
.endif
+CONFLICTS?= nginx-devel-0.*
USE_RC_SUBR= nginx.sh
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--prefix=${PREFIX}/etc/nginx \