Attachment 205084 Details for Bug 238487 – conkyemail-2.15.patch

[patch] conkyemail-2.15.patch

conkyemail-2.15.patch (text/plain), 5.17 KB, created by Kai Knoblich on 2019-06-15 20:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-06-15 20:47:04 UTC

Size: 5.17 KB

patch

obsolete

>Index: deskutils/conkyemail/Makefile
>===================================================================
>--- deskutils/conkyemail/Makefile	(revision 504250)
>+++ deskutils/conkyemail/Makefile	(working copy)
>@@ -2,19 +2,23 @@
> # $FreeBSD$
> 
> PORTNAME=	conkyemail
>-PORTVERSION=	2.07
>-CATEGORIES=	deskutils
>-MASTER_SITES=	http://launchpadlibrarian.net/28462213/ \
>-		LOCAL/vg
>+PORTVERSION=	2.15
>+CATEGORIES=	deskutils python
>+MASTER_SITES=	https://launchpad.net/~conky-companions/+archive/ubuntu/ppa/+sourcefiles/${PORTNAME}/${PORTVERSION}/
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	katsubsd@gmail.com
> COMMENT=	Email script for conky
> 
>-RUN_DEPENDS=	conky:sysutils/conky
>+LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
>+		conky:sysutils/conky
>+
> USES=		python:2.7
>-USE_PYTHON=	distutils
>+USE_PYTHON=	autoplist distutils noflavors
>+
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>@@ -21,8 +25,10 @@
> WRKSRC=		${WRKDIR}/src
> 
> post-patch:
>-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \
>-		conkyEmail  conkyEmail.py setup.py example/conkyrc
>-	cd ${WRKSRC} && ${RM} -r example/conkyrc.bak
>+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g; \
>+					s,%%DATADIR%%,${DATADIR},; \
>+					s,%%PYTHON_CMD%%,${PYTHON_CMD},' \
>+		conkyEmail setup.py example/conkyrc
>+	@cd ${WRKSRC} && ${RM} -r example/conkyrc.bak
> 
> .include <bsd.port.mk>
>Index: deskutils/conkyemail/distinfo
>===================================================================
>--- deskutils/conkyemail/distinfo	(revision 504250)
>+++ deskutils/conkyemail/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (conkyemail_2.07.tar.gz) = 3e81e84d3d13f2a477d104b201edc75230472f30bbe591c3bcfc6122f2a1fb27
>-SIZE (conkyemail_2.07.tar.gz) = 190115
>+TIMESTAMP = 1560629529
>+SHA256 (conkyemail_2.15.tar.gz) = 65e411445abf54345e421b71e8bdd937374e9b9afa42581b2c279d9bae2a61e2
>+SIZE (conkyemail_2.15.tar.gz) = 191971
>Index: deskutils/conkyemail/files/patch-conkyEmail
>===================================================================
>--- deskutils/conkyemail/files/patch-conkyEmail	(revision 504250)
>+++ deskutils/conkyemail/files/patch-conkyEmail	(working copy)
>@@ -1,7 +1,25 @@
>---- conkyEmail.orig	2008-09-09 06:12:46.000000000 +0800
>-+++ conkyEmail	2010-05-08 02:28:45.000000000 +0800
>-@@ -1,3 +1,3 @@
>+--- conkyEmail.orig	2011-12-17 18:58:43 UTC
>++++ conkyEmail
>+@@ -1,17 +1,7 @@
>  #! /bin/sh
>- cd /usr/share/conkyemail/
>--$PYTHONPATH /usr/bin/python /usr/share/conkyemail/conkyEmail.py "$@"
>-+$PYTHONPATH /usr/bin/env python /usr/share/conkyemail/conkyEmail.py "$@"
>+-cd /usr/share/conkyemail/
>++cd %%DATADIR%%
>+ 
>+-if [ -f /usr/bin/python2 ]; then
>+-	pythoncmd="/usr/bin/python2"
>+-elif [ -f /usr/bin/python2.7 ] ; then
>+-	pythoncmd="/usr/bin/python2.7"
>+-elif [ -f /usr/bin/python2.6 ] ; then
>+-	pythoncmd="/usr/bin/python2.6"
>+-else
>+-	# here's hoping!
>+-	pythoncmd="/usr/bin/python"
>+-fi
>+-
>+-pythonfile="/usr/share/conkyemail/conkyEmail.py"
>++pythoncmd="%%PYTHON_CMD%%"
>++pythonfile="%%DATADIR%%/conkyEmail.py"
>+ 
>+-exec $pythoncmd $pythonfile "$@"
>+\ No newline at end of file
>++exec $pythoncmd $pythonfile "$@"
>Index: deskutils/conkyemail/files/patch-conkyEmail.py
>===================================================================
>--- deskutils/conkyemail/files/patch-conkyEmail.py	(revision 504250)
>+++ deskutils/conkyemail/files/patch-conkyEmail.py	(nonexistent)
>@@ -1,8 +0,0 @@
>---- conkyEmail.py.orig	2009-06-27 22:45:20.000000000 +0800
>-+++ conkyEmail.py	2010-05-08 02:31:30.000000000 +0800
>-@@ -1,4 +1,4 @@
>--#!/usr/bin/python
>-+#!/usr/bin/env python
>- # -*- coding: utf-8 -*-
>- ###############################################################################
>- # conkyEmail.py is a simple python script to gather
>
>Property changes on: deskutils/conkyemail/files/patch-conkyEmail.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: deskutils/conkyemail/pkg-plist
>===================================================================
>--- deskutils/conkyemail/pkg-plist	(revision 504250)
>+++ deskutils/conkyemail/pkg-plist	(nonexistent)
>@@ -1,8 +0,0 @@
>-bin/conkyEmail
>-%%DATADIR%%/conkyEmail.py
>-%%DATADIR%%/example/conkyrc
>-%%DATADIR%%/example/conkyEmail.template
>-@comment %%PYTHON_SITELIBDIR%%/conkyemail-%%PYTHON_VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
>-@comment %%PYTHON_SITELIBDIR%%/conkyemail-%%PYTHON_VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>-@comment %%PYTHON_SITELIBDIR%%/conkyemail-%%PYTHON_VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>-@comment %%PYTHON_SITELIBDIR%%/conkyemail-%%PYTHON_VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
>
>Property changes on: deskutils/conkyemail/pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

kai: maintainer-approval+

Actions: View | Diff

Attachments on bug 238487: 204977 | 205084