diff options
| author | osa <osa@FreeBSD.org> | 2012-06-14 16:12:29 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2012-06-14 16:12:29 +0800 |
| commit | 4933ba89bfd69b2d1a3f7a6e5c761089bb8591b4 (patch) | |
| tree | a9fceccb178c60ddf90761e40679dca0aed1d848 /www | |
| parent | 19a9c20353190d019be6eabc717e7c7ba91c6965 (diff) | |
| download | freebsd-ports-gnome-4933ba89bfd69b2d1a3f7a6e5c761089bb8591b4.tar.gz freebsd-ports-gnome-4933ba89bfd69b2d1a3f7a6e5c761089bb8591b4.tar.zst freebsd-ports-gnome-4933ba89bfd69b2d1a3f7a6e5c761089bb8591b4.zip | |
Create temporary directory with install(1).
Remove duplicate code from Makefile and pkg-plist.
Bump PORTREVISION.
Requested by: dougb
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx-devel/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx-devel/files/nginx.sh.in | 3 | ||||
| -rw-r--r-- | www/nginx-devel/pkg-plist | 2 | ||||
| -rw-r--r-- | www/nginx/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx/files/nginx.sh.in | 3 | ||||
| -rw-r--r-- | www/nginx/pkg-plist | 2 |
6 files changed, 6 insertions, 14 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 4cf46f680a99..5b9f33bc87e5 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= nginx PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -916,8 +916,7 @@ do-build: @cd ${WRKSRC} && ${MAKE} do-install: - ${MKDIR} ${ETCDIR} ${NGINX_TMPDIR} - ${CHOWN} ${WWWOWN}:${WWWGRP} ${NGINX_TMPDIR} + ${MKDIR} ${ETCDIR} ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin .for i in koi-utf koi-win win-utf ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${ETCDIR} diff --git a/www/nginx-devel/files/nginx.sh.in b/www/nginx-devel/files/nginx.sh.in index 1fdec800414a..eb77986fb65c 100644 --- a/www/nginx-devel/files/nginx.sh.in +++ b/www/nginx-devel/files/nginx.sh.in @@ -82,8 +82,7 @@ fi nginx_checktmpdir() { if [ ! -d ${_tmpprefix} ] ; then - mkdir -p ${_tmpprefix} - chown %%WWWOWN%%:%%WWWGRP%% ${_tmpprefix} + install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 ${_tmpprefix} fi } diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index 7a85efd5c1e4..484e1c1b3305 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -27,6 +27,4 @@ %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi %%WWWDATA%%@dirrmtry www/nginx-dist sbin/nginx -@exec [ -d %%NGINX_TMPDIR%% ] || mkdir -p %%NGINX_TMPDIR%% -@exec chown %%WWWOWN%%:%%WWWGRP%% %%NGINX_TMPDIR%% @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi diff --git a/www/nginx/Makefile b/www/nginx/Makefile index a47c0951283d..1c2de00e6054 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -7,7 +7,7 @@ PORTNAME= nginx PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -914,8 +914,7 @@ do-build: @cd ${WRKSRC} && ${MAKE} do-install: - ${MKDIR} ${ETCDIR} ${NGINX_TMPDIR} - ${CHOWN} ${WWWOWN}:${WWWGRP} ${NGINX_TMPDIR} + ${MKDIR} ${ETCDIR} ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin .for i in koi-utf koi-win win-utf ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${ETCDIR} diff --git a/www/nginx/files/nginx.sh.in b/www/nginx/files/nginx.sh.in index 1fdec800414a..eb77986fb65c 100644 --- a/www/nginx/files/nginx.sh.in +++ b/www/nginx/files/nginx.sh.in @@ -82,8 +82,7 @@ fi nginx_checktmpdir() { if [ ! -d ${_tmpprefix} ] ; then - mkdir -p ${_tmpprefix} - chown %%WWWOWN%%:%%WWWGRP%% ${_tmpprefix} + install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 ${_tmpprefix} fi } diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index 7a85efd5c1e4..484e1c1b3305 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -27,6 +27,4 @@ %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi %%WWWDATA%%@dirrmtry www/nginx-dist sbin/nginx -@exec [ -d %%NGINX_TMPDIR%% ] || mkdir -p %%NGINX_TMPDIR%% -@exec chown %%WWWOWN%%:%%WWWGRP%% %%NGINX_TMPDIR%% @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi |