Index: head/mail/fetchmailconf/Makefile
===================================================================
--- head/mail/fetchmailconf/Makefile	(revision 508091)
+++ head/mail/fetchmailconf/Makefile	(revision 508092)
@@ -1,37 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	fetchmailconf
-PORTREVISION=	0
+PORTREVISION=	1
 DISTNAME=	fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Python-based GUI to configure fetchmail
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
 		fetchmail>=${PORTVERSION}:mail/fetchmail
 
 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
 
 GNU_CONFIGURE=	yes
 
 TARGET=		fetchmailconf
 INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man
 
 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
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/fetchmailconf/files/fetchmailconf.in
===================================================================
--- head/mail/fetchmailconf/files/fetchmailconf.in	(revision 508091)
+++ head/mail/fetchmailconf/files/fetchmailconf.in	(revision 508092)
@@ -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 <<EOF
-The fetchmailconf program requires Python with Tkinter, which does
-not appear to be installed on this system.  Python can be found in
-the FreeBSD Ports Collection in lang/python, and Tkinter for Python
-can be found in x11-toolkits/py-tkinter.
-EOF
-exit 1
+exec %%PYTHON_CMD%% %%PYTHON_SITELIBDIR%%/fetchmailconf.py "$@"
Index: head/mail/fetchmailconf/pkg-plist
===================================================================
--- head/mail/fetchmailconf/pkg-plist	(revision 508091)
+++ head/mail/fetchmailconf/pkg-plist	(revision 508092)
@@ -1,6 +1,5 @@
 bin/fetchmailconf
-libexec/fetchmailconf.py
 man/man1/fetchmailconf.1.gz
 %%PYTHON_SITELIBDIR%%/fetchmailconf.py
 %%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
 %%PYTHON_SITELIBDIR%%/fetchmailconf.pyo