Tue Dec 15 17:40:36 2015 UTC ()
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.


(kleink)
diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/Makefile
diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/Makefile.common
diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/distinfo
cvs diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/Makefile (switch to unified diff)

--- pkgsrc/www/py-werkzeug/Makefile 2015/11/15 03:42:42 1.9
+++ pkgsrc/www/py-werkzeug/Makefile 2015/12/15 17:40:36 1.10
@@ -1,56 +1,57 @@ @@ -1,56 +1,57 @@
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
3PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 3PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
 4PKGREVISION= 1
4 5
5COMMENT= Python WSGI Utility Library 6COMMENT= Python WSGI Utility Library
6 7
7USE_LANGUAGES= c # empty 8USE_LANGUAGES= # empty
8USE_TOOLS+= pax 9USE_TOOLS+= pax
9 10
10REPLACE_PYTHON= examples/cookieauth.py 11REPLACE_PYTHON= examples/cookieauth.py
11REPLACE_PYTHON+= examples/manage-coolmagic.py 12REPLACE_PYTHON+= examples/manage-coolmagic.py
12REPLACE_PYTHON+= examples/manage-couchy.py 13REPLACE_PYTHON+= examples/manage-couchy.py
13REPLACE_PYTHON+= examples/manage-cupoftee.py 14REPLACE_PYTHON+= examples/manage-cupoftee.py
14REPLACE_PYTHON+= examples/manage-i18nurls.py 15REPLACE_PYTHON+= examples/manage-i18nurls.py
15REPLACE_PYTHON+= examples/manage-plnt.py 16REPLACE_PYTHON+= examples/manage-plnt.py
16REPLACE_PYTHON+= examples/manage-shorty.py 17REPLACE_PYTHON+= examples/manage-shorty.py
17REPLACE_PYTHON+= examples/manage-simplewiki.py 18REPLACE_PYTHON+= examples/manage-simplewiki.py
18REPLACE_PYTHON+= examples/manage-webpylike.py 19REPLACE_PYTHON+= examples/manage-webpylike.py
19REPLACE_PYTHON+= examples/upload.py 20REPLACE_PYTHON+= examples/upload.py
20REPLACE_PYTHON+= examples/contrib/sessions.py 21REPLACE_PYTHON+= examples/contrib/sessions.py
21REPLACE_PYTHON+= tests/multipart/test_collect.py 22REPLACE_PYTHON+= tests/multipart/test_collect.py
22 23
23DOCFILES= AUTHORS CHANGES 24DOCFILES= AUTHORS CHANGES
24 25
25EGDIR= share/examples/${PKGBASE} 26EGDIR= share/examples/${PKGBASE}
26 27
27PLIST_SUBST+= EGDIR=${EGDIR} 28PLIST_SUBST+= EGDIR=${EGDIR}
28 29
29INSTALLATION_DIRS+= ${DOCDIR} 30INSTALLATION_DIRS+= ${DOCDIR}
30INSTALLATION_DIRS+= ${EGDIR} 31INSTALLATION_DIRS+= ${EGDIR}
31 32
32post-install: 33post-install:
33.for i in console.png less.png more.png source.png 34.for i in console.png less.png more.png source.png
34 ${CHMOD} ${SHAREMODE} \ 35 ${CHMOD} ${SHAREMODE} \
35 ${DESTDIR}${PREFIX}/${PYSITELIB}/werkzeug/debug/shared/${i} 36 ${DESTDIR}${PREFIX}/${PYSITELIB}/werkzeug/debug/shared/${i}
36.endfor 37.endfor
37.for i in ${DOCFILES} 38.for i in ${DOCFILES}
38 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${DOCDIR} 39 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${DOCDIR}
39.endfor 40.endfor
40 cd ${WRKSRC}/examples && pax -rwppm . ${DESTDIR}${PREFIX}/${EGDIR} 41 cd ${WRKSRC}/examples && pax -rwppm . ${DESTDIR}${PREFIX}/${EGDIR}
41.for i in manage-coolmagic.py manage-couchy.py manage-cupoftee.py \ 42.for i in manage-coolmagic.py manage-couchy.py manage-cupoftee.py \
42 manage-i18nurls.py manage-plnt.py manage-shorty.py manage-simplewiki.py \ 43 manage-i18nurls.py manage-plnt.py manage-shorty.py manage-simplewiki.py \
43 manage-webpylike.py 44 manage-webpylike.py
44 ${CHMOD} ${SHAREMODE} \ 45 ${CHMOD} ${SHAREMODE} \
45 ${DESTDIR}${PREFIX}/${EGDIR}/${i} 46 ${DESTDIR}${PREFIX}/${EGDIR}/${i}
46.endfor 47.endfor
47.for i in down.png up.png 48.for i in down.png up.png
48 ${CHMOD} ${SHAREMODE} \ 49 ${CHMOD} ${SHAREMODE} \
49 ${DESTDIR}${PREFIX}/${EGDIR}/cupoftee/shared/${i} 50 ${DESTDIR}${PREFIX}/${EGDIR}/cupoftee/shared/${i}
50.endfor 51.endfor
51 52
52.include "../../www/py-werkzeug/Makefile.common" 53.include "../../www/py-werkzeug/Makefile.common"
53 54
54.include "../../lang/python/application.mk" 55.include "../../lang/python/application.mk"
55.include "../../lang/python/egg.mk" 56.include "../../lang/python/egg.mk"
56.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/Makefile.common (switch to unified diff)

