Index: Makefile
===================================================================
--- Makefile	(revision 507007)
+++ Makefile	(working copy)
@@ -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 @@
 
 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 @@
 
 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
Index: files/fetchmailconf.in
===================================================================
--- files/fetchmailconf.in	(revision 507007)
+++ files/fetchmailconf.in	(working copy)
@@ -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: pkg-plist
===================================================================
--- pkg-plist	(revision 507007)
+++ pkg-plist	(working copy)
@@ -1,5 +1,4 @@
 bin/fetchmailconf
-libexec/fetchmailconf.py
 man/man1/fetchmailconf.1.gz
 %%PYTHON_SITELIBDIR%%/fetchmailconf.py
 %%PYTHON_SITELIBDIR%%/fetchmailconf.pyc