mail/fetchmail: mail/fetchmailconf: update to 6.4.2, make Python 3 compatible

Fetchmail updated to new revision 6.4.2
- one bugfix
- manual page updates
- update of Chinese (simplified) translation
- massive fetchmailconf overhaul
  + Python 3 compatible (requires py-future)
  + Supports IPv6 and SSL probing
- remove two patches for fetchmail that are in the upstream release
- add a smoke test to fetchmailconf's post-install,
  and a patch to support that running without X11 $DISPLAY.

PR:		244130
Submitted by:	mandree@
Reviewed by:	Corey Halpin <chalpin@cs.wisc.edu> (maintainer)
Approved by:	Corey Halpin <chalpin@cs.wisc.edu> (maintainer)
MFH:		2020Q1 (bugfixes and fetchmailconf update and Python3 compat.)

4 files changed, 7 insertions, 26 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 1d0ee27de657..6d7ce4758b20 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME?=	fetchmail
-PORTVERSION=	6.4.1
-PORTREVISION=	1
+PORTVERSION=	6.4.2
 CATEGORIES=	mail
+# The next line is inherited by the fetchmailconf slave port,
+# do NOT replace fetchmail by ${PORTNAME}
 MASTER_SITES=	SF/fetchmail/branch_6.4/
 
 MAINTAINER=	chalpin@cs.wisc.edu
@@ -71,7 +72,7 @@ PATCH_STRIP=	-p1
 
 .if empty(MASTERDIR)
 post-build:
-	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; cat "${WRKSRC}/test-suite.log" ) ; exit $$r ; }
+	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }
 
 post-install:
 	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 1f8f5956c8a8..4f81555eb93b 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569677341
-SHA256 (fetchmail-6.4.1.tar.xz) = 3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0
-SIZE (fetchmail-6.4.1.tar.xz) = 1257488
+TIMESTAMP = 1581675882
+SHA256 (fetchmail-6.4.2.tar.xz) = e21f6b3326f29fdb0c4786b5602aa4b9e668805424d0708eb42be6395c1ca630
+SIZE (fetchmail-6.4.2.tar.xz) = 1261472
diff --git a/mail/fetchmail/files/patch-fetchmail.man b/mail/fetchmail/files/patch-fetchmail.man
deleted file mode 100644
index 800b36315646..000000000000
--- a/mail/fetchmail/files/patch-fetchmail.man
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/fetchmail.man	2019-09-28 11:09:52.000000000 +0200
-+++ b/fetchmail.man	2019-10-03 11:28:41.306247000 +0200
-@@ -1891,7 +1891,6 @@ 
- user[name]	\-u	\&	T{
- This is the user description and must come first after server
- description and after possible server options, and before user options.
--.br
- It sets the remote user name if by itself or followed by 'there', or the
- local user name if followed by 'here'.
- T}
diff --git a/mail/fetchmail/files/patch-t.smoke b/mail/fetchmail/files/patch-t.smoke
deleted file mode 100644
index 91a43967d1e3..000000000000
--- a/mail/fetchmail/files/patch-t.smoke
+++ /dev/null
@@ -1,10 +0,0 @@
---- fetchmail-6.4.1/t.smoke	2019-08-20 18:00:35.000000000 -0500
-+++ fetchmail-6.4.1-patched/t.smoke	2019-09-30 19:20:23.633504000 -0500
-@@ -4,6 +4,7 @@
- # configuration and dump it in human-readable and machine-readable form.
- 
- set -e
-+export HOME=/tmp
- trap 'rm -f t.rc.$$' 0
- cp "${srcdir}/t.rc" t.rc.$$
- chmod 0400 t.rc.$$