Attachment #212862 for bug #245187

Lines 2-8 Link Here

(-)fetchmail/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= fetchmail	4	PORTNAME?= fetchmail
5	PORTVERSION= 6.4.2	5	DISTVERSION= 6.4.3-rc1
6	CATEGORIES= mail	6	CATEGORIES= mail
7	# The next line is inherited by the fetchmailconf slave port,	7	# The next line is inherited by the fetchmailconf slave port,
8	# do NOT replace fetchmail by ${PORTNAME}	8	# do NOT replace fetchmail by ${PORTNAME}
Lines 17-23 Link Here
17	.if empty(MASTERDIR)	17	.if empty(MASTERDIR)
18	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	18	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
19		19
20	USES= cpe gmake tar:xz ssl	20	USES= cpe gmake tar:lz ssl
21		21
22	USERS= ${PORTNAME}	22	USERS= ${PORTNAME}
23	GROUPS= ${USERS}	23	GROUPS= ${USERS}

Lines 1-3 Link Here

(-)fetchmail/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1581675882	1	TIMESTAMP = 1585575734
2	SHA256 (fetchmail-6.4.2.tar.xz) = e21f6b3326f29fdb0c4786b5602aa4b9e668805424d0708eb42be6395c1ca630	2	SHA256 (fetchmail-6.4.3-rc1.tar.lz) = e64ff358880788e3c5049767447f1da131d2528ca42f777d1de35bba657a046b
3	SIZE (fetchmail-6.4.2.tar.xz) = 1261472	3	SIZE (fetchmail-6.4.3-rc1.tar.lz) = 1260359

Lines 18-24 Link Here

(-)fetchmailconf/Makefile (-1 / +1 lines)
18	fetchmail>=${PORTVERSION}:mail/fetchmail	18	fetchmail>=${PORTVERSION}:mail/fetchmail
19	RUN_DEPENDS+= ${BUILD_DEPENDS}	19	RUN_DEPENDS+= ${BUILD_DEPENDS}
20		20
21	USES= python shebangfix tar:xz	21	USES= python shebangfix tar:lz
22	USE_PYTHON= py3kplist	22	USE_PYTHON= py3kplist
23		23
24	FILESDIR= ${.CURDIR}/files	24	FILESDIR= ${.CURDIR}/files




--- 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 245187

Lines 1-24 Link Here

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