Index: branches/2019Q2/deskutils/conkyemail/Makefile
===================================================================
--- branches/2019Q2/deskutils/conkyemail/Makefile	(revision 504995)
+++ branches/2019Q2/deskutils/conkyemail/Makefile	(revision 504996)
@@ -1,28 +1,35 @@
 # Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
 
 PORTNAME=	conkyemail
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/28462213/ \
 		LOCAL/vg
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Email script for conky
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 RUN_DEPENDS=	conky:sysutils/conky
 
 USES=		python:2.7
 USE_PYTHON=	distutils
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/src
 
 post-patch:
-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g; \
+						s,%%DATADIR%%,${DATADIR},; \
+						s,%%PYTHON_CMD%%,${PYTHON_CMD},' \
 		conkyEmail  conkyEmail.py setup.py example/conkyrc
-	cd ${WRKSRC} && ${RM} -r example/conkyrc.bak
+	@cd ${WRKSRC} && ${RM} -r example/conkyrc.bak
 
 .include <bsd.port.mk>
Index: branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail
===================================================================
--- branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail	(revision 504995)
+++ branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail	(revision 504996)
@@ -1,7 +1,8 @@
---- conkyEmail.orig	2008-09-09 06:12:46.000000000 +0800
-+++ conkyEmail	2010-05-08 02:28:45.000000000 +0800
+--- conkyEmail.orig	2008-09-08 22:12:46 UTC
++++ conkyEmail
 @@ -1,3 +1,3 @@
  #! /bin/sh
- cd /usr/share/conkyemail/
+-cd /usr/share/conkyemail/
 -$PYTHONPATH /usr/bin/python /usr/share/conkyemail/conkyEmail.py "$@"
-+$PYTHONPATH /usr/bin/env python /usr/share/conkyemail/conkyEmail.py "$@"
++cd %%DATADIR%%
++%%PYTHON_CMD%% %%DATADIR%%/conkyEmail.py "$@"
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 504995)
+++ branches/2019Q2	(revision 504996)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r504995