Attachment #211756 for bug #244130




# $FreeBSD$

PORTNAME?=	fetchmail
PORTVERSION=	6.4.2
PORTREVISION=	1
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


.if empty(MASTERDIR)
post-build:
	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }

post-install:
	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail

Lines 1-3 Link Here

(-)mail/fetchmail/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1569677341	1	TIMESTAMP = 1581675882
2	SHA256 (fetchmail-6.4.1.tar.xz) = 3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0	2	SHA256 (fetchmail-6.4.2.tar.xz) = e21f6b3326f29fdb0c4786b5602aa4b9e668805424d0708eb42be6395c1ca630
3	SIZE (fetchmail-6.4.1.tar.xz) = 1257488	3	SIZE (fetchmail-6.4.2.tar.xz) = 1261472

Lines 1-10 Link Here

(-)mail/fetchmail/files/patch-fetchmail.man (-10 lines)
1	--- a/fetchmail.man 2019-09-28 11:09:52.000000000 +0200
2	+++ b/fetchmail.man 2019-10-03 11:28:41.306247000 +0200
3	@@ -1891,7 +1891,6 @@
4	user[name] \-u \& T{
5	This is the user description and must come first after server
6	description and after possible server options, and before user options.
7	-.br
8	It sets the remote user name if by itself or followed by 'there', or the
9	local user name if followed by 'here'.
10	T}

Lines 1-10 Link Here

(-)mail/fetchmail/files/patch-t.smoke (-10 lines)
1	--- fetchmail-6.4.1/t.smoke 2019-08-20 18:00:35.000000000 -0500
2	+++ fetchmail-6.4.1-patched/t.smoke 2019-09-30 19:20:23.633504000 -0500
3	@@ -4,6 +4,7 @@
4	# configuration and dump it in human-readable and machine-readable form.
5
6	set -e
7	+export HOME=/tmp
8	trap 'rm -f t.rc.$$' 0
9	cp "${srcdir}/t.rc" t.rc.$$
10	chmod 0400 t.rc.$$





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

# 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 shebangfix tar:xz
USE_PYTHON=	py3kplist

FILESDIR=	${.CURDIR}/files
PATCHDIR=	${FILESDIR}

SUB_FILES=	fetchmailconf
SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}

INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man

post-install:
# first, run smoke tests - the version check makes sure we have all
# modules in the requirements:
	${PYTHON_CMD} ${WRKSRC}/fetchmailconf.py -V
# then install:
	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
	${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1*





--- 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()

Return to bug 244130

Lines 2-10 Link Here

(-)mail/fetchmail/Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= fetchmail	4	PORTNAME?= fetchmail
5	PORTVERSION= 6.4.1	5	PORTVERSION= 6.4.2
6	PORTREVISION= 1
7	CATEGORIES= mail	6	CATEGORIES= mail
		7	# The next line is inherited by the fetchmailconf slave port,
		8	# do NOT replace fetchmail by ${PORTNAME}
8	MASTER_SITES= SF/fetchmail/branch_6.4/	9	MASTER_SITES= SF/fetchmail/branch_6.4/
9		10
10	MAINTAINER= chalpin@cs.wisc.edu	11	MAINTAINER= chalpin@cs.wisc.edu
Lines 71-77 Link Here
71		72
72	.if empty(MASTERDIR)	73	.if empty(MASTERDIR)
73	post-build:	74	post-build:
74	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; cat "${WRKSRC}/test-suite.log" ) ; exit $$r ; }	75	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }
75		76
76	post-install:	77	post-install:
77	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail	78	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail

Lines 2-23 Link Here

(-)mail/fetchmailconf/Makefile (-5 / +14 lines)
2		2
3	PORTNAME= fetchmailconf	3	PORTNAME= fetchmailconf
4	DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}	4	DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
		5	# NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable,
		6	# else _this_ port (fetchmailconf) becomes unfetchable
5		7
6	MAINTAINER= chalpin@cs.wisc.edu	8	MAINTAINER= chalpin@cs.wisc.edu
7	COMMENT= Python-based GUI to configure fetchmail	9	COMMENT= Python-based GUI to configure fetchmail
8		10
9	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244130 has an update to get it
10	# compatible to Python 3.
11
12	LICENSE= GPLv2 LGPL21	11	LICENSE= GPLv2 LGPL21
13	LICENSE_COMB= dual	12	LICENSE_COMB= dual
14		13
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \	14	# minimum required version 6.4.2 - not codified, on the assumption
		15	# that fetchmail port updated at the same time
		16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
		17	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
16	fetchmail>=${PORTVERSION}:mail/fetchmail	18	fetchmail>=${PORTVERSION}:mail/fetchmail
		19	RUN_DEPENDS+= ${BUILD_DEPENDS}
17		20
18	USES= python:2.7 shebangfix tar:xz	21	USES= python shebangfix tar:xz
		22	USE_PYTHON= py3kplist
19		23
20	FILESDIR= ${.CURDIR}/files	24	FILESDIR= ${.CURDIR}/files
		25	PATCHDIR= ${FILESDIR}
21		26
22	SUB_FILES= fetchmailconf	27	SUB_FILES= fetchmailconf
23	SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}	28	SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
Lines 30-35 Link Here
30	INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man	35	INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man
31		36
32	post-install:	37	post-install:
		38	# first, run smoke tests - the version check makes sure we have all
		39	# modules in the requirements:
		40	${PYTHON_CMD} ${WRKSRC}/fetchmailconf.py -V
		41	# then install:
33	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin	42	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
34	${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1*	43	${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1*
35		44

Line 0 Link Here

(-)mail/fetchmailconf/files/patch-fetchmailconf.py (+24 lines)
	1	--- fetchmailconf.py.orig 2020-01-31 20:22:54 UTC
	2	+++ fetchmailconf.py
	3	@@ -2132,10 +2132,6 @@ def copy_instance(toclass, fromdict):
	4
	5	if __name__ == '__main__':
	6
	7	- if "DISPLAY" not in os.environ:
	8	- print("fetchmailconf must be run under X")
	9	- sys.exit(1)
	10	-
	11	fetchmail_icon = """
	12	R0lGODdhPAAoAPcAAP///wgICBAQEISEhIyMjJSUlKWlpa2trbW1tcbGxs7Ozufn5+/v7//39yEY
	13	GNa9tUoxKZyEe1o5KTEQAN7OxpyMhIRjUvfn3pxSKYQ5EO/Wxv/WvWtSQrVzSmtCKWspAMatnP/e
	14	@@ -2202,6 +2198,10 @@ fetchmailconf comes with ABSOLUTELY NO WARRANTY. This
	15	welcome to redistribute it under certain conditions. Please see the file
	16	COPYING in the source or documentation directory for details.""")
	17	sys.exit(0)
	18	+
	19	+ if "DISPLAY" not in os.environ:
	20	+ print("fetchmailconf must be run under X")
	21	+ sys.exit(1)
	22
	23	# Get client host's FQDN
	24	hostname = socket.gethostname()