Wed Nov 28 19:28:37 2018 UTC ()
kitty: Deal with the PLIST thing properly. Pointed out by leot.


(nia)
diff -r1.2 -r1.3 pkgsrc/x11/kitty/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/kitty/PLIST
cvs diff -r1.2 -r1.3 pkgsrc/x11/kitty/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kitty/Makefile 2018/11/28 19:09:19 1.2
+++ pkgsrc/x11/kitty/Makefile 2018/11/28 19:28:37 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2018/11/28 19:09:19 nia Exp $ 1# $NetBSD: Makefile,v 1.3 2018/11/28 19:28:37 nia Exp $
2 2
3DISTNAME= kitty-0.12.3 3DISTNAME= kitty-0.12.3
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_GITHUB:=kovidgoyal/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=kovidgoyal/}
6GITHUB_PROJECT= kitty 6GITHUB_PROJECT= kitty
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
10HOMEPAGE= https://sw.kovidgoyal.net/kitty/index.html 10HOMEPAGE= https://sw.kovidgoyal.net/kitty/index.html
11COMMENT= GPU based terminal emulator 11COMMENT= GPU based terminal emulator
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
@@ -20,33 +20,26 @@ SUBST_STAGE.python= pre-build @@ -20,33 +20,26 @@ SUBST_STAGE.python= pre-build
20SUBST_MESSAGE.python= Replace path of Python interpreter. 20SUBST_MESSAGE.python= Replace path of Python interpreter.
21SUBST_FILES.python+= Makefile 21SUBST_FILES.python+= Makefile
22SUBST_FILES.python+= docs/Makefile 22SUBST_FILES.python+= docs/Makefile
23SUBST_SED.python+= -e "s,python3,python${PYVERSSUFFIX},g" 23SUBST_SED.python+= -e "s,python3,python${PYVERSSUFFIX},g"
24SUBST_SED.python+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},g" 24SUBST_SED.python+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},g"
25 25
26BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools 26BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
27BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 27BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
28 28
29PYTHON_VERSIONS_INCOMPATIBLE= 27 34 29PYTHON_VERSIONS_INCOMPATIBLE= 27 34
30 30
31REPLACE_PYTHON+= kitty/launcher/kitty 31REPLACE_PYTHON+= kitty/launcher/kitty
32 32
33PLIST_AWK+= -f ../../lang/python/plist-python.awk 
34PLIST_AWK_ENV+= PYVERS="${PYVERSSUFFIX:S/.//}" 
35PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py[co]$$/ { 
36PRINT_PLIST_AWK+= gsub(/__pycache__\//, "") 
37PRINT_PLIST_AWK+= gsub(/opt-1\.pyc$$/, "pyo") 
38PRINT_PLIST_AWK+= gsub(/\.cpython-${_PYTHON_VERSION}/, "")} 
39 
40INSTALLATION_DIRS+= ${PKGMANDIR}/man1 33INSTALLATION_DIRS+= ${PKGMANDIR}/man1
41 34
42do-build: 35do-build:
43 cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package 36 cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package
44 cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} man 37 cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} man
45 38
46do-install: 39do-install:
47 cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package \ 40 cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package \
48 --prefix ${DESTDIR}${PREFIX} 41 --prefix ${DESTDIR}${PREFIX}
49 ${INSTALL_DATA} ${WRKSRC}/man/man1/kitty.1 \ 42 ${INSTALL_DATA} ${WRKSRC}/man/man1/kitty.1 \
50 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kitty.1 43 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kitty.1
51 44
52.include "../../mk/bsd.prefs.mk" 45.include "../../mk/bsd.prefs.mk"
@@ -58,17 +51,18 @@ do-install: @@ -58,17 +51,18 @@ do-install:
58 51
59.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 52.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
60.include "../../devel/zlib/buildlink3.mk" 53.include "../../devel/zlib/buildlink3.mk"
61.include "../../fonts/harfbuzz/buildlink3.mk" 54.include "../../fonts/harfbuzz/buildlink3.mk"
62.include "../../graphics/MesaLib/buildlink3.mk" 55.include "../../graphics/MesaLib/buildlink3.mk"
63.include "../../graphics/png/buildlink3.mk" 56.include "../../graphics/png/buildlink3.mk"
64.include "../../sysutils/dbus/buildlink3.mk" 57.include "../../sysutils/dbus/buildlink3.mk"
65.include "../../x11/libXcursor/buildlink3.mk" 58.include "../../x11/libXcursor/buildlink3.mk"
66.include "../../x11/libXi/buildlink3.mk" 59.include "../../x11/libXi/buildlink3.mk"
67.include "../../x11/libXinerama/buildlink3.mk" 60.include "../../x11/libXinerama/buildlink3.mk"
68.include "../../x11/libXrandr/buildlink3.mk" 61.include "../../x11/libXrandr/buildlink3.mk"
69.include "../../x11/libxkbcommon/buildlink3.mk" 62.include "../../x11/libxkbcommon/buildlink3.mk"
70.include "../../lang/python/application.mk" 63.include "../../lang/python/application.mk"
 64.include "../../lang/python/extension.mk"
71.include "../../mk/pthread.buildlink3.mk" 65.include "../../mk/pthread.buildlink3.mk"
72.include "../../mk/dlopen.buildlink3.mk" 66.include "../../mk/dlopen.buildlink3.mk"
73BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 67BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
74.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/kitty/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/kitty/PLIST 2018/11/28 19:09:19 1.2
+++ pkgsrc/x11/kitty/PLIST 2018/11/28 19:28:37 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2018/11/28 19:09:19 nia Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/11/28 19:28:37 nia Exp $
2bin/kitty 2bin/kitty
3lib/kitty/__main__.py 3lib/kitty/__main__.py
4lib/kitty/__main__.pyo 4lib/kitty/__main__.pyo
5lib/kitty/kittens/__init__.py 5lib/kitty/kittens/__init__.py
6lib/kitty/kittens/__init__.pyo 6lib/kitty/kittens/__init__.pyo
7lib/kitty/kittens/runner.pyo 7lib/kitty/kittens/runner.pyo
8lib/kitty/kittens/ask/__init__.py 8lib/kitty/kittens/ask/__init__.py
9lib/kitty/kittens/ask/__init__.pyo 9lib/kitty/kittens/ask/__init__.pyo
10lib/kitty/kittens/ask/main.pyo 10lib/kitty/kittens/ask/main.pyo
11lib/kitty/kittens/ask/main.py 11lib/kitty/kittens/ask/main.py
12lib/kitty/kittens/clipboard/__init__.py 12lib/kitty/kittens/clipboard/__init__.py
13lib/kitty/kittens/clipboard/__init__.pyo 13lib/kitty/kittens/clipboard/__init__.pyo
14lib/kitty/kittens/clipboard/main.pyo 14lib/kitty/kittens/clipboard/main.pyo