Index: mail/Makefile
===================================================================
--- mail/Makefile
+++ mail/Makefile
@@ -138,6 +138,7 @@
     SUBDIR += geary
     SUBDIR += gensig
     SUBDIR += getmail
+    SUBDIR += getmail6
     SUBDIR += gmime2
     SUBDIR += gmime2-sharp
     SUBDIR += gmime24
Index: mail/getmail/Makefile
===================================================================
--- mail/getmail/Makefile
+++ mail/getmail/Makefile
@@ -16,23 +16,28 @@
 EXPIRATION_DATE=   2020-09-15
 
 USES=      python:2.7
-USE_PYTHON=    distutils
+USE_PYTHON=    autoplist distutils
+
+CONFLICTS= py*-getmail6
 
 NO_ARCH=   yes
-PORTDOCS=  README BUGS CHANGELOG THANKS TODO *.txt *.html *.css
+NO_BUILD=  yes
+
+PORTDOCS=  *.css *.html *.txt BUGS CHANGELOG README THANKS TODO
+PORTEXAMPLES=  getmailrc-examples
 
 OPTIONS_DEFINE=    DOCS EXAMPLES
 
 post-install:
    @${CHMOD} -R 644 ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/getmailcore/*
 
-post-install-EXAMPLES-on:
-   @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-   ${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${STAGEDIR}${EXAMPLESDIR}
-
 post-install-DOCS-on:
    @${CP} ${WRKSRC}/README ${WRKSRC}/docs/
    @${MKDIR} ${STAGEDIR}${DOCSDIR}
    ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}
 
+post-install-EXAMPLES-on:
+   @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+   ${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>
Index: mail/getmail/pkg-plist
===================================================================
--- mail/getmail/pkg-plist
+++ mail/getmail/pkg-plist
@@ -1,52 +0,0 @@
-bin/getmail
-bin/getmail_fetch
-bin/getmail-gmail-xoauth-tokens
-bin/getmail_maildir
-bin/getmail_mbox
-man/man1/getmail.1.gz
-man/man1/getmail_fetch.1.gz
-man/man1/getmail_maildir.1.gz
-man/man1/getmail_mbox.1.gz
-%%PYTHON_SITELIBDIR%%/getmailcore/__init__.py
-%%PYTHON_SITELIBDIR%%/getmailcore/__init__.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/__init__.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/_pop3ssl.py
-%%PYTHON_SITELIBDIR%%/getmailcore/_pop3ssl.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/_pop3ssl.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/_retrieverbases.py
-%%PYTHON_SITELIBDIR%%/getmailcore/_retrieverbases.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/_retrieverbases.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/baseclasses.py
-%%PYTHON_SITELIBDIR%%/getmailcore/baseclasses.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/baseclasses.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/constants.py
-%%PYTHON_SITELIBDIR%%/getmailcore/constants.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/constants.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/compatibility.py
-%%PYTHON_SITELIBDIR%%/getmailcore/compatibility.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/compatibility.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/destinations.py
-%%PYTHON_SITELIBDIR%%/getmailcore/destinations.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/destinations.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/exceptions.py
-%%PYTHON_SITELIBDIR%%/getmailcore/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/filters.py
-%%PYTHON_SITELIBDIR%%/getmailcore/filters.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/filters.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/imap_utf7.py
-%%PYTHON_SITELIBDIR%%/getmailcore/imap_utf7.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/imap_utf7.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/logging.py
-%%PYTHON_SITELIBDIR%%/getmailcore/logging.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/logging.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/message.py
-%%PYTHON_SITELIBDIR%%/getmailcore/message.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/message.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/retrievers.py
-%%PYTHON_SITELIBDIR%%/getmailcore/retrievers.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/retrievers.pyo
-%%PYTHON_SITELIBDIR%%/getmailcore/utilities.py
-%%PYTHON_SITELIBDIR%%/getmailcore/utilities.pyc
-%%PYTHON_SITELIBDIR%%/getmailcore/utilities.pyo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getmailrc-examples
Index: mail/getmail6/Makefile
===================================================================
--- mail/getmail6/Makefile
+++ mail/getmail6/Makefile
@@ -1,38 +1,41 @@
-# Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=  getmail
-DISTVERSION=   5.14
+PORTNAME=  getmail6
+DISTVERSIONPREFIX= v
+DISTVERSION=   6.03
 CATEGORIES=    mail python
-MASTER_SITES=  http://pyropus.ca/software/getmail/old-versions/
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=    jrm@FreeBSD.org
-COMMENT=   POP3/IMAP4 mail retriever with Maildir and command delivery
+MAINTAINER=    m.bueker@berlin.de
+COMMENT=   POP3/IMAP4 mail retriever (Python3 fork)
 
 LICENSE=   GPLv2
 LICENSE_FILE=  ${WRKSRC}/docs/COPYING
 
-DEPRECATED=    Uses deprecated version of python
-EXPIRATION_DATE=   2020-09-15
+USES=      python:3.6+
+USE_GITHUB=    yes
+USE_PYTHON=    autoplist concurrent distutils
 
-USES=      python:2.7
-USE_PYTHON=    distutils
+CONFLICTS= getmail
 
 NO_ARCH=   yes
+NO_BUILD=  yes
+
 PORTDOCS=  README BUGS CHANGELOG THANKS TODO *.txt *.html *.css
+PORTEXAMPLES=  getmailrc-examples
 
 OPTIONS_DEFINE=    DOCS EXAMPLES
 
 post-install:
    @${CHMOD} -R 644 ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/getmailcore/*
 
-post-install-EXAMPLES-on:
-   @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-   ${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${STAGEDIR}${EXAMPLESDIR}
-
 post-install-DOCS-on:
    @${CP} ${WRKSRC}/README ${WRKSRC}/docs/
    @${MKDIR} ${STAGEDIR}${DOCSDIR}
    ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}
 
+post-install-EXAMPLES-on:
+   @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+   ${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>
Index: mail/getmail6/distinfo
===================================================================
--- /dev/null
+++ mail/getmail6/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1597757128
+SHA256 (getmail6-getmail6-v6.03_GH0.tar.gz) = a4450f480d210235816f31f081d0d6dd85a0dc767d24e47842d8d2fd102bcb0f
+SIZE (getmail6-getmail6-v6.03_GH0.tar.gz) = 182723
Index: mail/getmail6/files/patch-setup.py
===================================================================
--- /dev/null
+++ mail/getmail6/files/patch-setup.py
@@ -0,0 +1,41 @@
+--- setup.py.orig  2009-01-08 21:55:25 UTC
++++ setup.py
+@@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join(
+     datadir or prefix,
+     'share',
+     'doc',
+-    'getmail-%s' % __version__
++    'getmail'
+ )
+ 
+ GETMAILMANDIR = os.path.join(
+     datadir or prefix,
+-    'share',
+     'man',
+     'man1'
+ )
+@@ -98,24 +97,6 @@ setup(
+     'getmail_mbox'
+     ],
+     data_files=[
+-        (GETMAILDOCDIR, [
+-            './README',
+-            'docs/BUGS',
+-            'docs/COPYING',
+-            'docs/CHANGELOG',
+-            'docs/TODO',
+-            'docs/THANKS',
+-            'docs/configuration.html',
+-            'docs/configuration.txt',
+-            'docs/documentation.html',
+-            'docs/documentation.txt',
+-            'docs/faq.html',
+-            'docs/faq.txt',
+-            'docs/getmaildocs.css',
+-            'docs/getmailrc-examples',
+-            'docs/troubleshooting.html',
+-            'docs/troubleshooting.txt',
+-        ]),
+         (GETMAILMANDIR, [
+             'docs/getmail.1',
+             'docs/getmail_fetch.1',
Index: mail/getmail6/pkg-descr
===================================================================
--- /dev/null
+++ mail/getmail6/pkg-descr
@@ -0,0 +1,20 @@
+POP3/IMAP4 mail retriever with Maildir and command delivery (python3 fork).
+
+Summary of features:
+- Retrieve mail from an unlimited number of POP3/IMAP4 mailboxes and servers.
+- Support for POP3-over-SSL and IMAP-over-SSL, as well as SDPS
+  WARNING: even with SSL, "no certificate or key validation is done." so
+  that getmail does not detect or protect from man-in-the-middle attacks.
+- Support for multidrop or domain mailboxes.
+- Safe and reliable delivery to qmail-style Maildirs, as well as program
+  (pipe) delivery for use with arbitrary external MDAs. Includes an MDA
+  for mbox files that supports mboxrd format and fcntl-type flock locking.
+- Does not destroy information by rewriting mail headers.
+- Does not cause mail loops by doing SMTP injection, and therefore does
+  not require that you run an MTA (like qmail or sendmail) on your host.
+- Can remember which mail it has already retrieved, and can be set to
+  only download new messages.
+- Written in Python, and therefore easy to extend or customize.
+- Simple to install, configure, and use.
+
+WWW: https://github.com/getmail6/getmail6/
Index: mail/getmail6/pkg-message
===================================================================
--- /dev/null
+++ mail/getmail6/pkg-message
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+This fork of getmail 5.14 was modified to work with python3. It is work in
+progress, and bugs should be reported at:
+https://github.com/getmail6/getmail6/issues
+EOM
+}
+]