Attachment 157762 Details for Bug 200877 – patch

[patch] patch

py-glances_2.4.2.patch (text/plain), 3.18 KB, created by Gasol Wu on 2015-06-15 15:13:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gasol Wu

Created: 2015-06-15 15:13:15 UTC

Size: 3.18 KB

patch

obsolete

>diff -ruN /var/cache/portshaker/ports//sysutils/py-glances/Makefile ./Makefile
>--- /var/cache/portshaker/ports//sysutils/py-glances/Makefile	2015-05-08 04:24:15.000000000 +0800
>+++ ./Makefile	2015-06-15 14:10:32.000000000 +0800
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/sysutils/py-glances/Makefile 385665 2015-05-07 20:24:15Z mat $
> 
> PORTNAME=	glances
>-PORTVERSION=	2.1
>+PORTVERSION=	2.4.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	sysutils python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,10 +11,11 @@
> 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 NLS
>+OPTIONS_DEFINE=	DOCS
> OPTIONS_SUB=	yes
> 
> USE_GITHUB=	yes
>@@ -24,16 +25,11 @@
> 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
>+		man/man1/glances.1.gz
> 
> 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>
>diff -ruN /var/cache/portshaker/ports//sysutils/py-glances/distinfo ./distinfo
>--- /var/cache/portshaker/ports//sysutils/py-glances/distinfo	2015-05-08 04:24:15.000000000 +0800
>+++ ./distinfo	2015-06-15 14:10:32.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (nicolargo-glances-v2.1_GH0.tar.gz) = fe74ad039aca9c12b656c5e7d687599231e380c75235335860a608947f596976
>-SIZE (nicolargo-glances-v2.1_GH0.tar.gz) = 1779104
>+SHA256 (nicolargo-glances-v2.4.2_GH0.tar.gz) = 725e8d15e8347e5371e3b8c7c3e9f2e3c8389dd847f01a693ceae8c910d1b97c
>+SIZE (nicolargo-glances-v2.4.2_GH0.tar.gz) = 3077285
>diff -ruN /var/cache/portshaker/ports//sysutils/py-glances/files/patch-setup.py ./files/patch-setup.py
>--- /var/cache/portshaker/ports//sysutils/py-glances/files/patch-setup.py	2014-06-18 15:39:35.000000000 +0800
>+++ ./files/patch-setup.py	2015-06-15 14:10:32.000000000 +0800
>@@ -1,6 +1,6 @@
>---- ./setup.py.orig	2014-06-16 10:56:37.000000000 +0800
>-+++ ./setup.py	2014-06-16 10:57:02.000000000 +0800
>-@@ -11,8 +11,7 @@
>+--- 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']),
>@@ -9,15 +9,4 @@
> +        ('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
>-

Actions: View | Diff

Attachments on bug 200877: 157762 | 157763