[85365] trunk/dports/www/nginx/Portfile

[jmr at macports.org]

Revision: 85365
          http://trac.macports.org/changeset/85365
Author:   jmr at macports.org
Date:     2011-10-12 20:08:45 -0700 (Wed, 12 Oct 2011)
Log Message:
-----------
nginx: move conf file preservation to pre-activate

Modified Paths:
--------------
    trunk/dports/www/nginx/Portfile

Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile	2011-10-13 03:05:02 UTC (rev 85364)
+++ trunk/dports/www/nginx/Portfile	2011-10-13 03:08:45 UTC (rev 85365)
@@ -65,9 +65,11 @@
 destroot.keepdirs   ${destroot}${nginx_logdir} \
                     ${destroot}${nginx_rundir}
 
+set nginx_conf ${prefix}/etc/${name}/${name}.conf
 post-destroot {
-    set nginx_conf ${prefix}/etc/${name}/${name}.conf
     delete ${destroot}${nginx_conf}
+}
+pre-activate {
     # Try to cover for the fact that, in earlier revisions of this port, the
     # configuration file was installed live instead of an example, in which
     # case an upgrade will clobber any customisations that a user might have
@@ -75,7 +77,7 @@
     set nginx_conf_is_registered_to_nginx \
         [expr {[registry_file_registered ${nginx_conf}] == "${name}"}]
     set nginx_conf_differs \
-        [catch {exec cmp ${nginx_conf} ${destroot}${nginx_conf}.example}]
+        [catch {exec cmp ${nginx_conf} ${nginx_conf}.example}]
     if { ${nginx_conf_is_registered_to_nginx} && ${nginx_conf_differs} } {
         copy ${nginx_conf} ${nginx_conf}.altered
         ui_msg ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111012/ef280acf/attachment-0001.html>