From 8dfad65ec825fb32ff11299737e5b23f22faed7f Mon Sep 17 00:00:00 2001
From: Matthias Andree <mandree@FreeBSD.org>
Date: Thu, 10 Jan 2013 01:36:21 +0000
Subject: Changes by Po-Chien Lin: - Update to 6.3.24 - Switch to OptionsNG -
 Remove unused variables: PATCH_STRIP, MAKE_ENV - Rearrange ordering of some
 sections - Use PORTDOCS to handle document list instead of pkg-plist - Alter
 pkg-plst to make portlint(1) happier - Cleanup TABs - Set USE_PYTHON_RUN only
 if X11 option is set. - Rename files/fetchmailconf to files/fetchmailconf.in,
   add it into SUB_FILES, and make the corresponding change in   pre-patch
 target. - The `fetchmailconf' wrapper will only be installed when X11  
 option is unset, otherwise we use the native wrapper which will   directly
 call the script under PYTHON_SITELIBDIR. - Add %%X11%% and %%NOX11%% prefix
 to PLIST_SUB.

Changes by Corey Halpin (maintainer):
- Update MASTER_SITES

PR:		174873
Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>
Approved by:	Corey Halpin (maintainer)
---
 mail/fetchmail/files/fetchmailconf    | 22 ------------------
 mail/fetchmail/files/fetchmailconf.in | 44 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 22 deletions(-)
 delete mode 100644 mail/fetchmail/files/fetchmailconf
 create mode 100644 mail/fetchmail/files/fetchmailconf.in

(limited to 'mail/fetchmail/files')

diff --git a/mail/fetchmail/files/fetchmailconf b/mail/fetchmail/files/fetchmailconf
deleted file mode 100644
index d3285d80fda6..000000000000
--- a/mail/fetchmail/files/fetchmailconf
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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.
-#
-# $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}/site-packages/_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
diff --git a/mail/fetchmail/files/fetchmailconf.in b/mail/fetchmail/files/fetchmailconf.in
new file mode 100644
index 000000000000..717cc15467d4
--- /dev/null
+++ b/mail/fetchmail/files/fetchmailconf.in
@@ -0,0 +1,44 @@
+#!/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.
+#
+# $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}/site-packages/_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
+#!/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.
+#
+# $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}/site-packages/_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
-- 
cgit v1.2.3