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

cal at macports.org cal at macports.org
Mon Apr 23 14:19:42 PDT 2012


Revision: 92282
          https://trac.macports.org/changeset/92282
Author:   cal at macports.org
Date:     2012-04-23 14:19:42 -0700 (Mon, 23 Apr 2012)
Log Message:
-----------
nginx: Update redis module, reorder variants, always enable ipv6

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

Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile	2012-04-23 20:48:39 UTC (rev 92281)
+++ trunk/dports/www/nginx/Portfile	2012-04-23 21:19:42 UTC (rev 92282)
@@ -5,6 +5,7 @@
 
 name                nginx
 version             1.0.15
+revision            1
 categories          www mail
 platforms           darwin
 license             BSD
@@ -53,9 +54,9 @@
                     --http-client-body-temp-path=${nginx_rundir}/client_body_temp \
                     --http-proxy-temp-path=${nginx_rundir}/proxy_temp \
                     --http-fastcgi-temp-path=${nginx_rundir}/fastcgi_temp \
-                    --http-uwsgi-temp-path=${nginx_rundir}/uwsgi_temp
+                    --http-uwsgi-temp-path=${nginx_rundir}/uwsgi_temp \
+                    --with-ipv6
 
-default_variants    +ipv6
 universal_variant   no
 
 build.target        build
@@ -68,99 +69,89 @@
     file mkdir ${destroot}${prefix}/share/nginx
     file rename ${destroot}${prefix}/html ${destroot}${prefix}/share/nginx
 }
-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
-    # made :(
-    set nginx_conf_is_registered_to_nginx \
-        [expr {[registry_file_registered ${nginx_conf}] == "${name}"}]
-    set nginx_conf_differs \
-        [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 ""
-        ui_msg "###############################################################"
-        ui_msg "# It appears that you have altered ${nginx_conf}, and that"
-        ui_msg "# upgrading or uninstalling your previous installation of"
-        ui_msg "# ${name} will clobber your copy. It has been copied to"
-        ui_msg "# ${nginx_conf}.altered for preservation when you upgrade or"
-        ui_msg "# uninstall ${name}. This problem should not occur with future"
-        ui_msg "# upgrades or installations of this port."
-        ui_msg "###############################################################"
-        ui_msg ""
-    }
-}
 
-startupitem.create  yes
-startupitem.pidfile auto ${nginx_pidfile}
-startupitem.executable \
-                    ${prefix}/sbin/nginx
+startupitem.create      yes
+startupitem.pidfile     auto ${nginx_pidfile}
+startupitem.executable  ${prefix}/sbin/nginx
 
+variant addition description {Append text to pages} {
+    configure.args-append   --with-http_addition_module
+}
+
 variant dav description {Add WebDAV support to server} {
     configure.args-append   --with-http_dav_module
 }
 
+variant degradation description {Allow to return 204 or 444 code for some locations on low memory condition} {
+    configure.args-append   --with-http_degradation_module
+}
+
 variant flv description {Add FLV (Flash Video) streaming support to server} {
     configure.args-append   --with-http_flv_module
 }
 
