Ticket #39773: patch-nginx-Portfile.upload--sans-upload_progress-fiddling.diff
File patch-nginx-Portfile.upload--sans-upload_progress-fiddling.diff, 3.0 KB (added by anthropologoi@…, 11 years ago) |
---|
-
Portfile
old new 5 5 6 6 name nginx 7 7 version 1.4.1 8 revision 18 revision 5 9 9 categories www mail 10 10 platforms darwin 11 11 license BSD … … 45 45 set nginx_pidfile ${nginx_rundir}/${name}.pid 46 46 set nginx_all_confs {fastcgi.conf fastcgi_params mime.types nginx.conf scgi_params uwsgi_params} 47 47 48 # portfile-scoped vars for variant routines to re-def and use in port-stages (post-extract, pre-patch, etc) 49 set nginx_upload_mod_dirname "" 50 51 52 # for aforementioned re-defs of portfile-scoped vars in variant routines 53 proc nginx_set_portfile_var {var_name new_value} { 54 upvar $var_name portfile_var 55 set portfile_var $new_value 56 } 57 58 59 48 60 configure.args-append \ 49 61 --with-cc-opt=\"${configure.cppflags} ${configure.cflags}\" \ 50 62 --with-ld-opt=\"${configure.ldflags}\" \ … … 60 72 --with-ipv6 61 73 62 74 # remove --disable-dependency-tracking 63 configure.universal_args 75 configure.universal_args-delete --disable-dependency-tracking 64 76 65 77 build.target build 66 78 destroot.keepdirs ${destroot}${nginx_logdir} \ … … 77 89 file rename ${destroot}${prefix}/html ${destroot}${prefix}/share/nginx 78 90 } 79 91 92 80 93 startupitem.create yes 81 94 startupitem.pidfile auto ${nginx_pidfile} 82 95 startupitem.executable ${prefix}/sbin/nginx 83 96 97 84 98 notes \ 85 99 "A sample nginx configuration file has been installed in 86 100 ${nginx_confdir}/nginx.conf.default.\nCopy the configuration to 87 101 ${nginx_confdir}/nginx.conf\nand adjust it to your needs before starting\ 88 102 nginx." 89 103 104 105 90 106 variant addition description {Append text to pages} { 91 107 configure.args-append --with-http_addition_module 92 108 } … … 177 193 rmd160 5734af837be3fe8ec444a7e5e7f6707118594098 \ 178 194 sha256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 179 195 configure.args-append --add-module=${workpath}/${upload_distname} 196 197 # v2.2.0 release references members of ngx_http_request_body_t that were renamed in later nginx versions. 198 # Patch nginx_upload_module.c with fixed version from https://github.com/TimothyKlim/nginx-upload-module. 199 patchfiles-append patch-nginx_upload_module.tmp-ngx_http_upload_module.c.diff 200 201 202 nginx_set_portfile_var nginx_upload_mod_dirname "${upload_distname}" 203 204 # patch routine balks on file names with "../", but rel-paths in patchfiles start from $worksrcpath 205 pre-patch { 206 ln -s "${workpath}/${nginx_upload_mod_dirname}" "${worksrcpath}/nginx_upload_module.tmp" 207 } 208 post-patch { 209 file delete "${worksrcpath}/nginx_upload_module.tmp" 210 } 180 211 } 181 212 182 213 variant upload_progress description {Enable Brice Figureau's upload progress module (https://github.com/masterzen/nginx-upload-progress-module)} {