py-Glances: Minor naming fixes

- Adds a "-" between the file and the python version.
- Removes patch on setup.py for sed(1) based substitution.
- Bumps the PKGREVISION

ok adam@

4 files changed, 17 insertions, 35 deletions

diff --git a/sysutils/py-Glances/Makefile b/sysutils/py-Glances/Makefile
index 7ee6b20848e..bc705c3c5cf 100644
--- a/sysutils/py-Glances/Makefile
+++ b/sysutils/py-Glances/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/10/10 12:38:40 fox Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/12 05:35:03 fox Exp $
 
 DISTNAME=	Glances-3.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=G/Glances/}
 
@@ -21,15 +22,14 @@ SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Set correct prefix in setup.py
 SUBST_FILES.prefix=	${WRKSRC}/setup.py
-SUBST_VARS.prefix=	PREFIX
-SUBST_VARS.prefix+=	PKGMANDIR
+SUBST_SED.prefix=	-e 's,share/man,${PKGMANDIR},'
 
 post-install:
 	cd ${DESTDIR}${PREFIX} && \
-	${MV} bin/glances bin/glances${PYVERSSUFFIX} && \
-	${MV} ${PKGMANDIR}/man1/glances.1 ${PKGMANDIR}/man1/glances${PYVERSSUFFIX}.1 && \
-	${MV} share/doc/glances share/doc/glances${PYVERSSUFFIX} && \
-	${MV} share/examples/glances share/examples/glances${PYVERSSUFFIX} || ${TRUE}
+	${MV} bin/glances bin/glances-${PYVERSSUFFIX} && \
+	${MV} ${PKGMANDIR}/man1/glances.1 ${PKGMANDIR}/man1/glances-${PYVERSSUFFIX}.1 && \
+	${MV} share/doc/glances share/doc/glances-${PYVERSSUFFIX} && \
+	${MV} share/examples/glances share/examples/glances-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-Glances/PLIST b/sysutils/py-Glances/PLIST
index cc57f392a06..5768d3aea73 100644
--- a/sysutils/py-Glances/PLIST
+++ b/sysutils/py-Glances/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/10 12:38:40 fox Exp $
-bin/glances${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.2 2019/10/12 05:35:03 fox Exp $
+bin/glances-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -423,11 +423,10 @@ ${PYSITELIB}/glances/web_list.pyo
 ${PYSITELIB}/glances/webserver.py
 ${PYSITELIB}/glances/webserver.pyc
 ${PYSITELIB}/glances/webserver.pyo
-man/man1/glances${PYVERSSUFFIX}.1
-share/doc/glances${PYVERSSUFFIX}/AUTHORS
-share/doc/glances${PYVERSSUFFIX}/CONTRIBUTING.md
-share/doc/glances${PYVERSSUFFIX}/COPYING
-share/doc/glances${PYVERSSUFFIX}/NEWS.rst
-share/doc/glances${PYVERSSUFFIX}/README.rst
-share/doc/glances${PYVERSSUFFIX}/glances.conf
-share/examples/glances${PYVERSSUFFIX}/glances.conf
+man/man1/glances-${PYVERSSUFFIX}.1
+share/doc/glances-${PYVERSSUFFIX}/AUTHORS
+share/doc/glances-${PYVERSSUFFIX}/CONTRIBUTING.md
+share/doc/glances-${PYVERSSUFFIX}/COPYING
+share/doc/glances-${PYVERSSUFFIX}/NEWS.rst
+share/doc/glances-${PYVERSSUFFIX}/README.rst
+share/doc/glances-${PYVERSSUFFIX}/glances.conf
diff --git a/sysutils/py-Glances/distinfo b/sysutils/py-Glances/distinfo
index 05a7cdde588..85fc20b79ca 100644
--- a/sysutils/py-Glances/distinfo
+++ b/sysutils/py-Glances/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2019/10/10 12:38:40 fox Exp $
+$NetBSD: distinfo,v 1.2 2019/10/12 05:35:03 fox Exp $
 
 SHA1 (Glances-3.1.2.tar.gz) = 173a5553336a91ae84c9017988ad3713a13cec08
 RMD160 (Glances-3.1.2.tar.gz) = ecf801eee82a575b06edfaf08a4ba48d77a8d092
 SHA512 (Glances-3.1.2.tar.gz) = 3ccf82b0b5742c07a044112cedf10b56a6e615a4e01e18c7b18fa426f922119d7623e4c0c6cd92fb6c54f82ef79718eb16a187a9e4c2d4484ad8e41a89eccfc6
 Size (Glances-3.1.2.tar.gz) = 6713025 bytes
-SHA1 (patch-setup.py) = d3b2da65fac43a4ef2471d0d5bde42a2852a1457
diff --git a/sysutils/py-Glances/patches/patch-setup.py b/sysutils/py-Glances/patches/patch-setup.py
deleted file mode 100644
index 0c364e7d4d5..00000000000
--- a/sysutils/py-Glances/patches/patch-setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2019/10/10 12:38:40 fox Exp $
-
-Fixes paths of the man page and sample configuration file.
-
---- setup.py.orig	2019-08-26 16:48:11.736098643 +0000
-+++ setup.py
-@@ -34,7 +34,8 @@ def get_data_files():
-     data_files = [
-         ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS.rst', 'README.rst',
-                                'CONTRIBUTING.md', 'conf/glances.conf']),
--        ('share/man/man1', ['docs/man/glances.1'])
-+        ('@PREFIX@/share/examples/glances', ['conf/glances.conf']),
-+        ('@PREFIX@/@PKGMANDIR@/man1', ['docs/man/glances.1'])
-     ]
- 
-     return data_files