From owner-svn-ports-head@freebsd.org Sun Aug 4 12:44:58 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E38E5A920C; Sun, 4 Aug 2019 12:44:58 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 461gbG5gwgz4TmH; Sun, 4 Aug 2019 12:44:58 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4893395A; Sun, 4 Aug 2019 12:44:58 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x74Ciwqe057049; Sun, 4 Aug 2019 12:44:58 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x74CiwIo057046; Sun, 4 Aug 2019 12:44:58 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201908041244.x74CiwIo057046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 4 Aug 2019 12:44:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508092 - in head/mail/fetchmailconf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/mail/fetchmailconf: . files X-SVN-Commit-Revision: 508092 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Aug 2019 12:44:59 -0000 Author: pi Date: Sun Aug 4 12:44:57 2019 New Revision: 508092 URL: https://svnweb.freebsd.org/changeset/ports/508092 Log: mail/fetchmailconf: fix use by simplifing the search for Tkinter etc When the fetchmailconf port was split off from fetchmail, it inherited some python version detection logic that had been intended to let fetchmail be installed with or without python and work either way. However, this logic 1) no longer works with current python packaging, and 2) doesn't really make sense in the context of a 'fetchmailconf' port that already depends on python. This patch simplifies out that logic. PR: 239248 Submitted by: Corey Halpin (maintainer) Reported by: gerard_seibert@outlook.com Modified: head/mail/fetchmailconf/Makefile head/mail/fetchmailconf/files/fetchmailconf.in head/mail/fetchmailconf/pkg-plist Modified: head/mail/fetchmailconf/Makefile ============================================================================== --- head/mail/fetchmailconf/Makefile Sun Aug 4 12:37:58 2019 (r508091) +++ head/mail/fetchmailconf/Makefile Sun Aug 4 12:44:57 2019 (r508092) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= fetchmailconf -PORTREVISION= 0 +PORTREVISION= 1 DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= chalpin@cs.wisc.edu @@ -17,8 +17,8 @@ USES= python:2.7 shebangfix tar:xz FILESDIR= ${.CURDIR}/files -SHEBANG_FILES= fetchmailconf.py SUB_FILES= fetchmailconf +SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} PLIST= ${.CURDIR}/pkg-plist NO_ARCH= yes @@ -29,7 +29,6 @@ INSTALL_TARGET= install-data-am install-nodist_binSCRI post-install: ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1* MASTERDIR= ${.CURDIR}/../fetchmail Modified: head/mail/fetchmailconf/files/fetchmailconf.in ============================================================================== --- head/mail/fetchmailconf/files/fetchmailconf.in Sun Aug 4 12:37:58 2019 (r508091) +++ head/mail/fetchmailconf/files/fetchmailconf.in Sun Aug 4 12:44:57 2019 (r508092) @@ -1,22 +1,7 @@ #!/bin/sh # -# Wrapper for the real fetchmailconf. Checks whether Python and Tkinter are -# installed, and runs the real fetchmailconf or alerts the user, as appropriate. +# Wrapper for the real fetchmailconf. # # $FreeBSD$ -LOCALBASE=%%LOCALBASE%% - -if [ -x $LOCALBASE/bin/python ] ; then - PYTHON_VERSION=python$(${LOCALBASE}/bin/python -c 'import sys; print sys.version[:3]' 2>/dev/null) - if [ -e ${LOCALBASE}/lib/${PYTHON_VERSION}/lib-dynload/_tkinter.so ]; then - exec ${LOCALBASE}/libexec/fetchmailconf.py "$@" - fi -fi -cat <