On 2019/11/10 15:12, Stuart Henderson wrote:
> On 2019/11/10 17:02, Paul Irofti wrote:
> > Hi,
> >
> > Here is a kick in the butt straight to 2019 for py-dot. OK?
> >
> > Paul
>
> Either it needs dual py2/py3 support, or security/boofuzz needs switching to
> py3 and net/py-impacket needs updating to a version with py3 support.
>
like this (also makes the tests work) -
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/py-dot/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 12 Jul 2019 20:47:08 -0000 1.20
+++ Makefile 10 Nov 2019 15:22:01 -0000
@@ -2,8 +2,7 @@
COMMENT= Python interface to Graphviz's Dot#'
-MODPY_EGG_VERSION= 1.0.28
-REVISION= 2
+MODPY_EGG_VERSION= 1.4.1
DISTNAME= pydot-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:S/py/py-/}
CATEGORIES= graphics
@@ -13,14 +12,23 @@ HOMEPAGE= https://github.com/erocarrera/
# MIT
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=pydot/}
+FLAVORS= python3
+FLAVOR?=
MODULES= lang/python
-BUILD_DEPENDS= devel/py-parsing
-RUN_DEPENDS= devel/py-parsing \
+MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
+
+BUILD_DEPENDS= devel/py-parsing${MODPY_FLAVOR}
+RUN_DEPENDS= devel/py-parsing${MODPY_FLAVOR} \
math/graphviz
-NO_TEST= Yes
+TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH} \
+ devel/py-hypothesis${MODPY_FLAVOR} \
+ textproc/py-chardet${MODPY_FLAVOR}
+
+do-test:
+ cd ${WRKSRC}/test; ${MODPY_BIN} pydot_unittest.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/py-dot/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 30 Oct 2012 14:28:04 -0000 1.5
+++ distinfo 10 Nov 2019 15:22:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (pydot-1.0.28.tar.gz) = Hur/exBPuPMFqYMY2v3gstFfHvzfixYgZGVVHNRu2d8=
-SIZE (pydot-1.0.28.tar.gz) = 19711
+SHA256 (pydot-1.4.1.tar.gz) = 1JydTdGRO+7CqZf4MVQ8jL1T5TWxpznpIWQv5BYjXwE=
+SIZE (pydot-1.4.1.tar.gz) = 128236
Index: patches/patch-dot_parser_py
===================================================================
RCS file: /cvs/ports/graphics/py-dot/patches/patch-dot_parser_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-dot_parser_py
--- patches/patch-dot_parser_py 13 Mar 2016 08:12:14 -0000 1.1
+++ patches/patch-dot_parser_py 10 Nov 2019 15:22:01 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-dot_parser_py,v 1.1 2016/03/13 08:12:14 shadchin Exp $
---- dot_parser.py.orig Tue Jan 3 05:23:26 2012
-+++ dot_parser.py Wed Mar 2 15:52:33 2016
-@@ -19,13 +19,17 @@ import glob
- import pydot
- import re
- import codecs
-+import string
-
- from pyparsing import __version__ as pyparsing_version
-
--from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase,
OneOrMore, ZeroOrMore,
-+from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word,
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 )
-+
-+printables = "".join( [ c for c in string.printable if c not in
string.whitespace ] )
-+_noncomma = "".join( [ c for c in printables if c != "," ] )
-
-
- class P_AttrList:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/py-dot/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 30 Oct 2012 14:28:04 -0000 1.3
+++ pkg/PLIST 10 Nov 2019 15:22:01 -0000
@@ -1,6 +1,11 @@
@comment $OpenBSD: PLIST,v 1.3 2012/10/30 14:28:04 sthen Exp $
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}dot_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pydot.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dot_parser.py
-lib/python${MODPY_VERSION}/site-packages/dot_parser.pyc
-lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pydot.py
-lib/python${MODPY_VERSION}/site-packages/pydot.pyc
