Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jan 2019 11:25:07 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490780 - in head: . mail mail/fetchmail mail/fetchmail/files mail/fetchmailconf mail/fetchmailconf/files
Message-ID:  <201901201125.x0KBP7Tg033353@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sun Jan 20 11:25:07 2019
New Revision: 490780
URL: https://svnweb.freebsd.org/changeset/ports/490780

Log:
  mail/fetchmail depends overhaul, new fetchmailconf port
  
  * Bring back SNI (server name indication) support for TLS connections,
    lost in 6.3.26_10 (PORTREVISION=10) as a regression over _9.
    Pointy hat: mandree@
  * Drop the X11 option, remove the Python dependency, and create a new
    mail/fetchmailconf slave port/package that installs the fetchmailconf
    configurator. Note that the _DEPENDS of the ports reflects a technical
    dependence (fetchmailconf needs fetchmail), and we cannot keep an
    X11 option that depends on fetchmailconf, since that would create
    a circular dependency, which we must avoid.
  * Patch configure instead of configure.ac with Cy's Kerberos fix, drop
    autoreconf from USES, and add a new configure check directly to set
    HAVE_DECL_SSLV3_CLIENT_METHOD to cover the various TLS providers
    (currently five, base, openssl, openssl111, libressl, libressl-devel)
  * Add -Wl,--as-needed to LDFLAGS so as not to pull in unneeded .so
    libraries, for instance, libcom_err when compiling under GSSAPI_NONE.
  * Bump PORTREVISION.
  
  Very fruitful and nice collaboration with and
  Approved by:	chalpin@cs.wisc.edu (maintainer)

Added:
  head/mail/fetchmail/files/patch-SNI-Gitlab-9b8b634   (contents, props changed)
  head/mail/fetchmail/files/patch-configure
     - copied, changed from r489946, head/mail/fetchmail/files/patch-configure
  head/mail/fetchmailconf/
     - copied from r490038, head/mail/fetchmail/
Deleted:
  head/mail/fetchmail/files/patch-configure.ac
  head/mail/fetchmailconf/files/fetchmail.in
  head/mail/fetchmailconf/files/fetchmailrc.sample
  head/mail/fetchmailconf/files/patch-configure.ac
  head/mail/fetchmailconf/files/patch-fetchmail.c
  head/mail/fetchmailconf/files/patch-socket.c
  head/mail/fetchmailconf/files/pkg-message.in
Modified:
  head/UPDATING
  head/mail/Makefile
  head/mail/fetchmail/Makefile
  head/mail/fetchmail/pkg-plist
  head/mail/fetchmailconf/Makefile
  head/mail/fetchmailconf/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Jan 20 11:13:11 2019	(r490779)
+++ head/UPDATING	Sun Jan 20 11:25:07 2019	(r490780)
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190120:
+  AFFECTS: users of mail/fetchmail
+  AUTHOR: mandree@FreeBSD.org
+
+  The fetchmail port no longer offers the X11 option and no longer
+  depends on Python.  The corresponding fetchmailconf Python program has now
+  been split out into a separate port or package, so that fetchmail itself
+  will no longer require Python.
+
+  Users who wish to use fetchmailconf should install the new fetchmailconf
+  port or package.
+
 20190119:
   AFFECTS: users of german/webalizer2, japanese/webalizer, polish/webalizer2, portuguese/webalizer-pt_BR, portuguese/webalizer-pt_PT, ukrainian/webalizer, www/geolizer, www/webalizer
   AUTHOR: dinoex@FreeBSD.org

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Sun Jan 20 11:13:11 2019	(r490779)
+++ head/mail/Makefile	Sun Jan 20 11:25:07 2019	(r490780)
@@ -131,6 +131,7 @@
     SUBDIR += fastforward
     SUBDIR += fdm
     SUBDIR += fetchmail
+    SUBDIR += fetchmailconf
     SUBDIR += filtermail
     SUBDIR += findmaildirs
     SUBDIR += geary

