From owner-svn-ports-branches@freebsd.org Sun Jun 23 22:38:07 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 089D415B3DB0; Sun, 23 Jun 2019 22:38:07 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A386D7334A; Sun, 23 Jun 2019 22:38:06 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D67628294; Sun, 23 Jun 2019 22:38:06 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5NMc6Eq067079; Sun, 23 Jun 2019 22:38:06 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5NMc5GA067077; Sun, 23 Jun 2019 22:38:05 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201906232238.x5NMc5GA067077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sun, 23 Jun 2019 22:38:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r504996 - in branches/2019Q2/deskutils/conkyemail: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in branches/2019Q2/deskutils/conkyemail: . files X-SVN-Commit-Revision: 504996 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A386D7334A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jun 2019 22:38:07 -0000 Author: kai Date: Sun Jun 23 22:38:05 2019 New Revision: 504996 URL: https://svnweb.freebsd.org/changeset/ports/504996 Log: MFH: r504995 deskutils/conkyemail: Fix invocation of Python script at runtime Since the default version of Python has been switched to 3.6 in r498529 the script "conkyEmail.py" that is invoked by the shell script "conkyEmail" fails at runtime due incompatible code. This occurs only if the Python meta port is also installed otherwise it won't start at all due a hardcoded reference (= /usr/bin/env python) in the shell script, thus: * Update and simplify the patch for "conkyEmail" by using placeholders for the Python interpreter and ${DATADIR} that will be replaced by the post-patch target. [1] Also while I'm here: * Silence all commands of the post-patch target to reduce cluttering of logfiles * Add license information * Pet portlint PR: 238487 Submitted by: Katsuyuki Miyoshi (initial patch) Approved by: ports-secteam (blanket: runtime fix, framework compliance) Modified: branches/2019Q2/deskutils/conkyemail/Makefile branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/deskutils/conkyemail/Makefile ============================================================================== --- branches/2019Q2/deskutils/conkyemail/Makefile Sun Jun 23 22:32:33 2019 (r504995) +++ branches/2019Q2/deskutils/conkyemail/Makefile Sun Jun 23 22:38:05 2019 (r504996) @@ -3,6 +3,7 @@ PORTNAME= conkyemail PORTVERSION= 2.07 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://launchpadlibrarian.net/28462213/ \ LOCAL/vg @@ -11,18 +12,24 @@ 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 Modified: branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail ============================================================================== --- branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail Sun Jun 23 22:32:33 2019 (r504995) +++ branches/2019Q2/deskutils/conkyemail/files/patch-conkyEmail Sun Jun 23 22:38:05 2019 (r504996) @@ -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 "$@"