5 files changed, 142 insertions, 9 deletions

diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index 204029e2bab5..7adb72ceee06 100644
--- a/sysutils/py-glances/Makefile
+++ b/sysutils/py-glances/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	glances
-PORTVERSION=	1.5.1
+PORTVERSION=	1.7.1
 CATEGORIES=	sysutils python
-MASTER_SITES=	https://github.com/downloads/nicolargo/glances/
+MASTER_SITES=	https://github.com/nicolargo/glances/archive/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	v${PORTVERSION}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	CLI curses based monitoring tool for GNU/Linux and BSD OS
@@ -15,12 +16,39 @@ LICENSE=	LGPL3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.0.0:${PORTSDIR}/devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0.4.1:${PORTSDIR}/sysutils/py-psutil
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 FETCH_ARGS=	-pRr
-USE_PYTHON=	2.6+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 PYDISTUTILS_PKGNAME=	Glances
 
-PLIST_FILES=	bin/glances \
-		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+OPTIONS_DEFINE=	NLS
+
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=		glances.1
+.endif
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+TRANSLATIONS=	es fr it pt_BR zh_CN
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-install:
+	@${MKDIR} ${PREFIX}/etc/glances
+	${INSTALL_DATA} ${WRKSRC}/glances/conf/glances.conf ${PREFIX}/etc/glances/glances.conf.sample
+.if !defined(NO_INSTALL_MANPAGES)
+	${INSTALL_MAN} ${WRKSRC}/docs/man/glances.1 ${MANPREFIX}/man/man1/
+.endif
+.if ${PORT_OPTIONS:MNLS}
+.for lang in ${TRANSLATIONS}
+	${INSTALL_DATA} ${WRKSRC}/i18n/${lang}/LC_MESSAGES/glances.mo \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-glances/distinfo b/sysutils/py-glances/distinfo
index 4d720b870a64..ba4dcbd629c0 100644
--- a/sysutils/py-glances/distinfo
+++ b/sysutils/py-glances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (glances-1.5.1.tar.gz) = a2d503510506014d1b417dddeab1f0a1022990ba54e0c7dd89da7b20f50d0583
-SIZE (glances-1.5.1.tar.gz) = 647418
+SHA256 (v1.7.1.tar.gz) = a681883dd6add6371e987bac2b2bbb2959f873283d833ec2e6f2e1e3707a5e3c
+SIZE (v1.7.1.tar.gz) = 693211
diff --git a/sysutils/py-glances/files/patch-setup.py b/sysutils/py-glances/files/patch-setup.py
new file mode 100644
index 000000000000..ffb1f194b86e
--- /dev/null
+++ b/sysutils/py-glances/files/patch-setup.py
@@ -0,0 +1,27 @@
+--- ./setup.py.orig	2013-08-20 19:49:41.000000000 +0800
++++ ./setup.py	2013-08-23 01:16:53.000000000 +0800
+@@ -11,10 +11,9 @@
+                            'docs/glances-doc.html',
+                            'glances/conf/glances.conf']),
+     ('share/doc/glances/images', glob.glob('docs/images/*.png')),
+-    ('share/glances/css', glob.glob('glances/data/css/*.css')),
+-    ('share/glances/html', glob.glob('glances/data/html/*.html')),
+-    ('share/glances/img', glob.glob('glances/data/img/*.png')),
+-    ('share/man/man1', ['docs/man/glances.1'])
++    ('glances/data/css', glob.glob('glances/data/css/*.css')),
++    ('glances/data/html', glob.glob('glances/data/html/*.html')),
++    ('glances/data/img', glob.glob('glances/data/img/*.png')),
+ ]
+ 
+ if hasattr(sys, 'real_prefix') or 'bsd' in sys.platform:
+@@ -23,10 +22,6 @@
+     etc_path = os.path.join('/etc', 'glances')
+ elif 'darwin' in sys.platform:
+     etc_path = os.path.join('/usr/local', 'etc', 'glances')
+-data_files.append((etc_path, ['glances/conf/glances.conf']))
+-
+-for mo in glob.glob('i18n/*/LC_MESSAGES/*.mo'):
+-    data_files.append((os.path.dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
+ 
+ setup(
+     name='Glances',
diff --git a/sysutils/py-glances/pkg-descr b/sysutils/py-glances/pkg-descr
index eee9e07dd4ae..48026bc7cc78 100644
--- a/sysutils/py-glances/pkg-descr
+++ b/sysutils/py-glances/pkg-descr
@@ -1,4 +1,4 @@
 Glances is a CLI curses based monitoring tool for GNU/Linux and BSD OS.
-Glances uses the PsUtil library to get information from your system.
+Uses the PsUtil library to get information from your system.
 
-WWW:	http://nicolargo.github.com/glances
+WWW: http://nicolargo.github.com/glances/
diff --git a/sysutils/py-glances/pkg-plist b/sysutils/py-glances/pkg-plist
new file mode 100644
index 000000000000..e31ff219b10c
--- /dev/null
+++ b/sysutils/py-glances/pkg-plist
@@ -0,0 +1,78 @@
+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/conf/glances-with-monitored.conf
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/glances/conf/glances.conf
+%%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
+%%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/conf
+@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