aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2007-08-04 15:34:14 +0800
committernobutaka <nobutaka@FreeBSD.org>2007-08-04 15:34:14 +0800
commitd4d7ea5b37512ce3ad022fab26c3d0e246001190 (patch)
tree29e2cb9084c2b43bc62d8ce14099e381d0f65e9b /textproc
parentd8bae37baa96a572e50fce363bc8415c135951e3 (diff)
downloadfreebsd-ports-gnome-d4d7ea5b37512ce3ad022fab26c3d0e246001190.tar.gz
freebsd-ports-gnome-d4d7ea5b37512ce3ad022fab26c3d0e246001190.tar.zst
freebsd-ports-gnome-d4d7ea5b37512ce3ad022fab26c3d0e246001190.zip
Remove EMACS_PORT_NAME to use default setting in bsd.emacs.mk.
Add CONFLICTS for uim-el-emacs21.
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