summaryrefslogtreecommitdiff
path: root/lang/python
diff options
context:
space:
mode:
authorHye-Shik Chang <perky@FreeBSD.org>2005-11-02 13:40:51 +0000
committerHye-Shik Chang <perky@FreeBSD.org>2005-11-02 13:40:51 +0000
commit332512a47691c07d950731c03ce94410126d03f4 (patch)
tree6e71c70ad04a0a313b9ecc539c5a5cb849f747e8 /lang/python
parentUpdate to 0.4.5 (diff)
Add a CONFLICT to lang/python-mode.el.
Notes
Notes: svn path=/head/; revision=147023
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 5bcfab6c0f2e..245465666e8f 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= perky@FreeBSD.org
COMMENT?= An interpreted object-oriented programming language
+CONFLICTS= python-mode.el-1.*
DIST_SUBDIR= python
WRKSRC= ${PYTHON_WRKSRC}
GNU_CONFIGURE= yes