diff options
| -rw-r--r-- | www/nginx-devel/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 4 | ||||
| -rw-r--r-- | www/nginx-devel/pkg-plist | 3 | ||||
| -rw-r--r-- | www/nginx/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx/distinfo | 4 | ||||
| -rw-r--r-- | www/nginx/pkg-plist | 3 |
6 files changed, 16 insertions, 8 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0a63f458486f..e9451bbe3f87 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 0.1.16 +PORTVERSION= 0.1.18 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ @@ -22,7 +22,6 @@ HTTP_PORT?= 80 USE_REINPLACE= yes USE_RC_SUBR= yes HAS_CONFIGURE= yes -CONFIGURE_ENV+= LINK="${CC}" CONFIGURE_ARGS= --prefix=${PREFIX}/etc/nginx \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ @@ -62,6 +61,8 @@ PLIST_SUB+= START_AFTER_INSTALL="" PLIST_SUB+= START_AFTER_INSTALL="@comment " .endif +PLIST_SUB+= TMPDIR=${TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} + RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} post-extract: diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 05df33863ff2..28505b876d91 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (nginx-0.1.16.tar.gz) = 85b7ec5c886c155f29aa95d4604d6cfa -SIZE (nginx-0.1.16.tar.gz) = 265966 +MD5 (nginx-0.1.18.tar.gz) = 140af056e5ae8a7614c4448ceef962f7 +SIZE (nginx-0.1.18.tar.gz) = 276116 diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index fee21d4fa0a1..ace48038cb95 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -18,4 +18,7 @@ etc/nginx/nginx.conf-dist %%STOP_BEFORE_REMOVE%%@unexec %D/etc/rc.d/nginx.sh stop || true sbin/nginx etc/rc.d/nginx.sh +@exec [ -d %%TMPDIR%% ] || mkdir -p %%TMPDIR%% +@exec chown %%WWWOWN%%:%%WWWGRP%% %%TMPDIR%% +@unexec rm -fr %%TMPDIR%% %%START_AFTER_INSTALL%%@exec %D/etc/rc.d/nginx.sh start diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 0a63f458486f..e9451bbe3f87 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 0.1.16 +PORTVERSION= 0.1.18 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ @@ -22,7 +22,6 @@ HTTP_PORT?= 80 USE_REINPLACE= yes USE_RC_SUBR= yes HAS_CONFIGURE= yes -CONFIGURE_ENV+= LINK="${CC}" CONFIGURE_ARGS= --prefix=${PREFIX}/etc/nginx \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ @@ -62,6 +61,8 @@ PLIST_SUB+= START_AFTER_INSTALL="" PLIST_SUB+= START_AFTER_INSTALL="@comment " .endif +PLIST_SUB+= TMPDIR=${TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} + RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} post-extract: diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 05df33863ff2..28505b876d91 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,2 +1,2 @@ -MD5 (nginx-0.1.16.tar.gz) = 85b7ec5c886c155f29aa95d4604d6cfa -SIZE (nginx-0.1.16.tar.gz) = 265966 +MD5 (nginx-0.1.18.tar.gz) = 140af056e5ae8a7614c4448ceef962f7 +SIZE (nginx-0.1.18.tar.gz) = 276116 diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index fee21d4fa0a1..ace48038cb95 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -18,4 +18,7 @@ etc/nginx/nginx.conf-dist %%STOP_BEFORE_REMOVE%%@unexec %D/etc/rc.d/nginx.sh stop || true sbin/nginx etc/rc.d/nginx.sh +@exec [ -d %%TMPDIR%% ] || mkdir -p %%TMPDIR%% +@exec chown %%WWWOWN%%:%%WWWGRP%% %%TMPDIR%% +@unexec rm -fr %%TMPDIR%% %%START_AFTER_INSTALL%%@exec %D/etc/rc.d/nginx.sh start |