30 files changed, 105 insertions, 15 deletions

diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python+ipv6/pkg-plist b/lang/python+ipv6/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python+ipv6/pkg-plist
+++ b/lang/python+ipv6/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python/Makefile b/lang/python/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python15/pkg-plist b/lang/python15/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python15/pkg-plist
+++ b/lang/python15/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python20/pkg-plist
+++ b/lang/python20/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python21/pkg-plist
+++ b/lang/python21/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index fe715b119522..3cc135b675b2 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -32,9 +32,11 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default.
+# Support for Tk is compiled in by default only if X11 is installed.
 #
+.if exists(${X11_BASE})
 WITH_TK?=	yes
+.endif
 .if defined(WITH_TK) && $(WITH_TK) == yes
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
@@ -104,6 +106,8 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/doc/python
+	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
 .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 2360c6ba0f0d..58ef1c97477d 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -1,6 +1,7 @@
 bin/python1.5
 bin/python
 share/doc/python/COPYRIGHT
+share/emacs/site-lisp/python-mode.el
 include/python1.5/Python.h
 include/python1.5/abstract.h
 include/python1.5/bitset.h
@@ -995,3 +996,4 @@ lib/python1.5/xmllib.pyo
 @dirrm lib/python1.5
 @exec mkdir -p %D/lib/python1.5/site-packages
 @dirrm share/doc/python
+@unexec rmdir share/emacs/site-lisp 2>/dev/null || true