Index: head/mail/fetchmail/Makefile =================================================================== --- head/mail/fetchmail/Makefile (revision 526534) +++ head/mail/fetchmail/Makefile (revision 526535) @@ -1,97 +1,98 @@ # Created by: Ville Eerola # $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 COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual .if empty(MASTERDIR) CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cpe gmake tar:xz ssl USERS= ${PORTNAME} GROUPS= ${USERS} USE_RC_SUBR= fetchmail SUB_FILES= pkg-message GNU_CONFIGURE= yes # the added PYTHON=: suppresses python builds, # see ../../mail/fetchmailconf/ for the configuration tool CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ --without-hesiod --enable-fallback=no \ --with-ssl=${OPENSSLBASE} PYTHON=: # -Wl,--as-needed suppresses unneeded library references, # for instance, libcom_err.so on GSSAPI_NONE builds: LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed OPTIONS_DEFINE= CA_BUNDLE NLS DOCS OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE OPTIONS_SUB= yes CA_BUNDLE_DESC= Install CA bundle for OpenSSL GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gssapi NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PORTDOCS= FAQ FEATURES NEWS NOTES OLDNEWS \ README README.SSL README.SSL-SERVER \ design-notes.html fetchmail-FAQ.html fetchmail-features.html \ esrs-design-notes.html todo.html post-patch: .if !exists(/usr/lib/libcom_err.so) @${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure .endif .endif 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 ${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample ${RM} ${STAGEDIR}${PREFIX}/bin/fetchmailconf ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmailconf.1* post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include .if ${ARCH:Mpowerpc*} && ${OSREL:R} < 13 # as of 2019-10-02, powerpc's base compiler does not yield a working fetchmail. # https://svnweb.freebsd.org/ports?view=revision&revision=513614 -- pkubaj@ USE_GCC= yes .endif .include Index: head/mail/fetchmail/distinfo =================================================================== --- head/mail/fetchmail/distinfo (revision 526534) +++ head/mail/fetchmail/distinfo (revision 526535) @@ -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 Index: head/mail/fetchmail/files/patch-fetchmail.man =================================================================== --- head/mail/fetchmail/files/patch-fetchmail.man (revision 526534) +++ head/mail/fetchmail/files/patch-fetchmail.man (nonexistent) @@ -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} Property changes on: head/mail/fetchmail/files/patch-fetchmail.man ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/fetchmail/files/patch-t.smoke =================================================================== --- head/mail/fetchmail/files/patch-t.smoke (revision 526534) +++ head/mail/fetchmail/files/patch-t.smoke (nonexistent) @@ -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.$$ Property changes on: head/mail/fetchmail/files/patch-t.smoke ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/fetchmailconf/Makefile =================================================================== --- head/mail/fetchmailconf/Makefile (revision 526534) +++ head/mail/fetchmailconf/Makefile (revision 526535) @@ -1,38 +1,47 @@ # $FreeBSD$ 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@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} PLIST= ${.CURDIR}/pkg-plist NO_ARCH= yes GNU_CONFIGURE= yes 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 .include "${MASTERDIR}/Makefile" Index: head/mail/fetchmailconf/files/patch-fetchmailconf.py =================================================================== --- head/mail/fetchmailconf/files/patch-fetchmailconf.py (nonexistent) +++ head/mail/fetchmailconf/files/patch-fetchmailconf.py (revision 526535) @@ -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() Property changes on: head/mail/fetchmailconf/files/patch-fetchmailconf.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property