Modified: head/mail/fetchmail/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile	Sun Jan 20 11:13:11 2019	(r490779)
+++ head/mail/fetchmail/Makefile	Sun Jan 20 11:25:07 2019	(r490780)
@@ -1,43 +1,48 @@
 # Created by: Ville Eerola <ve@sci.fi>
 # $FreeBSD$
 
-PORTNAME=	fetchmail
+PORTNAME?=	fetchmail
 PORTVERSION=	6.3.26
-PORTREVISION=	10
+PORTREVISION?=	11
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
 		http://mandree.home.pages.de/${PORTNAME}/
 
-PATCH_SITES=   https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
-PATCHFILES=    fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
+PATCH_SITES=	https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
+PATCHFILES=	fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
 
-
 MAINTAINER=	chalpin@cs.wisc.edu
-COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
+COMMENT?=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
+.if empty(MASTERDIR)
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-USES=		autoreconf:build cpe gmake python shebangfix tar:xz ssl
-SHEBANG_FILES=	fetchmailconf.py
+USES=		cpe gmake tar:xz ssl
 
 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}
+		--with-ssl=${OPENSSLBASE} PYTHON=:
+# In case the user had an SSL-v2-capable SSL build, disable it:
 CONFIGURE_ENV=	ac_cv_have_decl_SSLv2_client_method=no
 
-LDFLAGS+=	-L${LOCALBASE}/lib
+# -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=	X11 NLS NTLM POP2 DOCS
+OPTIONS_DEFINE=	NLS NTLM POP2 DOCS
 OPTIONS_SINGLE=	GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_DEFAULT=	GSSAPI_BASE
@@ -51,8 +56,7 @@ GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
-X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
-POP2_DESC=	POP2 Protocol support[obsolete]
+POP2_DESC=	POP2 Protocol support [obsolete]
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
@@ -63,51 +67,37 @@ NTLM_PORTDOCS=		README.NTLM
 # POP2 is obsolete
 POP2_CONFIGURE_ENABLE=	POP2
 
-X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR}
-X11_CONFIGURE_OFF=	PYTHON=:
-X11_SUB_FILES_OFF=	fetchmailconf
-
 PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
 		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
 		esrs-design-notes.html
 
-#.include <bsd.port.options.mk>
-
 post-patch:
 .if !exists(/usr/lib/libcom_err.so)
 	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
 .endif
 
-# This is a workaround for a ports framework bug:
-# As of r489889 on 2019-01-10, 
-# USES=autoreconf does not seem to get along with disabling the NLS option,
-# because this would not install gettext-tools, omitting autopoint,
-# however the configure.ac requests GETTEXT, so autoreconf will barf.
-# Pulling in gettext-tools unconditionally (even with NLS off) would 
-# be excess and confuse users, so is not an option.
-# Thus we set USES=autoreconf:build and run autoreconf by ourselves,
-# overriding AUTOPOINT=true.
-#
-pre-configure-NLS-on:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
-#
-pre-configure-NLS-off:
-	(cd ${WRKSRC} && ${SETENV} AUTOPOINT=${TRUE} ${LOCALBASE}/bin/autoreconf -f -i)
+.endif
 
+# this avoids rebuilding the autotools rigs, i. e. USES+=autoreconf.
+# It will clobber the AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>])
+# so we've put that into files/patch-configure as well:
+pre-configure:
+	@${TOUCH} -d 2010-01-01T00:00:00 ${WRKSRC}/configure.ac
+
+.if empty(MASTERDIR)
 post-build:
-	@${MAKE_CMD} -C ${WRKSRC} check
+	${MAKE_CMD} -C ${WRKSRC} check
 
 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}
 
-post-install-X11-off:
-	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec
-
+.endif
 .include <bsd.port.mk>

