summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-08-04 07:34:14 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-08-04 07:34:14 +0000
commit67a9290bcd60c9f14389e9b9a58c7e9c449241f1 (patch)
tree5f68dc67f8af77ce4ebb73ba9f9b5e7938d5df35 /textproc
parentAdd uim-el-emacs21, Emacs lisp for uim input method library for emacs21. (diff)
Remove EMACS_PORT_NAME to use default setting in bsd.emacs.mk.
Add CONFLICTS for uim-el-emacs21.
Notes
Notes: svn path=/head/; revision=197052
Diffstat (limited to 'textproc')
-rw-r--r--textproc/uim-el/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index e192f35fcc24..6d16e5517791 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -16,7 +16,8 @@ DISTNAME= uim-${PORTVERSION}
MAINTAINER= nobutaka@freebsd.org
COMMENT?= Emacs lisp for uim input method library
-CONFLICTS?= uim-el-xemacs21-mule-[0-9]*
+CONFLICTS?= uim-el-xemacs21-mule-[0-9]* \
+ uim-el-emacs21-[0-9]*
RUN_DEPENDS= uim-el-agent:${PORTSDIR}/textproc/uim
@@ -26,7 +27,6 @@ USE_ICONV= yes
USE_EMACS= yes
GNU_CONFIGURE= yes
-EMACS_PORT_NAME?= emacs21
BUILD_WRKSRC= ${WRKSRC}/emacs
INSTALL_WRKSRC= ${WRKSRC}/emacs