Restore the MASTER_SITE-related changes from the 0.10.4 update which got reverted in the 0.11.2 update, despite being documented in the log: > Due to a change in packaging the docs themes are currently excluded > from the pypi distribution, breaking the -docs package. Issue > ``#761`` should address this upstream; we'll being using GitHub as > the master site for the time being. (Also, when touching the base package, make sure the -docs package still builds. Makefile.common quite visibly mentions it.) Bump PKGREVISION, and temporarily invent a DIST_SUBDIR so the different distfile gets picked up until the next update.diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/Makefile
(kleink)
@@ -1,20 +1,21 @@ | @@ -1,20 +1,21 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2015/11/15 03:42:42 wen Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2015/12/15 17:40:36 kleink Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} | 3 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} | |
4 | PKGREVISION= 1 | |||
4 | 5 | |||
5 | COMMENT= Python WSGI Utility Library | 6 | COMMENT= Python WSGI Utility Library | |
6 | 7 | |||
7 | USE_LANGUAGES= c # empty | 8 | USE_LANGUAGES= # empty | |
8 | USE_TOOLS+= pax | 9 | USE_TOOLS+= pax | |
9 | 10 | |||
10 | REPLACE_PYTHON= examples/cookieauth.py | 11 | REPLACE_PYTHON= examples/cookieauth.py | |
11 | REPLACE_PYTHON+= examples/manage-coolmagic.py | 12 | REPLACE_PYTHON+= examples/manage-coolmagic.py | |
12 | REPLACE_PYTHON+= examples/manage-couchy.py | 13 | REPLACE_PYTHON+= examples/manage-couchy.py | |
13 | REPLACE_PYTHON+= examples/manage-cupoftee.py | 14 | REPLACE_PYTHON+= examples/manage-cupoftee.py | |
14 | REPLACE_PYTHON+= examples/manage-i18nurls.py | 15 | REPLACE_PYTHON+= examples/manage-i18nurls.py | |
15 | REPLACE_PYTHON+= examples/manage-plnt.py | 16 | REPLACE_PYTHON+= examples/manage-plnt.py | |
16 | REPLACE_PYTHON+= examples/manage-shorty.py | 17 | REPLACE_PYTHON+= examples/manage-shorty.py | |
17 | REPLACE_PYTHON+= examples/manage-simplewiki.py | 18 | REPLACE_PYTHON+= examples/manage-simplewiki.py | |
18 | REPLACE_PYTHON+= examples/manage-webpylike.py | 19 | REPLACE_PYTHON+= examples/manage-webpylike.py | |
19 | REPLACE_PYTHON+= examples/upload.py | 20 | REPLACE_PYTHON+= examples/upload.py | |
20 | REPLACE_PYTHON+= examples/contrib/sessions.py | 21 | REPLACE_PYTHON+= examples/contrib/sessions.py |
@@ -1,21 +1,23 @@ | @@ -1,21 +1,23 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.9 2015/11/15 03:42:42 wen Exp $ | 1 | # $NetBSD: Makefile.common,v 1.10 2015/12/15 17:40:36 kleink Exp $ | |
2 | 2 | |||
3 | # used by www/py-werkzeug/Makefile | 3 | # used by www/py-werkzeug/Makefile | |
4 | # used by www/py-werkzeug-docs/Makefile | 4 | # used by www/py-werkzeug-docs/Makefile | |
5 | 5 | |||
6 | DISTNAME= Werkzeug-0.11.2 | 6 | DISTNAME= Werkzeug-0.11.2 | |
7 | DIST_SUBDIR= py-werkzeug | |||
7 | CATEGORIES= www python | 8 | CATEGORIES= www python | |
8 | MASTER_SITES= ${MASTER_SITE_PYPI:=W/Werkzeug/} | 9 | MASTER_SITES= ${MASTER_SITE_GITHUB:=mitsuhiko/} | |
10 | GITHUB_PROJECT=${DISTNAME:tl:C/-[^-]*$//} | |||
9 | 11 | |||
10 | DISTINFO_FILE= ${.CURDIR}/../../www/py-werkzeug/distinfo | 12 | DISTINFO_FILE= ${.CURDIR}/../../www/py-werkzeug/distinfo | |
11 | PATCHDIR= ${.CURDIR}/../../www/py-werkzeug/patches | 13 | PATCHDIR= ${.CURDIR}/../../www/py-werkzeug/patches | |
12 | 14 | |||
13 | MAINTAINER= kleink@NetBSD.org | 15 | MAINTAINER= kleink@NetBSD.org | |
14 | HOMEPAGE= http://werkzeug.pocoo.org/ | 16 | HOMEPAGE= http://werkzeug.pocoo.org/ | |
15 | LICENSE= modified-bsd | 17 | LICENSE= modified-bsd | |
16 | 18 | |||
17 | # for test | 19 | # for test | |
18 | BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test | 20 | BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test | |
19 | BUILD_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests | 21 | BUILD_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests | |
20 | 22 | |||
21 | DOCDIR= share/doc/${PYPKGPREFIX}-${DISTNAME:tl:C/-[^-]*$//} | 23 | DOCDIR= share/doc/${PYPKGPREFIX}-${DISTNAME:tl:C/-[^-]*$//} |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2015/11/15 03:42:42 wen Exp $ | 1 | $NetBSD: distinfo,v 1.10 2015/12/15 17:40:36 kleink Exp $ | |
2 | 2 | |||
3 | SHA1 (Werkzeug-0.11.2.tar.gz) = 401b8f7d1e94823c4a1fb493fd38cb417c401938 | 3 | SHA1 (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 3cb7316582e0f42af1fe2dba61aa01d759ffd870 | |
4 | RMD160 (Werkzeug-0.11.2.tar.gz) = 3e4b2668a4f499ee340b8c52c2f37e6e1a41edce | 4 | RMD160 (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 3d6874cf5f0e07b4c1af460a3ac84b77b56a7c3a | |
5 | SHA512 (Werkzeug-0.11.2.tar.gz) = aa83da47763a4c5b9b68c10e84ad195d8ae50b419faf25928d135cd0eebf7a57c4a7e178002a2f7a849005e0df8491398e12cd00098ccfb227ae2b75129e4966 | 5 | SHA512 (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 99b522726de37da1d29e71f8e069f30fae4b92105009c9aeebd18868a5734c0f00cbb39ae983f187bf5f049598785e239b580bb811450cae8687877f771a8896 | |
6 | Size (Werkzeug-0.11.2.tar.gz) = 1152067 bytes | 6 | Size (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 1167356 bytes |