Added: head/mail/fetchmail/files/patch-SNI-Gitlab-9b8b634
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/fetchmail/files/patch-SNI-Gitlab-9b8b634	Sun Jan 20 11:25:07 2019	(r490780)
@@ -0,0 +1,39 @@
+Line numbers and --- line adapted.
+
+From 9b8b634312f169fab872f3580c2febe5af031615 Mon Sep 17 00:00:00 2001
+From: Matthias Andree <matthias.andree@gmx.de>
+Date: Sat, 11 Feb 2017 19:39:56 +0100
+Subject: [PATCH] TLS: set hostname for SNI.
+
+---
+ socket.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/socket.c b/socket.c
+index aec319e3..17d60cbd 100644
+--- ./socket.c
++++ b/socket.c
+@@ -1029,6 +1029,20 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
+ 	_verify_ok = 1;
+ 	_prev_err = -1;
+ 
++	/*
++	 * Support SNI, some servers (googlemail) appear to require it.
++	 */
++	{
++	    long r;
++	    r = SSL_set_tlsext_host_name(_ssl_context[sock], servercname);
++
++	    if (0 == r) {
++		/* handle error */
++		report(stderr, GT_("Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"), _ssl_context[sock], servercname, r);
++		ERR_print_errors_fp(stderr);
++	    }
++	}
++
+ 	if( mycert || mykey ) {
+ 
+ 	/* Ok...  He has a certificate file defined, so lets declare it.  If
+-- 
+2.18.1
+

Copied and modified: head/mail/fetchmail/files/patch-configure (from r489946, head/mail/fetchmail/files/patch-configure)
==============================================================================
--- head/mail/fetchmail/files/patch-configure	Fri Jan 11 06:15:32 2019	(r489946, copy source)
+++ head/mail/fetchmail/files/patch-configure	Sun Jan 20 11:25:07 2019	(r490780)
@@ -1,6 +1,6 @@
---- configure.orig	2013-04-23 14:36:55.000000000 -0700
-+++ configure	2018-04-21 22:45:30.073773000 -0700
-@@ -9552,11 +9552,11 @@
+--- configure.orig	2013-04-23 21:36:55 UTC
++++ configure
+@@ -9552,11 +9552,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -14,7 +14,7 @@
    ;
    return 0;
  }
-@@ -9591,11 +9591,11 @@
+@@ -9591,11 +9591,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -28,3 +28,26 @@
    ;
    return 0;
  }
+@@ -10131,6 +10131,22 @@ fi
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_SSLV2_CLIENT_METHOD $ac_have_decl
++_ACEOF
++
++	;;
++esac
++
++case "$LIBS" in *-lssl*)
++	ac_fn_c_check_decl "$LINENO" "SSLv3_client_method" "ac_cv_have_decl_SSLv3_client_method" "#include <openssl/ssl.h>
++"
++if test "x$ac_cv_have_decl_SSLv3_client_method" = xyes; then :
++  ac_have_decl=1
++else
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SSLV3_CLIENT_METHOD $ac_have_decl
+ _ACEOF
+ 
+ 	;;

Modified: head/mail/fetchmail/pkg-plist
==============================================================================
--- head/mail/fetchmail/pkg-plist	Sun Jan 20 11:13:11 2019	(r490779)
+++ head/mail/fetchmail/pkg-plist	Sun Jan 20 11:25:07 2019	(r490780)
@@ -1,8 +1,5 @@
 bin/fetchmail
-bin/fetchmailconf
 man/man1/fetchmail.1.gz
-man/man1/fetchmailconf.1.gz
-%%NO_X11%%libexec/fetchmailconf.py
 %%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
@@ -27,8 +24,5 @@ man/man1/fetchmailconf.1.gz
 %%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
-%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py
-%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
-%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo
 @sample(fetchmail,fetchmail,600) etc/fetchmailrc.sample
 @dir(fetchmail,fetchmail,755) /var/run/fetchmail

Modified: head/mail/fetchmailconf/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile	Sat Jan 12 09:30:26 2019	(r490038)
+++ head/mail/fetchmailconf/Makefile	Sun Jan 20 11:25:07 2019	(r490780)
@@ -1,113 +1,37 @@
-# Created by: Ville Eerola <ve@sci.fi>
 # $FreeBSD$
 
-PORTNAME=	fetchmail
-PORTVERSION=	6.3.26
-PORTREVISION=	10
-CATEGORIES=	mail ipv6
-MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
-		http://mandree.home.pages.de/${PORTNAME}/
+PORTNAME=	fetchmailconf
+PORTREVISION=	0
+DISTNAME=	fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
-PATCH_SITES=   https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
-PATCHFILES=    fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
-
-
 MAINTAINER=	chalpin@cs.wisc.edu
-COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
+COMMENT=	Python-based GUI to configure fetchmail
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+		fetchmail>=${PORTVERSION}:mail/fetchmail
 
-USERS=		${PORTNAME}
-GROUPS=		${USERS}
+USES=		python shebangfix tar:xz
 
-USES=		autoreconf:build cpe gmake python shebangfix tar:xz ssl
+FILESDIR=	${.CURDIR}/files
+
 SHEBANG_FILES=	fetchmailconf.py
+SUB_FILES=	fetchmailconf
+PLIST=		${.CURDIR}/pkg-plist
+NO_ARCH=	yes
 
-USE_RC_SUBR=	fetchmail
-SUB_FILES=	pkg-message
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
-		--without-hesiod --enable-fallback=no \
-		--with-ssl=${OPENSSLBASE}
-CONFIGURE_ENV=	ac_cv_have_decl_SSLv2_client_method=no
 
-LDFLAGS+=	-L${LOCALBASE}/lib
+TARGET=		fetchmailconf
+INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man
 
-OPTIONS_DEFINE=	X11 NLS NTLM POP2 DOCS
-OPTIONS_SINGLE=	GSSAPI
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	GSSAPI_BASE
-OPTIONS_SUB=	yes
-
-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
-
-X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
-POP2_DESC=	POP2 Protocol support[obsolete]
-
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
-
-NTLM_CONFIGURE_ENABLE=	NTLM
-NTLM_PORTDOCS=		README.NTLM
-
-# POP2 is obsolete
-POP2_CONFIGURE_ENABLE=	POP2
-
-X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR}
-X11_CONFIGURE_OFF=	PYTHON=:
-X11_SUB_FILES_OFF=	fetchmailconf
-
-PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
-		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
-		esrs-design-notes.html
-
-#.include <bsd.port.options.mk>
-
-post-patch:
-.if !exists(/usr/lib/libcom_err.so)
-	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
-.endif
-
-# This is a workaround for a ports framework bug:
-# As of r489889 on 2019-01-10, 
-# USES=autoreconf does not seem to get along with disabling the NLS option,
-# because this would not install gettext-tools, omitting autopoint,
-# however the configure.ac requests GETTEXT, so autoreconf will barf.
-# Pulling in gettext-tools unconditionally (even with NLS off) would 
-# be excess and confuse users, so is not an option.
-# Thus we set USES=autoreconf:build and run autoreconf by ourselves,
-# overriding AUTOPOINT=true.
-#
-pre-configure-NLS-on:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
-#
-pre-configure-NLS-off:
-	(cd ${WRKSRC} && ${SETENV} AUTOPOINT=${TRUE} ${LOCALBASE}/bin/autoreconf -f -i)
-
-post-build:
-	@${MAKE_CMD} -C ${WRKSRC} check
-
 post-install:
-	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
-	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
-		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-post-install-X11-off:
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec
+	${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1*
 
-.include <bsd.port.mk>
+MASTERDIR=	${.CURDIR}/../fetchmail
+
+.include "${MASTERDIR}/Makefile"

Modified: head/mail/fetchmailconf/pkg-plist
==============================================================================
--- head/mail/fetchmail/pkg-plist	Sat Jan 12 09:30:26 2019	(r490038)
+++ head/mail/fetchmailconf/pkg-plist	Sun Jan 20 11:25:07 2019	(r490780)
@@ -1,34 +1,6 @@
-bin/fetchmail
 bin/fetchmailconf
-man/man1/fetchmail.1.gz
+libexec/fetchmailconf.py
 man/man1/fetchmailconf.1.gz
-%%NO_X11%%libexec/fetchmailconf.py
-%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/de/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/el/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/es/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/id/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/it/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
-%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py
-%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
-%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo
-@sample(fetchmail,fetchmail,600) etc/fetchmailrc.sample
-@dir(fetchmail,fetchmail,755) /var/run/fetchmail
+%%PYTHON_SITELIBDIR%%/fetchmailconf.py
+%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
+%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901201125.x0KBP7Tg033353>