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

[jmr at macports.org]

Revision: 85364
          http://trac.macports.org/changeset/85364
Author:   jmr at macports.org
Date:     2011-10-12 20:05:02 -0700 (Wed, 12 Oct 2011)
Log Message:
-----------
nginx: don't register nginx.conf to the port, as was previously fixed but broken again in r40461 (#27354), and use registry api rather than running another instance of port

Revision Links:
--------------
    http://trac.macports.org/changeset/40461

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

Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile	2011-10-13 02:21:01 UTC (rev 85363)
+++ trunk/dports/www/nginx/Portfile	2011-10-13 03:05:02 UTC (rev 85364)
@@ -67,15 +67,15 @@
 
 post-destroot {
     set nginx_conf ${prefix}/etc/${name}/${name}.conf
+    delete ${destroot}${nginx_conf}
     # 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
     # made :(
-    catch "exec port provides ${nginx_conf}" provides_output
     set nginx_conf_is_registered_to_nginx \
-        [regexp "${nginx_conf} is provided by: ${name}" ${provides_output}]
+        [expr {[registry_file_registered ${nginx_conf}] == "${name}"}]
     set nginx_conf_differs \
-        [catch {exec cmp ${nginx_conf} ${worksrcpath}/conf/${name}.conf}]
+        [catch {exec cmp ${nginx_conf} ${destroot}${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/5716e983/attachment.html>