Attachment #157762 for bug #200877

View | Details | Raw Unified | Return to bug 200877
Collapse All | Expand All




# $FreeBSD: head/sysutils/py-glances/Makefile 385665 2015-05-07 20:24:15Z mat $

PORTNAME=	glances
PORTVERSION=	2.4.2
DISTVERSIONPREFIX=	v
CATEGORIES=	sysutils python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

COMMENT=	CLI curses based monitoring tool for GNU/Linux and BSD OS

LICENSE=	LGPL3
LICENSE_FILE=	${WRKSRC}/COPYING

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:${PORTSDIR}/sysutils/py-psutil

OPTIONS_DEFINE=	DOCS
OPTIONS_SUB=	yes

USE_GITHUB=	yes

USE_PYTHON=	autoplist distutils

PLIST_FILES=	%%ETCDIR%%/glances.conf.sample \
		man/man1/glances.1.gz
		%%NLS%%share/locale/de/LC_MESSAGES/glances.mo

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/
	${INSTALL_DATA} ${WRKSRC}/i18n/de/LC_MESSAGES/glances.mo \
		${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (nicolargo-glances-v2.1_GH0.tar.gz) = fe74ad039aca9c12b656c5e7d687599231e380c75235335860a608947f596976	1	SHA256 (nicolargo-glances-v2.4.2_GH0.tar.gz) = 725e8d15e8347e5371e3b8c7c3e9f2e3c8389dd847f01a693ceae8c910d1b97c
2	SIZE (nicolargo-glances-v2.1_GH0.tar.gz) = 1779104	2	SIZE (nicolargo-glances-v2.4.2_GH0.tar.gz) = 3077285




--- setup.py.orig	2015-06-15 02:42:15 UTC
+++ setup.py
@@ -15,8 +15,7 @@ def get_data_files():
     data_files = [
         ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
                                'conf/glances.conf', 'docs/glances-doc.html']),

+        ('share/doc/glances/images', glob.glob('docs/images/*.png'))
     ]
 
     if hasattr(sys, 'real_prefix') or 'bsd' in sys.platform:
@@ -23,10 +22,6 @@
         conf_path = os.path.join('/usr/local', 'etc', 'glances')
     elif 'win32' in sys.platform:
         conf_path = os.path.join(os.environ.get('APPDATA'), 'glances')
-    data_files.append((conf_path, ['conf/glances.conf']))
-
-    for mo in glob.glob('i18n/*/LC_MESSAGES/*.mo'):
-        data_files.append((os.path.dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
 
     return data_files
 

Return to bug 200877

Lines 2-8 Link Here

(-)./Makefile (-8 / +4 lines)
2	# $FreeBSD: head/sysutils/py-glances/Makefile 385665 2015-05-07 20:24:15Z mat $	2	# $FreeBSD: head/sysutils/py-glances/Makefile 385665 2015-05-07 20:24:15Z mat $
3		3
4	PORTNAME= glances	4	PORTNAME= glances
5	PORTVERSION= 2.1	5	PORTVERSION= 2.4.2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= sysutils python	7	CATEGORIES= sysutils python
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 11-20 Link Here
11	COMMENT= CLI curses based monitoring tool for GNU/Linux and BSD OS	11	COMMENT= CLI curses based monitoring tool for GNU/Linux and BSD OS
12		12
13	LICENSE= LGPL3	13	LICENSE= LGPL3
		14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:${PORTSDIR}/sysutils/py-psutil	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:${PORTSDIR}/sysutils/py-psutil
16		17
17	OPTIONS_DEFINE= DOCS NLS	18	OPTIONS_DEFINE= DOCS
18	OPTIONS_SUB= yes	19	OPTIONS_SUB= yes
19		20
20	USE_GITHUB= yes	21	USE_GITHUB= yes
Lines 24-39 Link Here
24	USE_PYTHON= autoplist distutils	25	USE_PYTHON= autoplist distutils
25		26
26	PLIST_FILES= %%ETCDIR%%/glances.conf.sample \	27	PLIST_FILES= %%ETCDIR%%/glances.conf.sample \
27	man/man1/glances.1.gz \	28	man/man1/glances.1.gz
28	%%NLS%%share/locale/de/LC_MESSAGES/glances.mo
29
30	NLS_USES= gettext
31		29
32	post-install:	30	post-install:
33	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/glances	31	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/glances
34	${INSTALL_DATA} ${WRKSRC}/conf/glances.conf ${STAGEDIR}${PREFIX}/etc/glances/glances.conf.sample	32	${INSTALL_DATA} ${WRKSRC}/conf/glances.conf ${STAGEDIR}${PREFIX}/etc/glances/glances.conf.sample
35	${INSTALL_MAN} ${WRKSRC}/man/glances.1 ${STAGEDIR}${MANPREFIX}/man/man1/	33	${INSTALL_MAN} ${WRKSRC}/man/glances.1 ${STAGEDIR}${MANPREFIX}/man/man1/
36	${INSTALL_DATA} ${WRKSRC}/i18n/de/LC_MESSAGES/glances.mo \
37	${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/
38		34
39	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)./files/patch-setup.py (-14 / +3 lines)
1	--- ./setup.py.orig 2014-06-16 10:56:37.000000000 +0800	1	--- setup.py.orig 2015-06-15 02:42:15 UTC
2	+++ ./setup.py 2014-06-16 10:57:02.000000000 +0800	2	+++ setup.py
3	@@ -11,8 +11,7 @@	3	@@ -15,8 +15,7 @@ def get_data_files():
4	data_files = [	4	data_files = [
5	('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',	5	('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
6	'conf/glances.conf', 'docs/glances-doc.html']),	6	'conf/glances.conf', 'docs/glances-doc.html']),
Lines 9-23 Link Here
9	+ ('share/doc/glances/images', glob.glob('docs/images/*.png'))	9	+ ('share/doc/glances/images', glob.glob('docs/images/*.png'))
10	]	10	]
11		11
12	if hasattr(sys, 'real_prefix') or 'bsd' in sys.platform:
13	@@ -23,10 +22,6 @@
14	conf_path = os.path.join('/usr/local', 'etc', 'glances')
15	elif 'win32' in sys.platform:
16	conf_path = os.path.join(os.environ.get('APPDATA'), 'glances')
17	- data_files.append((conf_path, ['conf/glances.conf']))
18	-
19	- for mo in glob.glob('i18n//LC_MESSAGES/.mo'):
20	- data_files.append((os.path.dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
21
22	return data_files	12	return data_files
23