1 files changed, 6 insertions, 7 deletions

diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index 7182b1af0a78..740189d46751 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -3,22 +3,21 @@ etc/nginx/fastcgi_params
 etc/nginx/koi-utf
 etc/nginx/koi-win
 etc/nginx/win-utf
-@unexec if cmp -s %D/etc/nginx/mime.types %D/etc/nginx/mime.types-dist; then rm -f %D/etc/nginx/mime.types; fi
+@unexec if cmp -s %D/etc/nginx/mime.types-dist %D/etc/nginx/mime.types; then rm -f %D/etc/nginx/mime.types; fi
 etc/nginx/mime.types-dist
-@exec [ -f %D/mime.types ] || cp %D/%f %D/mime.types
-@unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi
+@exec if [ ! -f %D/etc/nginx/mime.types ] ; then cp -p %D/%F %B/mime.types; fi
+@unexec if cmp -s %D/etc/nginx/nginx.conf-dist %D/etc/nginx/nginx.conf; then rm -f %D/etc/nginx/nginx.conf; fi
 etc/nginx/nginx.conf-dist
-@exec [ -f %D/nginx.conf ] || cp %D/%f %D/nginx.conf
+@exec if [ ! -f %D/etc/nginx/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi
 @dirrmtry etc/nginx
 %%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
-@comment @unexec chmod u+w www/nginx-dist
+%%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi
 %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-%%WWWDATA%%@exec [ -d %D/www/nginx/ ] || ln -fs %D %D/www/nginx
 %%WWWDATA%%www/nginx-dist/index.html
 %%WWWDATA%%www/nginx-dist/50x.html
 %%WWWDATA%%@exec chmod a-w www/nginx-dist
 %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
-%%WWWDATA%%@dirrm www/nginx-dist
+%%WWWDATA%%@dirrmtry www/nginx-dist
 sbin/nginx
 @exec [ -d %%NGINX_TMPDIR%% ] || mkdir -p %%NGINX_TMPDIR%%
 @exec chown %%WWWOWN%%:%%WWWGRP%% %%NGINX_TMPDIR%%