--- pkgsrc/www/py-werkzeug/Makefile.common 2015/11/15 03:42:42 1.9
+++ pkgsrc/www/py-werkzeug/Makefile.common 2015/12/15 17:40:36 1.10
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
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
6DISTNAME= Werkzeug-0.11.2 6DISTNAME= Werkzeug-0.11.2
 7DIST_SUBDIR= py-werkzeug
7CATEGORIES= www python 8CATEGORIES= www python
8MASTER_SITES= ${MASTER_SITE_PYPI:=W/Werkzeug/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=mitsuhiko/}
 10GITHUB_PROJECT=${DISTNAME:tl:C/-[^-]*$//}
9 11
10DISTINFO_FILE= ${.CURDIR}/../../www/py-werkzeug/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../www/py-werkzeug/distinfo
11PATCHDIR= ${.CURDIR}/../../www/py-werkzeug/patches 13PATCHDIR= ${.CURDIR}/../../www/py-werkzeug/patches
12 14
13MAINTAINER= kleink@NetBSD.org 15MAINTAINER= kleink@NetBSD.org
14HOMEPAGE= http://werkzeug.pocoo.org/ 16HOMEPAGE= http://werkzeug.pocoo.org/
15LICENSE= modified-bsd 17LICENSE= modified-bsd
16 18
17# for test 19# for test
18BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 20BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
19BUILD_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests 21BUILD_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
20 22
21DOCDIR= share/doc/${PYPKGPREFIX}-${DISTNAME:tl:C/-[^-]*$//} 23DOCDIR= share/doc/${PYPKGPREFIX}-${DISTNAME:tl:C/-[^-]*$//}
22 24
23PLIST_SUBST+= DOCDIR=${DOCDIR} 25PLIST_SUBST+= DOCDIR=${DOCDIR}
cvs diff -r1.9 -r1.10 pkgsrc/www/py-werkzeug/distinfo (switch to unified diff)

--- pkgsrc/www/py-werkzeug/distinfo 2015/11/15 03:42:42 1.9
+++ pkgsrc/www/py-werkzeug/distinfo 2015/12/15 17:40:36 1.10
@@ -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
3SHA1 (Werkzeug-0.11.2.tar.gz) = 401b8f7d1e94823c4a1fb493fd38cb417c401938 3SHA1 (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 3cb7316582e0f42af1fe2dba61aa01d759ffd870
4RMD160 (Werkzeug-0.11.2.tar.gz) = 3e4b2668a4f499ee340b8c52c2f37e6e1a41edce 4RMD160 (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 3d6874cf5f0e07b4c1af460a3ac84b77b56a7c3a
5SHA512 (Werkzeug-0.11.2.tar.gz) = aa83da47763a4c5b9b68c10e84ad195d8ae50b419faf25928d135cd0eebf7a57c4a7e178002a2f7a849005e0df8491398e12cd00098ccfb227ae2b75129e4966 5SHA512 (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 99b522726de37da1d29e71f8e069f30fae4b92105009c9aeebd18868a5734c0f00cbb39ae983f187bf5f049598785e239b580bb811450cae8687877f771a8896
6Size (Werkzeug-0.11.2.tar.gz) = 1152067 bytes 6Size (py-werkzeug/Werkzeug-0.11.2.tar.gz) = 1167356 bytes