Import of pkgsrc-2016Q3

graphics/py-dot/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/05/09 07:37:07 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/17 12:37:34 richard Exp $
 
-DISTNAME=	pydot-1.0.28
+DISTNAME=	pydot-1.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	graphics python
-MASTER_SITES=	http://pydot.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pydot/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/pydot/
@@ -13,12 +13,9 @@ LICENSE=      	mit
 DEPENDS+=	${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
 DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.0.28
-
 post-install:
-	${RM} ${DESTDIR}${PREFIX}/README
+	${RM} ${DESTDIR}${PREFIX}/README.md
 	${RM} ${DESTDIR}${PREFIX}/LICENSE
 
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

graphics/py-dot/PLIST

@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/19 20:15:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/08/17 12:37:34 richard Exp $
 ${PYSITELIB}/dot_parser.py
 ${PYSITELIB}/dot_parser.pyc
 ${PYSITELIB}/dot_parser.pyo
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pydot.py
 ${PYSITELIB}/pydot.pyc
 ${PYSITELIB}/pydot.pyo

graphics/py-dot/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2014/01/19 20:15:43 wiz Exp $
+$NetBSD: distinfo,v 1.3 2016/08/17 12:37:34 richard Exp $
 
-SHA1 (pydot-1.0.28.tar.gz) = 3945af1765943807d72e773c7ac853f008ebb0b2
-RMD160 (pydot-1.0.28.tar.gz) = a67336f5edf55a81fe654df3258a12a8ff92d4f6
-Size (pydot-1.0.28.tar.gz) = 19711 bytes
-SHA1 (patch-dot__parser.py) = 9ce92c76bb5878ac990a3557e550679364a2d7b2
+SHA1 (pydot-1.2.2.tar.gz) = 1f0813b6b0a1201a2a34affb0164e699df8327c0
+RMD160 (pydot-1.2.2.tar.gz) = 2311a2894262ca20baeb4abb4077a910283cfcc3
+SHA512 (pydot-1.2.2.tar.gz) = bde62da86d3d99fa45c4266e47be1b36e3fa746556064d1e15911abad6583fcd1020c9f1b6c8e73359e0d3a336ed0f19c95fd860627d99f8d3f20b98e454407a
+Size (pydot-1.2.2.tar.gz) = 20027 bytes

graphics/py-dot/patches/patch-dot__parser.py

@@ -1,23 +0,0 @@
-$NetBSD: patch-dot__parser.py,v 1.1 2014/01/19 20:15:43 wiz Exp $
-
-_noncomma is obsoleted in the latest pyparsing, fix to work with all versions.
-
---- dot_parser.py.orig	2012-01-02 23:23:26.000000000 +0000
-+++ dot_parser.py
-@@ -25,7 +25,7 @@ from pyparsing import __version__ as pyp
- from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
-     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
-     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
--    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
-+    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
- 
- 
- class P_AttrList:
-@@ -414,6 +414,7 @@ def graph_definition():
-         
-         double_quoted_string = QuotedString('"', multiline=True, unquoteResults=False) # dblQuotedString
- 
-+        _noncomma = "".join( [ c for c in printables if c != "," ] )
-         alphastring_ = OneOrMore(CharsNotIn(_noncomma + ' '))
- 
-         def parse_html(s, loc, toks):