diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2010-01-27 17:08:52 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2010-01-27 17:08:52 +0000 |
| commit | 26eb57d1ad527701d26f1b9e5fe244c0fefe1b49 (patch) | |
| tree | 672acae4b564ddd9e3a6b9e95a7401365d711635 /textproc | |
| parent | 3b38d16534c480c427a8599bb98cd89821e2f682 (diff) | |
| download | ports-26eb57d1ad527701d26f1b9e5fe244c0fefe1b49.tar.gz ports-26eb57d1ad527701d26f1b9e5fe244c0fefe1b49.zip | |
Update CONFLICTS.
Notes
Notes:
svn path=/head/; revision=248706
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/uim-el-emacs21/Makefile | 3 | ||||
| -rw-r--r-- | textproc/uim-el-xemacs21-mule/Makefile | 5 | ||||
| -rw-r--r-- | textproc/uim-el/Makefile | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/textproc/uim-el-emacs21/Makefile b/textproc/uim-el-emacs21/Makefile index d023206f940f..6d28b6222b9a 100644 --- a/textproc/uim-el-emacs21/Makefile +++ b/textproc/uim-el-emacs21/Makefile @@ -10,7 +10,8 @@ MAINTAINER= nobutaka@freebsd.org COMMENT= Emacs lisp for uim input method library CONFLICTS= uim-el-xemacs21-mule-[0-9]* \ - uim-el-emacs22-[0-9]* + uim-el-emacs23-[0-9]* \ + uim-el-emacs22-[0-9]* EMACS_PORT_NAME=emacs21 diff --git a/textproc/uim-el-xemacs21-mule/Makefile b/textproc/uim-el-xemacs21-mule/Makefile index 19c3bc113dec..74449eb1ce4b 100644 --- a/textproc/uim-el-xemacs21-mule/Makefile +++ b/textproc/uim-el-xemacs21-mule/Makefile @@ -9,8 +9,9 @@ MAINTAINER= nobutaka@freebsd.org COMMENT= XEmacs lisp for uim input method library -CONFLICTS= uim-el-emacs22-[0-9]* \ - uim-el-emacs21-[0-9]* +CONFLICTS= uim-el-emacs23-[0-9]* \ + uim-el-emacs22-[0-9]* \ + uim-el-emacs21-[0-9]* CONFIGURE_ARGS=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 7e29344a75fb..ba700a938042 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -18,7 +18,8 @@ COMMENT?= Emacs lisp for uim input method library PROJECTHOST= uim CONFLICTS?= uim-el-xemacs21-mule-[0-9]* \ - uim-el-emacs21-[0-9]* + uim-el-emacs22-[0-9]* \ + uim-el-emacs21-[0-9]* RUN_DEPENDS= uim-el-agent:${PORTSDIR}/textproc/uim |