-variant mail description {Add IMAP4/POP3 mail proxy support} {
-    configure.args-append   --with-mail
+variant geoip description {Enable Ngx http GeoIP module (http://wiki.nginx.org/HttpGeoIPModule)} {
+    configure.args-append   --with-http_geoip_module
+    depends_lib-append      port:libgeoip
 }
 
-variant ssl description {Add SSL (HTTPS) support to the server, and\
-        also to the mail proxy if that is enabled} {
-    depends_lib-append      port:openssl
-    configure.args-append   --with-http_ssl_module
-    if [variant_isset mail] {
-        configure.args-append   --with-mail_ssl_module
-    }
+variant google_perftools description {Enable Google Performance Tools profiling for workers} {
+    configure.args-append   --with-google_perftools_module
+    depends_lib-append      port:google-perftools
 }
 
-variant status description {Add /nginx_status support to the server} {
-    configure.args-append   --with-http_stub_status_module
+variant gzip_static description {Avoids compressing the same file each time it is requested} {
+    configure.args-append   --with-http_gzip_static_module
 }
 
-variant ipv6 description {Add support for ipv6} {
-    configure.args-append   --with-ipv6
+variant image_filter description {Transform images with libgd} {
+    configure.args-append   --with-http_image_filter_module
+    depends_lib-append      port:gd2
 }
 
-# This variant has been labelled "perl5" so as to allow users to easily stick
-# with perl 5.x once perl 6.x is released; a "perl6" variant will also be added
-# at that time.
-variant perl5 description {Add perl support to the server directly within\
-        nginx and call perl via SSI} {
+variant mail description {Add IMAP4/POP3 mail proxy support} {
+    configure.args-append   --with-mail
+    if {[variant_isset ssl]} {
+        configure.args-append   --with-mail_ssl_module
+    }
+}
+
+variant mp4 description {Enables mp4 streaming with seeking ability} {
+    configure.args-append   --with-http_mp4_module
+}
+
+variant perl5 description {Add perl support to the server directly within nginx and call perl via SSI} {
     depends_run-append      path:bin/perl:perl5
     configure.args-append   --with-http_perl_module \
                             --with-perl=${prefix}/bin/perl
 }
 
-variant realip description {Using nginx as a backend} {
+variant random_index description {Randomize directory indexes} {
+    configure.args-append   --with-http_random_index_module
+}
+
+variant realip description {For using nginx as backend} {
     configure.args-append   --with-http_realip_module
 }
 
-variant addition description {Append text to pages} {
-    configure.args-append   --with-http_addition_module
+variant secure_link description {Protect pages with a secret key} {
+    configure.args-append   --with-http_secure_link_module
 }
 
-variant substitution description {Replace text in pages} {
-    configure.args-append   --with-http_sub_module
+variant ssl description {Add SSL (HTTPS) support to the server, and also to the mail proxy if that is enabled} {
+    configure.args-append   --with-http_ssl_module
+    depends_lib-append      port:openssl
 }
 
-variant gzip_static description {Avoids compressing the same file each\
-        time it is requested} {
-    configure.args-append   --with-http_gzip_static_module
+variant status description {Add /nginx_status support to the server} {
+    configure.args-append   --with-http_stub_status_module
 }
 
-variant google_perftools description {Enable Google Performance Tools\
-        profiling for workers} {
-    depends_lib-append      port:google-perftools
-    configure.args-append   --with-google_perftools_module
+variant substitution description {Replace text in pages} {
+    configure.args-append   --with-http_sub_module
 }
 
-variant upload description {Enable Valery Kholodkov's upload module\
-        (http://grid.net.ru/nginx/upload.en.html)} {
+variant upload description {Enable Valery Kholodkov's upload module (http://grid.net.ru/nginx/upload.en.html)} {
     set upload_filename     nginx_upload_module
     set upload_version      2.2.0
     set upload_distname     ${upload_filename}-${upload_version}
@@ -171,6 +162,10 @@
     configure.args-append   --add-module=${workpath}/${upload_distname}
 }
 
+variant xslt description {Post-process pages with XSLT} {
+    configure.args-append   --with-http_xslt_module
+}
+
 variant zip description {Enable Ngx zip download module \
         (http://code.google.com/p/mod-zip/)} {
 
@@ -184,26 +179,15 @@
 
 variant redis description {Enable Ngx HTTP Redis module} {
     set redis_filename      ngx_http_redis
-    set redis_version       0.3.1
+    set redis_version       0.3.6
     set redis_distname      ${redis_filename}-${redis_version}
     distfiles-append        ${redis_distname}.tar.gz:redis_module
     checksums-append        ${redis_distname}.tar.gz \
-                            rmd160  2a8a7ca4b62b33558b249aa19f7d5f34f77a2801 \
-                            sha256  b66291bf7a034baf351fc4d0e57558d672bed0582fcfa9008eba4acf6b4486c4
+                            rmd160  0d1de19ce1ae8b9b7fcd9693908403e613f5391d \
+                            sha256  9e5d8c0f1317a6910710c94d27f9aca4968c48ee1de271e5034525a1e9b6c70e
     configure.args-append   --add-module=${workpath}/${redis_distname}
 }
 
-variant geoip description {Enable Ngx http GeoIP module \
-        (http://wiki.nginx.org/HttpGeoIPModule)} {
-
-    configure.args-append   --with-http_geoip_module
-    depends_lib-append      port:libgeoip
-}
-
-variant debug description {Enable debug mode} {
-    configure.args-append   --with-debug
-}
-
 livecheck.type      regex
 livecheck.url       http://trac.nginx.org/nginx/browser/nginx_org/xml/versions.xml?format=txt
 livecheck.regex     "<stable> *(\\d+(?:\\.\\d+)*)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120423/7542b08b/attachment-0001.html>


More information about the macports-changes mailing list