Changeset 40461 for trunk/dports
- Timestamp:
- Oct 2, 2008, 5:19:43 PM (16 years ago)
- Location:
- trunk/dports/www/nginx
- Files:
-
- 3 edited
-
Portfile (modified) (3 diffs)
-
files/patch-auto__install.diff (modified) (2 diffs)
-
files/patch-conf__nginx.conf.diff (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dports/www/nginx/Portfile
r32369 r40461 4 4 5 5 name nginx 6 version 0. 5.346 version 0.6.32 7 7 categories www mail 8 8 platforms darwin … … 20 20 homepage http://nginx.net/ 21 21 master_sites http://sysoev.ru/nginx 22 checksums md5 8f7d3efcd7caaf1f06e4d95dfaeac238\23 sha1 f76f6cb1ac0a316f20958bf7dc6a03723fb58edf\24 rmd160 a057651eb9065b1e491ce38c73bc9e4897c982c722 checksums md5 c09a2ace3c91f45dabbb608b11e48ed1 \ 23 sha1 346166171477c3e78759bdbbc8461107d8475269 \ 24 rmd160 06749c5bf834a3f7e82ad3122a5db457c193d117 25 25 26 26 depends_lib port:pcre port:zlib 27 27 28 28 patchfiles patch-auto__install.diff patch-conf__nginx.conf.diff 29 post-patch {30 reinplace "s|__DESTROOT__|${destroot}|g" \31 ${worksrcpath}/auto/install32 }33 29 34 30 set pidfile ${prefix}/var/run/${name}.pid … … 51 47 post-destroot { 52 48 set nginx_conf ${prefix}/etc/${name}/${name}.conf 53 move ${destroot}${nginx_conf} ${destroot}${nginx_conf}.example54 49 # Try to cover for the fact that, in earlier revisions of this port, the 55 50 # configuration file was installed live instead of an example, in which case an -
trunk/dports/www/nginx/files/patch-auto__install.diff
r32148 r40461 1 --- auto/install 200 6-08-30 10:39:17.000000000 +00002 +++ auto/install.new 200 7-12-15 02:29:00.000000000 +00001 --- auto/install 2008-07-07 20:25:08.000000000 +1000 2 +++ auto/install.new 2008-09-28 23:13:21.000000000 +1000 3 3 @@ -7,7 +7,7 @@ 4 4 cat << END >> $NGX_MAKEFILE … … 10 10 11 11 NGX_INSTALL_PERL_MODULES=install_perl_modules 12 @@ -19,42 +19,44 @@ 12 @@ -35,18 +35,11 @@ 13 cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX' 14 cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX' 13 15 14 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}\15 $NGX_INSTALL_PERL_MODULES 16 - test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'17 + test -d '__DESTROOT__$NGX_PREFIX' || mkdir -p '__DESTROOT__$NGX_PREFIX'16 - test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \ 17 - || cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX' 18 - cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default' 19 + cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.example' 18 20 19 - test -d '`dirname "$NGX_SBIN_PATH"`' \ 20 - || mkdir -p '`dirname "$NGX_SBIN_PATH"`' 21 - test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old' 22 - cp $NGX_OBJS/nginx '$NGX_SBIN_PATH' 23 + test -d '`dirname "__DESTROOT__$NGX_SBIN_PATH"`' \ 24 + || mkdir -p '`dirname "__DESTROOT__$NGX_SBIN_PATH"`' 25 + test ! -f '__DESTROOT__$NGX_SBIN_PATH' || mv '__DESTROOT__$NGX_SBIN_PATH' '__DESTROOT__$NGX_SBIN_PATH.old' 26 + cp $NGX_OBJS/nginx '__DESTROOT__$NGX_SBIN_PATH' 21 - test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \ 22 - || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX' 23 - cp conf/fastcgi_params \ 24 - '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' 25 + cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.example' 27 26 28 - test - d '`dirname "$NGX_CONF_PATH"`' \29 - || mkdir -p '`dirname "$NGX_CONF_PATH"`'30 + test -d '`dirname "__DESTROOT__$NGX_CONF_PATH"`' \ 31 + || mkdir -p '`dirname "__DESTROOT__$NGX_CONF_PATH"`'27 - test -f '\$(DESTDIR)$NGX_CONF_PATH' \ 28 - || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX' 29 - cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' 30 + cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.example' 32 31 33 - cp conf/koi-win '`dirname "$NGX_CONF_PATH"`' 34 - cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`' 35 - cp conf/win-utf '`dirname "$NGX_CONF_PATH"`' 36 + cp conf/koi-win '`dirname "__DESTROOT__$NGX_CONF_PATH"`' 37 + cp conf/koi-utf '`dirname "__DESTROOT__$NGX_CONF_PATH"`' 38 + cp conf/win-utf '`dirname "__DESTROOT__$NGX_CONF_PATH"`' 32 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \ 33 || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' 34 @@ -54,8 +47,9 @@ 35 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \ 36 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' 39 37 40 - test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \ 41 - cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types' 42 - cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default' 43 + test -f '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types' || \ 44 + cp conf/mime.types '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types' 45 + cp conf/mime.types '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types.default' 46 47 - test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH' 48 - cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default' 49 + test -f '__DESTROOT__$NGX_CONF_PATH' || cp conf/nginx.conf '__DESTROOT__$NGX_CONF_PATH' 50 + cp conf/nginx.conf '`dirname "__DESTROOT__$NGX_CONF_PATH"`/nginx.conf.default' 51 52 - test -d '`dirname "$NGX_PID_PATH"`' \ 53 - || mkdir -p '`dirname "$NGX_PID_PATH"`' 54 + test -d '`dirname "__DESTROOT__$NGX_PID_PATH"`' \ 55 + || mkdir -p '`dirname "__DESTROOT__$NGX_PID_PATH"`' 56 57 - test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \ 58 - mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`' 59 + test -d '`dirname "__DESTROOT__$NGX_HTTP_LOG_PATH"`' || \ 60 + mkdir -p '`dirname "__DESTROOT__$NGX_HTTP_LOG_PATH"`' 61 62 - test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX' 63 + test -d '__DESTROOT__$NGX_PREFIX/share/nginx/html' || \ 64 + mkdir -p '__DESTROOT__$NGX_PREFIX/share/nginx/html' && \ 65 + cp -r html '__DESTROOT__$NGX_PREFIX/share/nginx' 38 - test -d '\$(DESTDIR)$NGX_PREFIX/html' \ 39 - || cp -r html '\$(DESTDIR)$NGX_PREFIX' 40 + test -d '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' || \ 41 + mkdir -p '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' && \ 42 + cp -r html '\$(DESTDIR)$NGX_PREFIX/share/nginx' 66 43 END 67 44 68 45 69 -if test -n "$NGX_ERROR_LOG_PATH"; then70 +if test -n "__DESTROOT__$NGX_ERROR_LOG_PATH"; then71 cat << END >> $NGX_MAKEFILE72 73 - test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \74 - mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'75 + test -d '`dirname "__DESTROOT__$NGX_ERROR_LOG_PATH"`' || \76 + mkdir -p '`dirname "__DESTROOT__$NGX_ERROR_LOG_PATH"`'77 END78 79 fi -
trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff
r31242 r40461 1 --- conf/nginx.conf 2007-05-12 07:19:58.000000000 +0000 2 +++ conf/nginx.conf.new 2007-05-12 07:19:36.000000000 +0000 3 @@ -15,7 +15,7 @@ 4 5 6 http { 7 - include conf/mime.types; 8 + include etc/nginx/mime.types; 9 default_type application/octet-stream; 10 11 #log_format main '$remote_addr - $remote_user [$time_local] $request ' 1 --- conf/nginx.conf 2008-02-28 20:44:16.000000000 +0000 2 +++ conf/nginx.conf 2008-07-09 18:05:34.000000000 +0100 12 3 @@ -41,7 +41,7 @@ 13 4 #access_log logs/host.access.log main; … … 28 19 29 20 # proxy the PHP scripts to Apache listening on 127.0.0.1:80 30 @@ -8 6,7 +86,7 @@21 @@ -87,7 +87,7 @@ 31 22 # server_name somename alias another.alias; 32 23 … … 37 28 # } 38 29 #} 39 @@ -1 09,7 +109,7 @@30 @@ -110,7 +110,7 @@ 40 31 # ssl_prefer_server_ciphers on; 41 32
Note: See TracChangeset
for help on using the changeset viewer.