diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2005-11-02 13:40:51 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2005-11-02 13:40:51 +0000 |
| commit | 332512a47691c07d950731c03ce94410126d03f4 (patch) | |
| tree | 6e71c70ad04a0a313b9ecc539c5a5cb849f747e8 | |
| parent | Update to 0.4.5 (diff) | |
Add a CONFLICT to lang/python-mode.el.
Notes
Notes:
svn path=/head/; revision=147023
| -rw-r--r-- | lang/python/Makefile | 1 | ||||
| -rw-r--r-- | lang/python24/Makefile | 1 |
2 files changed, 2 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 diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 5bcfab6c0f2e..245465666e8f 100644 --- a/lang/python24/Makefile +++ b/lang/python24/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 |