diff options
| author | osa <osa@FreeBSD.org> | 2007-06-15 16:28:20 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2007-06-15 16:28:20 +0800 |
| commit | e3773ba08c98652621f3fb78e564523bdeab3ad8 (patch) | |
| tree | eff4bdc404770f0e03a5818f8299cab8e5600c4e /www | |
| parent | d5afac8597afc8f4ed802325989123b225166bcb (diff) | |
| download | freebsd-ports-gnome-e3773ba08c98652621f3fb78e564523bdeab3ad8.tar.gz freebsd-ports-gnome-e3773ba08c98652621f3fb78e564523bdeab3ad8.tar.zst freebsd-ports-gnome-e3773ba08c98652621f3fb78e564523bdeab3ad8.zip | |
Resolve conflict with nginx stable.
Bump PORTREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx/Makefile | 3 |
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 \ |