Version 2.1.3

- Fixed regression in Bash lexer

4 files changed, 74 insertions, 73 deletions

diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 7903abfdff3..0488833db85 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2016/08/28 15:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2016/12/15 09:42:49 adam Exp $
 
-DISTNAME=	Pygments-2.0.2
-PKGREVISION=	1
+DISTNAME=	Pygments-2.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pygments/}
diff --git a/textproc/py-pygments/PLIST b/textproc/py-pygments/PLIST
index 1ce6d15ca63..6480f7b4ef1 100644
--- a/textproc/py-pygments/PLIST
+++ b/textproc/py-pygments/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/01/01 11:36:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/12/15 09:42:49 adam Exp $
 bin/pygmentize${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -39,6 +39,9 @@ ${PYSITELIB}/pygments/formatters/html.pyo
 ${PYSITELIB}/pygments/formatters/img.py
 ${PYSITELIB}/pygments/formatters/img.pyc
 ${PYSITELIB}/pygments/formatters/img.pyo
+${PYSITELIB}/pygments/formatters/irc.py
+${PYSITELIB}/pygments/formatters/irc.pyc
+${PYSITELIB}/pygments/formatters/irc.pyo
 ${PYSITELIB}/pygments/formatters/latex.py
 ${PYSITELIB}/pygments/formatters/latex.pyc
 ${PYSITELIB}/pygments/formatters/latex.pyo
@@ -72,6 +75,9 @@ ${PYSITELIB}/pygments/lexers/_cl_builtins.pyo
 ${PYSITELIB}/pygments/lexers/_cocoa_builtins.py
 ${PYSITELIB}/pygments/lexers/_cocoa_builtins.pyc
 ${PYSITELIB}/pygments/lexers/_cocoa_builtins.pyo
+${PYSITELIB}/pygments/lexers/_csound_builtins.py
+${PYSITELIB}/pygments/lexers/_csound_builtins.pyc
+${PYSITELIB}/pygments/lexers/_csound_builtins.pyo
 ${PYSITELIB}/pygments/lexers/_lasso_builtins.py
 ${PYSITELIB}/pygments/lexers/_lasso_builtins.pyc
 ${PYSITELIB}/pygments/lexers/_lasso_builtins.pyo
@@ -120,6 +126,9 @@ ${PYSITELIB}/pygments/lexers/ambient.pyo
 ${PYSITELIB}/pygments/lexers/apl.py
 ${PYSITELIB}/pygments/lexers/apl.pyc
 ${PYSITELIB}/pygments/lexers/apl.pyo
+${PYSITELIB}/pygments/lexers/archetype.py
+${PYSITELIB}/pygments/lexers/archetype.pyc
+${PYSITELIB}/pygments/lexers/archetype.pyo
 ${PYSITELIB}/pygments/lexers/asm.py
 ${PYSITELIB}/pygments/lexers/asm.pyc
 ${PYSITELIB}/pygments/lexers/asm.pyo
@@ -150,6 +159,9 @@ ${PYSITELIB}/pygments/lexers/configs.pyo
 ${PYSITELIB}/pygments/lexers/console.py
 ${PYSITELIB}/pygments/lexers/console.pyc
 ${PYSITELIB}/pygments/lexers/console.pyo
+${PYSITELIB}/pygments/lexers/csound.py
+${PYSITELIB}/pygments/lexers/csound.pyc
+${PYSITELIB}/pygments/lexers/csound.pyo
 ${PYSITELIB}/pygments/lexers/css.py
 ${PYSITELIB}/pygments/lexers/css.pyc
 ${PYSITELIB}/pygments/lexers/css.pyo
@@ -180,12 +192,18 @@ ${PYSITELIB}/pygments/lexers/ecl.pyo
 ${PYSITELIB}/pygments/lexers/eiffel.py
 ${PYSITELIB}/pygments/lexers/eiffel.pyc
 ${PYSITELIB}/pygments/lexers/eiffel.pyo
+${PYSITELIB}/pygments/lexers/elm.py
+${PYSITELIB}/pygments/lexers/elm.pyc
+${PYSITELIB}/pygments/lexers/elm.pyo
 ${PYSITELIB}/pygments/lexers/erlang.py
 ${PYSITELIB}/pygments/lexers/erlang.pyc
 ${PYSITELIB}/pygments/lexers/erlang.pyo
 ${PYSITELIB}/pygments/lexers/esoteric.py
 ${PYSITELIB}/pygments/lexers/esoteric.pyc
 ${PYSITELIB}/pygments/lexers/esoteric.pyo
+${PYSITELIB}/pygments/lexers/ezhil.py
+${PYSITELIB}/pygments/lexers/ezhil.pyc
+${PYSITELIB}/pygments/lexers/ezhil.pyo
 ${PYSITELIB}/pygments/lexers/factor.py
 ${PYSITELIB}/pygments/lexers/factor.pyc
 ${PYSITELIB}/pygments/lexers/factor.pyo
@@ -207,6 +225,9 @@ ${PYSITELIB}/pygments/lexers/functional.pyo
 ${PYSITELIB}/pygments/lexers/go.py
 ${PYSITELIB}/pygments/lexers/go.pyc
 ${PYSITELIB}/pygments/lexers/go.pyo
+${PYSITELIB}/pygments/lexers/grammar_notation.py
+${PYSITELIB}/pygments/lexers/grammar_notation.pyc
+${PYSITELIB}/pygments/lexers/grammar_notation.pyo
 ${PYSITELIB}/pygments/lexers/graph.py
 ${PYSITELIB}/pygments/lexers/graph.pyc
 ${PYSITELIB}/pygments/lexers/graph.pyo
@@ -222,6 +243,9 @@ ${PYSITELIB}/pygments/lexers/haxe.pyo
 ${PYSITELIB}/pygments/lexers/hdl.py
 ${PYSITELIB}/pygments/lexers/hdl.pyc
 ${PYSITELIB}/pygments/lexers/hdl.pyo
+${PYSITELIB}/pygments/lexers/hexdump.py
+${PYSITELIB}/pygments/lexers/hexdump.pyc
+${PYSITELIB}/pygments/lexers/hexdump.pyo
 ${PYSITELIB}/pygments/lexers/html.py
 ${PYSITELIB}/pygments/lexers/html.pyc
 ${PYSITELIB}/pygments/lexers/html.pyo
@@ -243,6 +267,9 @@ ${PYSITELIB}/pygments/lexers/int_fiction.pyo
 ${PYSITELIB}/pygments/lexers/iolang.py
 ${PYSITELIB}/pygments/lexers/iolang.pyc
 ${PYSITELIB}/pygments/lexers/iolang.pyo
+${PYSITELIB}/pygments/lexers/j.py
+${PYSITELIB}/pygments/lexers/j.pyc
+${PYSITELIB}/pygments/lexers/j.pyo
 ${PYSITELIB}/pygments/lexers/javascript.py
 ${PYSITELIB}/pygments/lexers/javascript.pyc
 ${PYSITELIB}/pygments/lexers/javascript.pyo
@@ -273,6 +300,9 @@ ${PYSITELIB}/pygments/lexers/ml.pyo
 ${PYSITELIB}/pygments/lexers/modeling.py
 ${PYSITELIB}/pygments/lexers/modeling.pyc
 ${PYSITELIB}/pygments/lexers/modeling.pyo
+${PYSITELIB}/pygments/lexers/modula2.py
+${PYSITELIB}/pygments/lexers/modula2.pyc
+${PYSITELIB}/pygments/lexers/modula2.pyo
 ${PYSITELIB}/pygments/lexers/nimrod.py
 ${PYSITELIB}/pygments/lexers/nimrod.pyc
 ${PYSITELIB}/pygments/lexers/nimrod.pyo
@@ -282,6 +312,9 @@ ${PYSITELIB}/pygments/lexers/nit.pyo
 ${PYSITELIB}/pygments/lexers/nix.py
 ${PYSITELIB}/pygments/lexers/nix.pyc
 ${PYSITELIB}/pygments/lexers/nix.pyo
+${PYSITELIB}/pygments/lexers/oberon.py
+${PYSITELIB}/pygments/lexers/oberon.pyc
+${PYSITELIB}/pygments/lexers/oberon.pyo
 ${PYSITELIB}/pygments/lexers/objective.py
 ${PYSITELIB}/pygments/lexers/objective.pyc
 ${PYSITELIB}/pygments/lexers/objective.pyo
@@ -291,6 +324,9 @@ ${PYSITELIB}/pygments/lexers/ooc.pyo
 ${PYSITELIB}/pygments/lexers/other.py
 ${PYSITELIB}/pygments/lexers/other.pyc
 ${PYSITELIB}/pygments/lexers/other.pyo
+${PYSITELIB}/pygments/lexers/parasail.py
+${PYSITELIB}/pygments/lexers/parasail.pyc
+${PYSITELIB}/pygments/lexers/parasail.pyo
 ${PYSITELIB}/pygments/lexers/parsers.py
 ${PYSITELIB}/pygments/lexers/parsers.pyc
 ${PYSITELIB}/pygments/lexers/parsers.pyo
@@ -306,12 +342,18 @@ ${PYSITELIB}/pygments/lexers/perl.pyo
 ${PYSITELIB}/pygments/lexers/php.py
 ${PYSITELIB}/pygments/lexers/php.pyc
 ${PYSITELIB}/pygments/lexers/php.pyo
+${PYSITELIB}/pygments/lexers/praat.py
+${PYSITELIB}/pygments/lexers/praat.pyc
+${PYSITELIB}/pygments/lexers/praat.pyo
 ${PYSITELIB}/pygments/lexers/prolog.py
 ${PYSITELIB}/pygments/lexers/prolog.pyc
 ${PYSITELIB}/pygments/lexers/prolog.pyo
 ${PYSITELIB}/pygments/lexers/python.py
 ${PYSITELIB}/pygments/lexers/python.pyc
 ${PYSITELIB}/pygments/lexers/python.pyo
+${PYSITELIB}/pygments/lexers/qvt.py
+${PYSITELIB}/pygments/lexers/qvt.pyc
+${PYSITELIB}/pygments/lexers/qvt.pyo
 ${PYSITELIB}/pygments/lexers/r.py
 ${PYSITELIB}/pygments/lexers/r.pyc
 ${PYSITELIB}/pygments/lexers/r.pyo
@@ -324,6 +366,9 @@ ${PYSITELIB}/pygments/lexers/rebol.pyo
 ${PYSITELIB}/pygments/lexers/resource.py
 ${PYSITELIB}/pygments/lexers/resource.pyc
 ${PYSITELIB}/pygments/lexers/resource.pyo
+${PYSITELIB}/pygments/lexers/roboconf.py
+${PYSITELIB}/pygments/lexers/roboconf.pyc
+${PYSITELIB}/pygments/lexers/roboconf.pyo
 ${PYSITELIB}/pygments/lexers/robotframework.py
 ${PYSITELIB}/pygments/lexers/robotframework.pyc
 ${PYSITELIB}/pygments/lexers/robotframework.pyo
@@ -351,6 +396,9 @@ ${PYSITELIB}/pygments/lexers/special.pyo
 ${PYSITELIB}/pygments/lexers/sql.py
 ${PYSITELIB}/pygments/lexers/sql.pyc
 ${PYSITELIB}/pygments/lexers/sql.pyo
+${PYSITELIB}/pygments/lexers/supercollider.py
+${PYSITELIB}/pygments/lexers/supercollider.pyc
+${PYSITELIB}/pygments/lexers/supercollider.pyo
 ${PYSITELIB}/pygments/lexers/tcl.py
 ${PYSITELIB}/pygments/lexers/tcl.pyc
 ${PYSITELIB}/pygments/lexers/tcl.pyo
@@ -372,6 +420,9 @@ ${PYSITELIB}/pygments/lexers/textfmts.pyo
 ${PYSITELIB}/pygments/lexers/theorem.py
 ${PYSITELIB}/pygments/lexers/theorem.pyc
 ${PYSITELIB}/pygments/lexers/theorem.pyo
+${PYSITELIB}/pygments/lexers/trafficscript.py
+${PYSITELIB}/pygments/lexers/trafficscript.pyc
+${PYSITELIB}/pygments/lexers/trafficscript.pyo
 ${PYSITELIB}/pygments/lexers/urbi.py
 ${PYSITELIB}/pygments/lexers/urbi.pyc
 ${PYSITELIB}/pygments/lexers/urbi.pyo
@@ -381,6 +432,9 @@ ${PYSITELIB}/pygments/lexers/web.pyo
 ${PYSITELIB}/pygments/lexers/webmisc.py
 ${PYSITELIB}/pygments/lexers/webmisc.pyc
 ${PYSITELIB}/pygments/lexers/webmisc.pyo
+${PYSITELIB}/pygments/lexers/x10.py
+${PYSITELIB}/pygments/lexers/x10.pyc
+${PYSITELIB}/pygments/lexers/x10.pyo
 ${PYSITELIB}/pygments/modeline.py
 ${PYSITELIB}/pygments/modeline.pyc
 ${PYSITELIB}/pygments/modeline.pyo
@@ -402,6 +456,15 @@ ${PYSITELIB}/pygments/style.pyo
 ${PYSITELIB}/pygments/styles/__init__.py
 ${PYSITELIB}/pygments/styles/__init__.pyc
 ${PYSITELIB}/pygments/styles/__init__.pyo
+${PYSITELIB}/pygments/styles/algol.py
+${PYSITELIB}/pygments/styles/algol.pyc
+${PYSITELIB}/pygments/styles/algol.pyo
+${PYSITELIB}/pygments/styles/algol_nu.py
+${PYSITELIB}/pygments/styles/algol_nu.pyc
+${PYSITELIB}/pygments/styles/algol_nu.pyo
+${PYSITELIB}/pygments/styles/arduino.py
+${PYSITELIB}/pygments/styles/arduino.pyc
+${PYSITELIB}/pygments/styles/arduino.pyo
 ${PYSITELIB}/pygments/styles/autumn.py
 ${PYSITELIB}/pygments/styles/autumn.pyc
 ${PYSITELIB}/pygments/styles/autumn.pyo
@@ -429,6 +492,9 @@ ${PYSITELIB}/pygments/styles/fruity.pyo
 ${PYSITELIB}/pygments/styles/igor.py
 ${PYSITELIB}/pygments/styles/igor.pyc
 ${PYSITELIB}/pygments/styles/igor.pyo
+${PYSITELIB}/pygments/styles/lovelace.py
+${PYSITELIB}/pygments/styles/lovelace.pyc
+${PYSITELIB}/pygments/styles/lovelace.pyo
 ${PYSITELIB}/pygments/styles/manni.py
 ${PYSITELIB}/pygments/styles/manni.pyc
 ${PYSITELIB}/pygments/styles/manni.pyo
diff --git a/textproc/py-pygments/distinfo b/textproc/py-pygments/distinfo
index 2f5956dc080..d414c958dbb 100644
--- a/textproc/py-pygments/distinfo
+++ b/textproc/py-pygments/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2016/01/17 14:22:11 wiz Exp $
+$NetBSD: distinfo,v 1.14 2016/12/15 09:42:49 adam Exp $
 
-SHA1 (Pygments-2.0.2.tar.gz) = fe2c8178a039b6820a7a86b2132a2626df99c7f8
-RMD160 (Pygments-2.0.2.tar.gz) = 196e926dc40ffc34a68783882cbe3f0f0aa8f6d8
-SHA512 (Pygments-2.0.2.tar.gz) = b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e
-Size (Pygments-2.0.2.tar.gz) = 3462280 bytes
-SHA1 (patch-img.py) = 420a59570c628a3056e585b932b30ac1dbde23a1
+SHA1 (Pygments-2.1.3.tar.gz) = ecc79e8a3cd5abbaffe33f78061be70a34ebe994
+RMD160 (Pygments-2.1.3.tar.gz) = 164f2442fa402b7c9d34bfc39cca3f1f4e13b984
+SHA512 (Pygments-2.1.3.tar.gz) = f6885abfa0033dc2b8894649c7a4626165af01e69268344f002efdfc536c776a9af86be4e76e5905bd31cb78096e1ed3c16d9dd4b29c6a97b4c9cc1bfd7a5b67
+Size (Pygments-2.1.3.tar.gz) = 2116434 bytes
diff --git a/textproc/py-pygments/patches/patch-img.py b/textproc/py-pygments/patches/patch-img.py
deleted file mode 100644
index f951174f76f..00000000000
--- a/textproc/py-pygments/patches/patch-img.py
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-img.py,v 1.1 2016/01/17 14:22:11 wiz Exp $
-
-Fix for code-injection vulnerability (CVE-2015-8557) from upstream.
-
-The following patch includes changes made by commits 6b4baae, 0036ab1,
-3982887, and 91624f2. Avoid the shell entirely when finding fonts, and
-misc bug fixes.
-
-See more details:
-https://bitbucket.org/birkenfeld/pygments-main/history-node/e0bf451e64fd/pygments/formatters/img.py
-
---- pygments/formatters/img.py.orig	2016-01-17 02:49:19.000000000 +0900
-+++ pygments/formatters/img.py	2016-01-17 02:49:23.000000000 +0900
-@@ -5,7 +5,7 @@
- 
-     Formatter for Pixmap output.
- 
--    :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
-+    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
-     :license: BSD, see LICENSE for details.
- """
- 
-@@ -15,6 +15,8 @@
- from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
-     get_choice_opt, xrange
- 
-+import subprocess
-+
- # Import this carefully
- try:
-     from PIL import Image, ImageDraw, ImageFont
-@@ -75,16 +77,13 @@
-             self._create_nix()
- 
-     def _get_nix_font_path(self, name, style):
--        try:
--            from commands import getstatusoutput
--        except ImportError:
--            from subprocess import getstatusoutput
--        exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
--                                    (name, style))
--        if not exit:
--            lines = out.splitlines()
-+        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
-+                                stdout=subprocess.PIPE, stderr=None)
-+        stdout, _ = proc.communicate()
-+        if proc.returncode == 0:
-+            lines = stdout.splitlines()
-             if lines:
--                path = lines[0].strip().strip(':')
-+                path = lines[0].decode().strip().strip(':')
-                 return path
- 
-     def _create_nix(self):
-@@ -197,7 +196,7 @@
-         bold and italic fonts will be generated.  This really should be a
-         monospace font to look sane.
- 
--        Default: "Bitstream Vera Sans Mono"
-+        Default: "Bitstream Vera Sans Mono" on Windows, Courier New on \*nix
- 
-     `font_size`
-         The font size in points to be used.