'CVS commit: pkgsrc/www'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pkgsrc-changes
Subject:    CVS commit: pkgsrc/www
From:       "Adam Ciarcinski" <adam () netbsd ! org>
Date:       2017-05-31 8:24:39
Message-ID: 20170531082439.15EBAFBEE () cvs ! NetBSD ! org
[Download RAW message or body]

This is a multi-part message in MIME format.

--_----------=_1496219079263590
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Wed May 31 08:24:38 UTC 2017

Modified Files:
	pkgsrc/www/py-werkzeug: Makefile Makefile.common PLIST distinfo
	pkgsrc/www/py-werkzeug-docs: Makefile
Added Files:
	pkgsrc/www/py-werkzeug/patches: patch-docs_conf.py

Log Message:
Version 0.12.2
--------------
- Fix regression: Pull request ``892`` prevented Werkzeug from correctly
  logging the IP of a remote client behind a reverse proxy, even when using
  `ProxyFix`.
- Fix a bug in `safe_join` on Windows.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-werkzeug/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/py-werkzeug/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-werkzeug/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/py-werkzeug/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-werkzeug-docs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-werkzeug/patches/patch-docs_conf.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1496219079263590
Content-Disposition: inline
Content-Length: 7524
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/py-werkzeug/Makefile
diff -u pkgsrc/www/py-werkzeug/Makefile:1.11 pkgsrc/www/py-werkzeug/Makefile:1.12
--- pkgsrc/www/py-werkzeug/Makefile:1.11	Wed Jan  6 17:28:31 2016
+++ pkgsrc/www/py-werkzeug/Makefile	Wed May 31 08:24:38 2017
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2016/01/06 17:28:31 kleink Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/31 08:24:38 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 
 COMMENT=	Python WSGI Utility Library
 
-USE_LANGUAGES=	# empty
-USE_TOOLS+=	pax
+BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 REPLACE_PYTHON=		examples/cookieauth.py
 REPLACE_PYTHON+=	examples/manage-coolmagic.py
@@ -20,33 +19,25 @@ REPLACE_PYTHON+=	examples/upload.py
 REPLACE_PYTHON+=	examples/contrib/sessions.py
 REPLACE_PYTHON+=	tests/multipart/test_collect.py
 
-DOCFILES=	AUTHORS CHANGES
-
 EGDIR=		share/examples/${PKGBASE}
 
 PLIST_SUBST+=	EGDIR=${EGDIR}
 
-INSTALLATION_DIRS+=	${DOCDIR}
-INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
 
 post-install:
 .for i in console.png less.png more.png source.png
 	${CHMOD} ${SHAREMODE} \
 	    ${DESTDIR}${PREFIX}/${PYSITELIB}/werkzeug/debug/shared/${i}
 .endfor
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${DOCDIR}
-.endfor
 	cd ${WRKSRC}/examples && pax -rwppm . ${DESTDIR}${PREFIX}/${EGDIR}
 .for i in manage-coolmagic.py manage-couchy.py manage-cupoftee.py \
     manage-i18nurls.py manage-plnt.py manage-shorty.py manage-simplewiki.py \
     manage-webpylike.py
-	${CHMOD} ${SHAREMODE} \
-	    ${DESTDIR}${PREFIX}/${EGDIR}/${i}
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${EGDIR}/${i}
 .endfor
 .for i in down.png up.png
-	${CHMOD} ${SHAREMODE} \
-	    ${DESTDIR}${PREFIX}/${EGDIR}/cupoftee/shared/${i}
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${EGDIR}/cupoftee/shared/${i}
 .endfor
 
 .include "../../www/py-werkzeug/Makefile.common"

Index: pkgsrc/www/py-werkzeug/Makefile.common
diff -u pkgsrc/www/py-werkzeug/Makefile.common:1.17 \
                pkgsrc/www/py-werkzeug/Makefile.common:1.18
--- pkgsrc/www/py-werkzeug/Makefile.common:1.17	Tue Mar 14 13:48:22 2017
+++ pkgsrc/www/py-werkzeug/Makefile.common	Wed May 31 08:24:38 2017
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile.common,v 1.17 2017/03/14 13:48:22 kleink Exp $
-
+# $NetBSD: Makefile.common,v 1.18 2017/05/31 08:24:38 adam Exp $
 # used by www/py-werkzeug/Makefile
 # used by www/py-werkzeug-docs/Makefile
 
