<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/379e226b41db24e989cacd34e702c3efa190e729">https://github.com/macports/macports-ports/commit/379e226b41db24e989cacd34e702c3efa190e729</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 379e226 py-django: merge django2, update to 1.11.15/2.1.1
</span>379e226 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 379e226b41db24e989cacd34e702c3efa190e729
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Sep 2 19:01:32 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> py-django: merge django2, update to 1.11.15/2.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Merge py-django2 with py-django.
</span><span style='display:block; white-space:pre;color:#404040;'> * py27-django now provides version 1.11.15,
</span><span style='display:block; white-space:pre;color:#404040;'> py3*-django provide version 2.1.1.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add python 37 subport.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove python 34 subport (not supported in version 2.1).
</span>---
python/py-django/Portfile | 29 +++++++++++++---------
python/py-django2/Portfile | 60 +++++++---------------------------------------
2 files changed, 26 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-django/Portfile b/python/py-django/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dc976a..0beb5c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-django/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-django/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup django django 1.11.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup django django 2.1.1
</span> name py-django
categories-append www
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {danchr @danchr} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {danchr @danchr} {mojca @mojca} openmaintainer
</span>
description Django is a high-level Python Web framework
long_description Django is a high-level Python Web framework that \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,14 +18,25 @@ long_description Django is a high-level Python Web framework that \
</span>
homepage http://www.djangoproject.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 aea1595dc97ee2c03291a9298c1cb6f9f5a1f574 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 908572660e67bfc2d472d847c43307f6a87e144d594463ca6f9b456b31f42ed1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37
</span> supported_archs noarch
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-django2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} == 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup django django 1.11.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 38ccea19743ee393148f076bd806166bfad0b39a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58ddfa73a8c32c41fb2ca810dc79118dbaca6f4fbc251ec921e05a610fc911ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7893007
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {archive/(1[.].+?).tar.gz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 12ccde5448f7b8e9898bb04efc9cee4c275849ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 34b5771368fd9ca04d1340e0e6d948cd5f7e614dc0d5f7330bf415a6d2dec222 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8641387
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
depends_build-append port:py${python.version}-setuptools
depends_run-append port:py${python.version}-tz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +71,4 @@ if {${name} ne ${subport}} {
</span> ln -s ${python.prefix}/bin/django-admin.py \
${destroot}${prefix}/bin/django-admin-${python.branch}.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {archive/(1[.].+?).tar.gz}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-django2/Portfile b/python/py-django2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c9c374..adf5931 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-django2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-django2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,66 +1,22 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span> PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup django django 2.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove this port after September 2019
</span> name py-django2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append www
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# feel free to take over this port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {@mojca mojca} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Django is a high-level Python Web framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Django is a high-level Python Web framework that \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encourages rapid development and clean, pragmatic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- design.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.djangoproject.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cdd4fac4aa634be509ef8ee5d1569fc7a7d21c0c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d0fe12b6bc6a4ba353d19e192d649e184ab7c6f1b38043e8440875f5eec8d811
</span>
python.versions 35 36
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-django
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:py${python.version}-tz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant bash_completion {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append path:etc/bash_completion:bash-completion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|django-admin.py|django-admin-${python.branch}.py|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extras/django_bash_completion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/etc/bash_completion.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/extras/django_bash_completion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/bash_completion.d/django-admin-${python.branch}.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we want *-${python.branch}.py not *.py-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.link_binaries no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.move_binaries no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTHORS INSTALL LICENSE README.rst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${subport}/docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # To avoid conflict between py*-django
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.prefix}/bin/django-admin.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/django-admin-${python.branch}.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by py${python.version}-django
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by py-django
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
</pre><pre style='margin:0'>
</pre>