diff options
| -rw-r--r-- | www/py-django/ALTERNATIVES | 4 | ||||
| -rw-r--r-- | www/py-django/Makefile | 11 | ||||
| -rw-r--r-- | www/py-django/PLIST | 6 | ||||
| -rw-r--r-- | www/py-django/distinfo | 11 | ||||
| -rw-r--r-- | www/py-django/patches/patch-django_contrib_admin_widgets.py | 15 |
5 files changed, 14 insertions, 33 deletions
diff --git a/www/py-django/ALTERNATIVES b/www/py-django/ALTERNATIVES index 0334b77abc1..ddd9ad11ac8 100644 --- a/www/py-django/ALTERNATIVES +++ b/www/py-django/ALTERNATIVES @@ -1,2 +1,2 @@ -bin/django-admin @PREFIX@/bin/django-admin@PYVERSSUFFIX@ -bin/django-admin.py @PREFIX@/bin/django-admin@PYVERSSUFFIX@.py +bin/django-admin @PREFIX@/bin/django-admin-@PYVERSSUFFIX@ +bin/django-admin.py @PREFIX@/bin/django-admin-@PYVERSSUFFIX@.py diff --git a/www/py-django/Makefile b/www/py-django/Makefile index 0944be3db8d..142c0bf258e 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.102 2018/10/02 08:06:44 adam Exp $ +# $NetBSD: Makefile,v 1.103 2018/12/03 18:59:35 adam Exp $ -DISTNAME= Django-1.11.16 +DISTNAME= Django-1.11.17 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ @@ -17,13 +17,10 @@ USE_LANGUAGES= # none REPLACE_PYTHON+= django/bin/django-admin.py REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl -post-patch: - ${RM} ${WRKSRC}/django/contrib/admin/widgets.py.orig - post-install: cd ${DESTDIR}${PREFIX}/bin && \ - ${MV} django-admin django-admin${PYVERSSUFFIX} && \ - ${MV} django-admin.py django-admin${PYVERSSUFFIX}.py || ${TRUE} + ${MV} django-admin django-admin-${PYVERSSUFFIX} && \ + ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/www/py-django/PLIST b/www/py-django/PLIST index 351e65ed83a..3fd6c52d8b7 100644 --- a/www/py-django/PLIST +++ b/www/py-django/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.44 2017/12/04 14:23:00 adam Exp $ -bin/django-admin${PYVERSSUFFIX} -bin/django-admin${PYVERSSUFFIX}.py +@comment $NetBSD: PLIST,v 1.45 2018/12/03 18:59:35 adam Exp $ +bin/django-admin-${PYVERSSUFFIX} +bin/django-admin-${PYVERSSUFFIX}.py ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt diff --git a/www/py-django/distinfo b/www/py-django/distinfo index c3d38afc5d3..19d968f10c8 100644 --- a/www/py-django/distinfo +++ b/www/py-django/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.81 2018/10/02 08:06:44 adam Exp $ +$NetBSD: distinfo,v 1.82 2018/12/03 18:59:35 adam Exp $ -SHA1 (Django-1.11.16.tar.gz) = fd34d73528695d758223b173e130732b1cac3ff4 -RMD160 (Django-1.11.16.tar.gz) = cb10f58288ce4228b4504688fcd4c0fdfcb8785f -SHA512 (Django-1.11.16.tar.gz) = bf1329ac364c9037fd6cecd0e8565c8bd8d830343671f9ce5415a10e70da37256667675b3f97e4d2508a8a912fa7a06ca7f585586ac18e6734c939bc41a8b455 -Size (Django-1.11.16.tar.gz) = 7852514 bytes -SHA1 (patch-django_contrib_admin_widgets.py) = 16c7b0607c5e85f67726e93bf3649414abe7c7fb +SHA1 (Django-1.11.17.tar.gz) = eefdad39bfc854130676d9a0780f083f93e55642 +RMD160 (Django-1.11.17.tar.gz) = 55cc7003400615c6e2cf15cd3126c1ab46f6c649 +SHA512 (Django-1.11.17.tar.gz) = ecf798ce8037d79dbbe673ad583e6414c9a24b807442feb967927b78cacb467f7f5c20e938116829d9b0df0563ee110a8d07294fd40b99dbd6356c8bae151bd6 +Size (Django-1.11.17.tar.gz) = 7853439 bytes diff --git a/www/py-django/patches/patch-django_contrib_admin_widgets.py b/www/py-django/patches/patch-django_contrib_admin_widgets.py deleted file mode 100644 index 69667519ca4..00000000000 --- a/www/py-django/patches/patch-django_contrib_admin_widgets.py +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-django_contrib_admin_widgets.py,v 1.1 2018/07/03 06:42:27 adam Exp $ - -Fix syntax error (Python 3.7). - ---- django/contrib/admin/widgets.py.orig 2018-07-03 06:33:30.000000000 +0000 -+++ django/contrib/admin/widgets.py -@@ -149,7 +149,7 @@ class ForeignKeyRawIdWidget(forms.TextIn - params = self.url_parameters() - if params: - related_url += '?' + '&'.join( -- '%s=%s' % (k, v) for k, v in params.items(), -+ '%s=%s' % (k, v) for k, v in params.items() - ) - context['related_url'] = mark_safe(related_url) - context['link_title'] = _('Lookup') |