-DISTNAME=	Werkzeug-0.12
+DISTNAME=	Werkzeug-0.12.2
 CATEGORIES=	www python
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=pallets/}
-GITHUB_PROJECT=${DISTNAME:tl:C/-[^-]*$//}
-WRKSRC=		${WRKDIR}/${DISTNAME:tl}
+MASTER_SITES=	${MASTER_SITE_PYPI:=W/Werkzeug/}
 
 DISTINFO_FILE=	${.CURDIR}/../../www/py-werkzeug/distinfo
 PATCHDIR=	${.CURDIR}/../../www/py-werkzeug/patches
@@ -16,10 +13,5 @@ MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://werkzeug.pocoo.org/
 LICENSE=	modified-bsd
 
-# for test
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-BUILD_DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-
-DOCDIR=		share/doc/${PYPKGPREFIX}-${DISTNAME:tl:C/-[^-]*$//}
-
-PLIST_SUBST+=	DOCDIR=${DOCDIR}
+USE_LANGUAGES=		# none
+USE_TOOLS+=		pax

Index: pkgsrc/www/py-werkzeug/PLIST
diff -u pkgsrc/www/py-werkzeug/PLIST:1.6 pkgsrc/www/py-werkzeug/PLIST:1.7
--- pkgsrc/www/py-werkzeug/PLIST:1.6	Tue Mar 14 13:48:22 2017
+++ pkgsrc/www/py-werkzeug/PLIST	Wed May 31 08:24:38 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/03/14 13:48:22 kleink Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/05/31 08:24:38 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -131,8 +131,6 @@ ${PYSITELIB}/werkzeug/wrappers.pyo
 ${PYSITELIB}/werkzeug/wsgi.py
 ${PYSITELIB}/werkzeug/wsgi.pyc
 ${PYSITELIB}/werkzeug/wsgi.pyo
-${DOCDIR}/AUTHORS
-${DOCDIR}/CHANGES
 ${EGDIR}/README
 ${EGDIR}/contrib/README
 ${EGDIR}/contrib/securecookie.py

Index: pkgsrc/www/py-werkzeug/distinfo
diff -u pkgsrc/www/py-werkzeug/distinfo:1.16 pkgsrc/www/py-werkzeug/distinfo:1.17
--- pkgsrc/www/py-werkzeug/distinfo:1.16	Tue Mar 14 13:48:22 2017
+++ pkgsrc/www/py-werkzeug/distinfo	Wed May 31 08:24:38 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2017/03/14 13:48:22 kleink Exp $
+$NetBSD: distinfo,v 1.17 2017/05/31 08:24:38 adam Exp $
 
-SHA1 (Werkzeug-0.12.tar.gz) = f48c6c8e6c39d98463630758d787ab70a273d208
-RMD160 (Werkzeug-0.12.tar.gz) = 4f0212865665ab78ae309bdab8f170e2e0aecb0d
-SHA512 (Werkzeug-0.12.tar.gz) = \
1d0ff9cbce389e9db3943fbf5c148a449963254950e97cdc93a6f10e1c811c0cbb9c1cebdbc5eb424c49518e15d4c181bc5114e72f426f27b67c6fb0ba49cdaa
                
-Size (Werkzeug-0.12.tar.gz) = 1182644 bytes
+SHA1 (Werkzeug-0.12.2.tar.gz) = fe5c3e287ae54cfefc25fd3eec800599b8026b49
+RMD160 (Werkzeug-0.12.2.tar.gz) = 939a81e6857500b8627c39e0994256a754b443c9
+SHA512 (Werkzeug-0.12.2.tar.gz) = \
9ff45aeb51a71fd5115e8cdee40a7b2fddfa0574c356686050cb1bdced5c6c18f672b601ca2637010c7f59be75c66ee558efb4ea05052c550ec7da3644b88e0a
 +Size (Werkzeug-0.12.2.tar.gz) = 1169770 bytes
+SHA1 (patch-docs_conf.py) = bdf45da4ba350a35e423f447eb8dc778670ada21

Index: pkgsrc/www/py-werkzeug-docs/Makefile
diff -u pkgsrc/www/py-werkzeug-docs/Makefile:1.8 \
                pkgsrc/www/py-werkzeug-docs/Makefile:1.9
--- pkgsrc/www/py-werkzeug-docs/Makefile:1.8	Sun Jan  1 14:44:06 2017
+++ pkgsrc/www/py-werkzeug-docs/Makefile	Wed May 31 08:24:38 2017
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2017/01/01 14:44:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/31 08:24:38 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-werkzeug-docs-${DISTNAME:C/[^-]*-//}
-
 COMMENT=	Python WSGI Utility Library (HTML documentation)
 
 NO_CONFIGURE=	yes
 BUILD_TARGET=	documentation
 
-USE_TOOLS+=	pax
-
 INSTALLATION_DIRS+=	${DOCDIR}/html
 
+DOCDIR=		share/doc/${PYPKGPREFIX}-${DISTNAME:tl:C/-[^-]*$//}
+PLIST_SUBST+=	DOCDIR=${DOCDIR}
 PLIST_SRC+=	${WRKDIR}/PLIST
 
 .include "../../www/py-werkzeug/Makefile.common"
@@ -23,10 +22,9 @@ do-install:
 	    && ${FIND} ${DOCDIR}/html -type f -print > ${WRKDIR}/PLIST
 
 PYTHON_FOR_BUILD_ONLY=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # sphinx detection broken as of 0.9.4
-.include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
 
 MAKE_FLAGS+=	SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
 
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/www/py-werkzeug/patches/patch-docs_conf.py
diff -u /dev/null pkgsrc/www/py-werkzeug/patches/patch-docs_conf.py:1.1
--- /dev/null	Wed May 31 08:24:39 2017
+++ pkgsrc/www/py-werkzeug/patches/patch-docs_conf.py	Wed May 31 08:24:38 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-docs_conf.py,v 1.1 2017/05/31 08:24:38 adam Exp $
+
+Skip missing Werkzeug theme.
+
+--- docs/conf.py.orig	2017-05-31 07:56:02.000000000 +0000
++++ docs/conf.py
+@@ -95,7 +95,7 @@ add_function_parentheses = True
+ #show_authors = False
+ 
+ # The name of the Pygments (syntax highlighting) style to use.
+-pygments_style = 'werkzeug_theme_support.WerkzeugStyle'
++#pygments_style = 'werkzeug_theme_support.WerkzeugStyle'
+ 
+ # doctest setup code
+ doctest_global_setup = '''\
+@@ -106,8 +106,8 @@ from werkzeug import *
+ # Options for HTML output
+ # -----------------------
+ 
+-html_theme = 'werkzeug'
+-html_theme_path = ['_themes']
++#html_theme = 'werkzeug'
++#html_theme_path = ['_themes']
+ 
+ # The name for this set of Sphinx documents.  If None, it defaults to
+ # "<project> v<release> documentation".


--_----------=_1496219079263590--


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic