kitty: fix pycache version in PLIST.

2 files changed, 79 insertions, 72 deletions

diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index c3b9b65f577..195aac39f9b 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/11/28 18:48:58 nia Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/28 19:09:19 nia Exp $
 
 DISTNAME=	kitty-0.12.3
 CATEGORIES=	x11
@@ -30,6 +30,13 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27 34
 
 REPLACE_PYTHON+=	kitty/launcher/kitty
 
+PLIST_AWK+=		-f ../../lang/python/plist-python.awk
+PLIST_AWK_ENV+=		PYVERS="${PYVERSSUFFIX:S/.//}"
+PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.py[co]$$/ {
+PRINT_PLIST_AWK+=	gsub(/__pycache__\//, "")
+PRINT_PLIST_AWK+=	gsub(/opt-1\.pyc$$/, "pyo")
+PRINT_PLIST_AWK+=	gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
+
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 do-build:
diff --git a/x11/kitty/PLIST b/x11/kitty/PLIST
index b5bad5f0f1f..9663c140974 100644
--- a/x11/kitty/PLIST
+++ b/x11/kitty/PLIST
@@ -1,28 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1 2018/11/28 18:48:58 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/11/28 19:09:19 nia Exp $
 bin/kitty
 lib/kitty/__main__.py
-lib/kitty/__pycache__/__main__.cpython-37.opt-1.pyc
+lib/kitty/__main__.pyo
 lib/kitty/kittens/__init__.py
-lib/kitty/kittens/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/__pycache__/runner.cpython-37.opt-1.pyc
+lib/kitty/kittens/__init__.pyo
+lib/kitty/kittens/runner.pyo
 lib/kitty/kittens/ask/__init__.py
-lib/kitty/kittens/ask/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/ask/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/ask/__init__.pyo
+lib/kitty/kittens/ask/main.pyo
 lib/kitty/kittens/ask/main.py
 lib/kitty/kittens/clipboard/__init__.py
-lib/kitty/kittens/clipboard/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/clipboard/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/clipboard/__init__.pyo
+lib/kitty/kittens/clipboard/main.pyo
 lib/kitty/kittens/clipboard/main.py
 lib/kitty/kittens/diff/__init__.py
-lib/kitty/kittens/diff/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/collect.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/config.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/config_data.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/highlight.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/main.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/patch.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/render.cpython-37.opt-1.pyc
-lib/kitty/kittens/diff/__pycache__/search.cpython-37.opt-1.pyc
+lib/kitty/kittens/diff/__init__.pyo
+lib/kitty/kittens/diff/collect.pyo
+lib/kitty/kittens/diff/config.pyo
+lib/kitty/kittens/diff/config_data.pyo
+lib/kitty/kittens/diff/highlight.pyo
+lib/kitty/kittens/diff/main.pyo
+lib/kitty/kittens/diff/patch.pyo
+lib/kitty/kittens/diff/render.pyo
+lib/kitty/kittens/diff/search.pyo
 lib/kitty/kittens/diff/collect.py
 lib/kitty/kittens/diff/config.py
 lib/kitty/kittens/diff/config_data.py
@@ -33,74 +33,74 @@ lib/kitty/kittens/diff/patch.py
 lib/kitty/kittens/diff/render.py
 lib/kitty/kittens/diff/search.py
 lib/kitty/kittens/hints/__init__.py
-lib/kitty/kittens/hints/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/hints/__pycache__/main.cpython-37.opt-1.pyc
-lib/kitty/kittens/hints/__pycache__/url_regex.cpython-37.opt-1.pyc
+lib/kitty/kittens/hints/__init__.pyo
+lib/kitty/kittens/hints/main.pyo
+lib/kitty/kittens/hints/url_regex.pyo
 lib/kitty/kittens/hints/main.py
 lib/kitty/kittens/hints/url_regex.py
 lib/kitty/kittens/icat/__init__.py
-lib/kitty/kittens/icat/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/icat/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/icat/__init__.pyo
+lib/kitty/kittens/icat/main.pyo
 lib/kitty/kittens/icat/main.py
 lib/kitty/kittens/panel/__init__.py
-lib/kitty/kittens/panel/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/panel/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/panel/__init__.pyo
+lib/kitty/kittens/panel/main.pyo
 lib/kitty/kittens/panel/main.py
 lib/kitty/kittens/resize_window/__init__.py
-lib/kitty/kittens/resize_window/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/resize_window/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/resize_window/__init__.pyo
+lib/kitty/kittens/resize_window/main.pyo
 lib/kitty/kittens/resize_window/main.py
 lib/kitty/kittens/runner.py
 lib/kitty/kittens/show_error/__init__.py
-lib/kitty/kittens/show_error/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/show_error/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/show_error/__init__.pyo
+lib/kitty/kittens/show_error/main.pyo
 lib/kitty/kittens/show_error/main.py
 lib/kitty/kittens/ssh/__init__.py
-lib/kitty/kittens/ssh/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/ssh/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/ssh/__init__.pyo
+lib/kitty/kittens/ssh/main.pyo
 lib/kitty/kittens/ssh/main.py
 lib/kitty/kittens/tui/__init__.py
-lib/kitty/kittens/tui/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/tui/__pycache__/handler.cpython-37.opt-1.pyc
-lib/kitty/kittens/tui/__pycache__/images.cpython-37.opt-1.pyc
-lib/kitty/kittens/tui/__pycache__/line_edit.cpython-37.opt-1.pyc
-lib/kitty/kittens/tui/__pycache__/loop.cpython-37.opt-1.pyc
-lib/kitty/kittens/tui/__pycache__/operations.cpython-37.opt-1.pyc
+lib/kitty/kittens/tui/__init__.pyo
+lib/kitty/kittens/tui/handler.pyo
+lib/kitty/kittens/tui/images.pyo
+lib/kitty/kittens/tui/line_edit.pyo
+lib/kitty/kittens/tui/loop.pyo
+lib/kitty/kittens/tui/operations.pyo
 lib/kitty/kittens/tui/handler.py
 lib/kitty/kittens/tui/images.py
 lib/kitty/kittens/tui/line_edit.py
 lib/kitty/kittens/tui/loop.py
 lib/kitty/kittens/tui/operations.py
 lib/kitty/kittens/unicode_input/__init__.py
-lib/kitty/kittens/unicode_input/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kittens/unicode_input/__pycache__/main.cpython-37.opt-1.pyc
+lib/kitty/kittens/unicode_input/__init__.pyo
+lib/kitty/kittens/unicode_input/main.pyo
 lib/kitty/kittens/unicode_input/main.py
 lib/kitty/kittens/unicode_input/unicode_names.so
 lib/kitty/kitty/__init__.py
-lib/kitty/kitty/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/borders.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/boss.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/child.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/cli.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/client.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/cmds.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/complete.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/config.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/config_data.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/constants.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/key_encoding.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/keys.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/layout.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/main.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/remote_control.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/rgb.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/session.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/shell.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/tab_bar.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/tabs.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/terminfo.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/utils.cpython-37.opt-1.pyc
-lib/kitty/kitty/__pycache__/window.cpython-37.opt-1.pyc
+lib/kitty/kitty/__init__.pyo
+lib/kitty/kitty/borders.pyo
+lib/kitty/kitty/boss.pyo
+lib/kitty/kitty/child.pyo
+lib/kitty/kitty/cli.pyo
+lib/kitty/kitty/client.pyo
+lib/kitty/kitty/cmds.pyo
+lib/kitty/kitty/complete.pyo
+lib/kitty/kitty/config.pyo
+lib/kitty/kitty/config_data.pyo
+lib/kitty/kitty/constants.pyo
+lib/kitty/kitty/key_encoding.pyo
+lib/kitty/kitty/keys.pyo
+lib/kitty/kitty/layout.pyo
+lib/kitty/kitty/main.pyo
+lib/kitty/kitty/remote_control.pyo
+lib/kitty/kitty/rgb.pyo
+lib/kitty/kitty/session.pyo
+lib/kitty/kitty/shell.pyo
+lib/kitty/kitty/tab_bar.pyo
+lib/kitty/kitty/tabs.pyo
+lib/kitty/kitty/terminfo.pyo
+lib/kitty/kitty/utils.pyo
+lib/kitty/kitty/window.pyo
 lib/kitty/kitty/blit_fragment.glsl
 lib/kitty/kitty/blit_vertex.glsl
 lib/kitty/kitty/border_fragment.glsl
@@ -115,9 +115,9 @@ lib/kitty/kitty/client.py
 lib/kitty/kitty/cmds.py
 lib/kitty/kitty/complete.py
 lib/kitty/kitty/conf/__init__.py
-lib/kitty/kitty/conf/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kitty/conf/__pycache__/definition.cpython-37.opt-1.pyc
-lib/kitty/kitty/conf/__pycache__/utils.cpython-37.opt-1.pyc
+lib/kitty/kitty/conf/__init__.pyo
+lib/kitty/kitty/conf/definition.pyo
+lib/kitty/kitty/conf/utils.pyo
 lib/kitty/kitty/conf/definition.py
 lib/kitty/kitty/conf/utils.py
 lib/kitty/kitty/config.py
@@ -125,12 +125,12 @@ lib/kitty/kitty/config_data.py
 lib/kitty/kitty/constants.py
 lib/kitty/kitty/fast_data_types.so
 lib/kitty/kitty/fonts/__init__.py
-lib/kitty/kitty/fonts/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/kitty/kitty/fonts/__pycache__/box_drawing.cpython-37.opt-1.pyc
-lib/kitty/kitty/fonts/__pycache__/core_text.cpython-37.opt-1.pyc
-lib/kitty/kitty/fonts/__pycache__/fontconfig.cpython-37.opt-1.pyc
-lib/kitty/kitty/fonts/__pycache__/list.cpython-37.opt-1.pyc
-lib/kitty/kitty/fonts/__pycache__/render.cpython-37.opt-1.pyc
+lib/kitty/kitty/fonts/__init__.pyo
+lib/kitty/kitty/fonts/box_drawing.pyo
+lib/kitty/kitty/fonts/core_text.pyo
+lib/kitty/kitty/fonts/fontconfig.pyo
+lib/kitty/kitty/fonts/list.pyo
+lib/kitty/kitty/fonts/render.pyo
 lib/kitty/kitty/fonts/box_drawing.py
 lib/kitty/kitty/fonts/core_text.py
 lib/kitty/kitty/fonts/fontconfig.py