git: 1a923b333bdf - main - mail/getmail6: emergency hotfix for 6.18

[Joseph Mingrone]

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a923b333bdf86a2279334dad3afc736a67442f6

commit 1a923b333bdf86a2279334dad3afc736a67442f6
Author:     Joseph Mingrone <jrm at FreeBSD.org>
AuthorDate: 2021-07-06 16:59:22 +0000
Commit:     Joseph Mingrone <jrm at FreeBSD.org>
CommitDate: 2021-07-06 17:12:39 +0000

    mail/getmail6: emergency hotfix for 6.18
    
    A feature added in 6.18 causes problems.  When trying to use all files in
    --getmaildir, getmail will choke on oldmail-* files, which are likely to be
    present.  Since this is the new default behaviour for running getmail without
    any arguments, this change is very likely to break many installations.
    
    PR:             257024
    Reported by:    Michael Büker <freebsd at michael-bueker.de> (maintainer)
---
 mail/getmail6/Makefile | 6 ++++--
 mail/getmail6/distinfo | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mail/getmail6/Makefile b/mail/getmail6/Makefile
index b6c32e237e79..149887f5e5b6 100644
--- a/mail/getmail6/Makefile
+++ b/mail/getmail6/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	getmail6
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.18
+DISTVERSION=	6.18-1
+DISTVERSIONSUFFIX=	-g9d15886
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,9 +11,10 @@ COMMENT=	POP3/IMAP4 mail retriever (Python3 fork)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-USES=		python:3.6+
+USES=		python:3.6+ shebangfix
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
+SHEBANG_FILES=	getmail getmail-gmail-xoauth-tokens getmail_*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/mail/getmail6/distinfo b/mail/getmail6/distinfo
index 96487c165705..0152f76e4115 100644
--- a/mail/getmail6/distinfo
+++ b/mail/getmail6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625570539
-SHA256 (getmail6-getmail6-v6.18_GH0.tar.gz) = 928053ae0d7ae5666baa4a81c3428f25a7059296584eb0ce504ab1b4aba06897
-SIZE (getmail6-getmail6-v6.18_GH0.tar.gz) = 197774
+TIMESTAMP = 1625590688
+SHA256 (getmail6-getmail6-v6.18-1-g9d15886_GH0.tar.gz) = 45df957147252074de089e19f3871ae24b57083aea2e04fa8a630e420cac18b2
+SIZE (getmail6-getmail6-v6.18-1-g9d15886_GH0.tar.gz) = 197858