Attachment #211788 for bug #244257

Lines 18-21 Link Here

(-)Makefile (+4 lines)
18	USE_PYTHON= distutils autoplist	18	USE_PYTHON= distutils autoplist
19	NO_ARCH= yes	19	NO_ARCH= yes
20		20
		21	post-patch:
		22	${REINPLACE_CMD} 's\|%%PREFIX%%\|${PREFIX}\|; \
		23	s\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|' ${WRKSRC}/setup.cfg
		24
21	.include <bsd.port.mk>	25	.include <bsd.port.mk>




--- clitable.py.orig	2017-05-08 10:21:06 UTC
+++ clitable.py
@@ -29,9 +29,9 @@ import copy
 import os
 import re
 import threading
-import copyable_regex_object
-import textfsm
-import texttable
+import textfsm.copyable_regex_object as copyable_regex_object
+import textfsm.textfsm as textfsm
+import textfsm.texttable as texttable
 
 
 class Error(Exception):

Line 0 Link Here

(-)files/patch-setup.cfg (+11 lines)
	1	Install to alt location to avoid conflict with py-texttable.
	2
	3	--- setup.cfg.orig 2018-04-09 04:59:23 UTC
	4	+++ setup.cfg
	5	@@ -1,3 +1,6 @@
	6	+[install]
	7	+install_lib = /usr/local/lib/python3.7/site-packages/textfsm
	8	+
	9	[metadata]
	10	description-file = README.md
	11	universal = 1

Line 0 Link Here

(-)files/patch-texttable.py (+11 lines)
	1	--- texttable.py.orig 2017-05-08 08:39:48 UTC
	2	+++ texttable.py
	3	@@ -31,7 +31,7 @@ from functools import cmp_to_key
	4	import textwrap
	5	# pylint: disable=redefined-builtin
	6	from six.moves import range
	7	-import terminal
	8	+import textfsm.terminal as terminal
	9
	10
	11	class Error(Exception):

Return to bug 244257

Line 0 Link Here

(-)files/patch-clitable.py (+15 lines)
	1	--- clitable.py.orig 2017-05-08 10:21:06 UTC
	2	+++ clitable.py
	3	@@ -29,9 +29,9 @@ import copy
	4	import os
	5	import re
	6	import threading
	7	-import copyable_regex_object
	8	-import textfsm
	9	-import texttable
	10	+import textfsm.copyable_regex_object as copyable_regex_object
	11	+import textfsm.textfsm as textfsm
	12	+import textfsm.texttable as texttable
	13
	14
	15	class Error(Exception):