<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/daed60864683925cef2999bfe3bcadbab25039fe">https://github.com/macports/macports-ports/commit/daed60864683925cef2999bfe3bcadbab25039fe</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new daed6086468 cherokee: update to 1.2.204 - use distfiles from Github as official site points to Github-hosted assets - use recommended checksum types - patch and configure to use $prefix/var/www as www root - remove all variants, add new variants for ffmpeg and LDAP - add Python 2.7 as lib dependency, also needed for build process - use automake/autoconf/libtool in build process
</span>daed6086468 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit daed60864683925cef2999bfe3bcadbab25039fe
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed Sep 9 10:55:50 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> cherokee: update to 1.2.204
</span><span style='display:block; white-space:pre;color:#404040;'> - use distfiles from Github as official site points to Github-hosted assets
</span><span style='display:block; white-space:pre;color:#404040;'> - use recommended checksum types
</span><span style='display:block; white-space:pre;color:#404040;'> - patch and configure to use $prefix/var/www as www root
</span><span style='display:block; white-space:pre;color:#404040;'> - remove all variants, add new variants for ffmpeg and LDAP
</span><span style='display:block; white-space:pre;color:#404040;'> - add Python 2.7 as lib dependency, also needed for build process
</span><span style='display:block; white-space:pre;color:#404040;'> - use automake/autoconf/libtool in build process
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/30324
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/33768
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/44766
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/33767
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/43704
</span>---
www/cherokee/Portfile | 112 +++++++++++++++++++++++++++++---------------------
1 file changed, 66 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cherokee/Portfile b/www/cherokee/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b240c63d699..d84f103a54b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/cherokee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cherokee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +1,100 @@
</span> PortSystem 1.0
PortGroup old_openssl 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cherokee webserver 1.2.104 v
</span> name cherokee
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories www
platforms darwin
maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.cherokee-project.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Cherokee web server
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> long_description \
Cherokee is a relatively new HTTP server designed to be as\
performant as Apache and lighttpd, but much easier to \
configure and maintain. It ships out-of-the-box SCGI \
support, making it ideal for deploying dynamic websites.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.cherokee-project.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}download/${branch}/${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 ef47003355a2e368e4d9596cd070ef23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b27f149c7d7111207ac8c3cd8a4856c05490d136 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 dd3dedc352ba17bdcefd8e200143b8ffa19ad035
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f5271b4b6f6be3cf70a88a3933fd90597862b289 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5cbd00ff48503eaf90356b2975e311c02977f9166927e57fc23f541a109efd98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5312997
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgeoip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rrdtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ck_wwwroot ${prefix}/var/www/htdocs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ck_cgibin ${prefix}/var/www/cgi-bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ck_lcl_bin ${workpath}/bin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-openssl.configure build_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|/Library/WebServer/Documents|${ck_wwwroot}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ admin/util.py configure.ac
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Startup item.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set cherokee_config_name cherokee.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set cherokee_config ${prefix}/etc/${name}/${cherokee_config_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set cherokee_pidfile_name cherokee.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set cherokee_pidfile ${prefix}/var/run/${cherokee_pidfile_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.init "PIDFILE=${cherokee_pidfile}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.start "${prefix}/sbin/cherokee -C ${cherokee_config}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.stop "kill \$(cat \$PIDFILE)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_startupitem description {Do not create a startup item} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.create no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|/Library/WebServer/CGI-Executables|${ck_cgibin}|g" configure.ac
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_ipv6 description {Disable IPv6 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-ipv6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${ck_lcl_bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cherokee's autogen.sh seeks a python2 symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/python2.7 ${ck_lcl_bin}/python2
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_pam description {Disable PAM support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-pam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PATH=${ck_lcl_bin}:$env(PATH)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant trace description {Allows debugging options} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-trace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-wwwroot=${ck_wwwroot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cgiroot=${ck_cgibin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-python=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-ldap
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_epoll description {Disable epoll() support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-epoll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_pthread description {Disable threading support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-pthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgeoip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rrdtool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_readdir_r description {Disable readdir_r usage} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-readdir_r
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure build_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Startup item.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cherokee_config_name cherokee.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cherokee_config ${prefix}/etc/${name}/${cherokee_config_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cherokee_pidfile_name cherokee.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cherokee_pidfile ${prefix}/var/run/${cherokee_pidfile_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.init PIDFILE=${cherokee_pidfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.start ${prefix}/sbin/cherokee -C ${cherokee_config}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.stop kill \$(cat \$PIDFILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ffmpeg description {Enable ffmpeg support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:bin/ffmpeg:ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-ffmpeg --with-ffmpeg
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_admin description {Skips cherokee-admin installation} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-admin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ldap description {Enable LDAP support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openldap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-ldap --with-ldap
</span> }
pre-destroot {
xinstall -m 755 -d ${destroot}${prefix}/var/log
destroot.keepdirs-append ${destroot}${prefix}/var/log
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cherokee's web root is located at: ${ck_wwwroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span></pre><pre style='margin:0'>
</pre>