3 files changed, 19 insertions, 85 deletions

diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index c1fd8cafde93..ca845be04453 100644
--- a/sysutils/py-glances/Makefile
+++ b/sysutils/py-glances/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	glances
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.6
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://github.com/nicolargo/glances/archive/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,24 +14,34 @@ COMMENT=	CLI curses based monitoring tool for GNU/Linux and BSD OS
 LICENSE=	LGPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.0.0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}psutil121>=1.2.1:${PORTSDIR}/sysutils/py-psutil121
+		${PYTHON_PKGNAMEPREFIX}psutil>=2.0.0:${PORTSDIR}/sysutils/py-psutil
 
-OPTIONS_DEFINE=	MANPAGES NLS
+OPTIONS_DEFINE=	DOCS MANPAGES NLS
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-PYDISTUTILS_PKGNAME=	Glances
+USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
+
+PLIST_FILES=	bin/glances \
+		%%ETCDIR%%/glances.conf.sample \
+		%%MANPAGES%%man/man1/glances.1.gz \
+		%%NLS%%share/locale/es/LC_MESSAGES/glances.mo \
+		%%NLS%%share/locale/fr/LC_MESSAGES/glances.mo \
+		%%NLS%%share/locale/it/LC_MESSAGES/glances.mo \
+		%%NLS%%share/locale/pt_BR/LC_MESSAGES/glances.mo \
+		%%NLS%%share/locale/zh_CN/LC_MESSAGES/glances.mo
+PLIST_DIRS=	etc/glances
+PORTDOCS=	*
 
-NLS_TRANSLATIONS=	es fr it pt_BR zh_CN
 NLS_USES=		gettext
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/glances
 	${INSTALL_DATA} ${WRKSRC}/conf/glances.conf ${STAGEDIR}${PREFIX}/etc/glances/glances.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/man/glances.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-.for lang in ${NLS_TRANSLATIONS}
+.for lang in es fr it pt_BR zh_CN
 	${INSTALL_DATA} ${WRKSRC}/i18n/${lang}/LC_MESSAGES/glances.mo \
 		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/
 .endfor
diff --git a/sysutils/py-glances/distinfo b/sysutils/py-glances/distinfo
index b9cdd3a3d367..7e6047f39745 100644
--- a/sysutils/py-glances/distinfo
+++ b/sysutils/py-glances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (v1.7.5.tar.gz) = 1598d1c10f1d2b59ea8d90d5be899fd151b4af28640c6daae23258dc76f659fe
-SIZE (v1.7.5.tar.gz) = 591977
+SHA256 (v1.7.6.tar.gz) = 7d026bd6f0289e88a9acd3be813eb5288a2af2216bab7086a58bf560dc781279
+SIZE (v1.7.6.tar.gz) = 592197
diff --git a/sysutils/py-glances/pkg-plist b/sysutils/py-glances/pkg-plist
deleted file mode 100644
index 21758a32206b..000000000000
--- a/sysutils/py-glances/pkg-plist
+++ /dev/null
@@ -1,76 +0,0 @@
-bin/glances
-etc/glances/glances.conf.sample
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/css/default.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/html/base.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/html/default.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/img/bg.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/glances.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/glances.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/glances.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/AUTHORS
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/COPYING
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/NEWS
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/README.rst
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/glances-doc.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/glances.conf
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/battery.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/client-connected.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/client-disconnected.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/cpu-wide.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/cpu.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/diskio.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/footer.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/fs.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/glances-white-256.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/hddtemp.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/header.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/load.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/logs.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/mem-wide.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/mem.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/monitored.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/network.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/per-cpu.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/processlist-wide.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/processlist.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/screenshot-wide.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/screenshot.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images/sensors.png
-%%MANPAGES%%man/man1/glances.1.gz
-%%NLS%%share/locale/es/LC_MESSAGES/glances.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/glances.mo
-%%NLS%%share/locale/it/LC_MESSAGES/glances.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/glances.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/glances.mo
-@dirrm etc/glances
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances/images
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/glances
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/css
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/html
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data/img
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/data
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es