svn commit: r526535 - in head/mail: fetchmail fetchmail/files fetchmailconf fetchmailconf/files
Matthias Andree
mandree at FreeBSD.org
Thu Feb 20 00:02:00 UTC 2020
Author: mandree
Date: Thu Feb 20 00:01:58 2020
New Revision: 526535
URL: https://svnweb.freebsd.org/changeset/ports/526535
Log:
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 at cs.wisc.edu> (maintainer)
Approved by: Corey Halpin <chalpin at cs.wisc.edu> (maintainer)
MFH: 2020Q1 (bugfixes and fetchmailconf update and Python3 compat.)
Added:
head/mail/fetchmailconf/files/patch-fetchmailconf.py (contents, props changed)
Deleted:
head/mail/fetchmail/files/patch-fetchmail.man
head/mail/fetchmail/files/patch-t.smoke
Modified:
head/mail/fetchmail/Makefile
head/mail/fetchmail/distinfo
head/mail/fetchmailconf/Makefile
Modified: head/mail/fetchmail/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile Wed Feb 19 22:34:36 2020 (r526534)
+++ head/mail/fetchmail/Makefile Thu Feb 20 00:01:58 2020 (r526535)
@@ -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 at 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
Modified: head/mail/fetchmail/distinfo
==============================================================================
--- head/mail/fetchmail/distinfo Wed Feb 19 22:34:36 2020 (r526534)
+++ head/mail/fetchmail/distinfo Thu Feb 20 00:01:58 2020 (r526535)
@@ -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
Modified: head/mail/fetchmailconf/Makefile
==============================================================================
--- head/mail/fetchmailconf/Makefile Wed Feb 19 22:34:36 2020 (r526534)
+++ head/mail/fetchmailconf/Makefile Thu Feb 20 00:01:58 2020 (r526535)
@@ -2,22 +2,27 @@
PORTNAME= fetchmailconf
DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+# NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable,
+# else _this_ port (fetchmailconf) becomes unfetchable
MAINTAINER= chalpin at cs.wisc.edu
COMMENT= Python-based GUI to configure fetchmail
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244130 has an update to get it
-# compatible to Python 3.
-
LICENSE= GPLv2 LGPL21
LICENSE_COMB= dual
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+# minimum required version 6.4.2 - not codified, on the assumption
+# that fetchmail port updated at the same time
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
fetchmail>=${PORTVERSION}:mail/fetchmail
+RUN_DEPENDS+= ${BUILD_DEPENDS}
-USES= python:2.7 shebangfix tar:xz
+USES= python shebangfix tar:xz
+USE_PYTHON= py3kplist
FILESDIR= ${.CURDIR}/files
+PATCHDIR= ${FILESDIR}
SUB_FILES= fetchmailconf
SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
@@ -30,8 +35,12 @@ ALL_TARGET= fetchmailconf
INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man
post-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
- ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1*
+# first, run smoke tests - the version check makes sure we have all
+# modules listed in the *_DEPENDS variables:
+ ${PYTHON_CMD} ${WRKSRC}/fetchmailconf.py -V
+# then install:
+ ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
+ ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1*
MASTERDIR= ${.CURDIR}/../fetchmail
Added: head/mail/fetchmailconf/files/patch-fetchmailconf.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/fetchmailconf/files/patch-fetchmailconf.py Thu Feb 20 00:01:58 2020 (r526535)
@@ -0,0 +1,24 @@
+--- fetchmailconf.py.orig 2020-01-31 20:22:54 UTC
++++ fetchmailconf.py
+@@ -2132,10 +2132,6 @@ def copy_instance(toclass, fromdict):
+
+ if __name__ == '__main__':
+
+- if "DISPLAY" not in os.environ:
+- print("fetchmailconf must be run under X")
+- sys.exit(1)
+-
+ fetchmail_icon = """
+ R0lGODdhPAAoAPcAAP///wgICBAQEISEhIyMjJSUlKWlpa2trbW1tcbGxs7Ozufn5+/v7//39yEY
+ GNa9tUoxKZyEe1o5KTEQAN7OxpyMhIRjUvfn3pxSKYQ5EO/Wxv/WvWtSQrVzSmtCKWspAMatnP/e
+@@ -2202,6 +2198,10 @@ fetchmailconf comes with ABSOLUTELY NO WARRANTY. This
+ welcome to redistribute it under certain conditions. Please see the file
+ COPYING in the source or documentation directory for details.""")
+ sys.exit(0)
++
++ if "DISPLAY" not in os.environ:
++ print("fetchmailconf must be run under X")
++ sys.exit(1)
+
+ # Get client host's FQDN
+ hostname = socket.gethostname()
More information about the svn-ports-head
mailing list