aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2010-01-27 17:05:16 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2010-01-27 17:05:16 +0000
commitcc35bb68264a9bd9705d677da6db8e0de85b211d (patch)
treedb0386f1c6d156142b33fc9df799c292629c68b2
parentd8f95b61aa7af4c92d50fc068ffc40af5797d8e3 (diff)
downloadports-cc35bb68264a9bd9705d677da6db8e0de85b211d.tar.gz
ports-cc35bb68264a9bd9705d677da6db8e0de85b211d.zip
Notes
-rw-r--r--japanese/migemo-emacs21/Makefile3
-rw-r--r--japanese/migemo-emacs22/Makefile9
2 files changed, 7 insertions, 5 deletions
diff --git a/japanese/migemo-emacs21/Makefile b/japanese/migemo-emacs21/Makefile
index 98eab128c28f..fd4da95275f4 100644
--- a/japanese/migemo-emacs21/Makefile
+++ b/japanese/migemo-emacs21/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORT
RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \
migemo:${PORTSDIR}/japanese/migemo
-CONFLICTS= ja-migemo-emacs22-[0-9]*
+CONFLICTS= ja-migemo-emacs23-[0-9]* \
+ ja-migemo-emacs22-[0-9]*
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-emacs=${EMACS_CMD}
diff --git a/japanese/migemo-emacs22/Makefile b/japanese/migemo-emacs22/Makefile
index 54394e89e16a..8811b63dd4c3 100644
--- a/japanese/migemo-emacs22/Makefile
+++ b/japanese/migemo-emacs22/Makefile
@@ -13,12 +13,13 @@ PLIST= ${MASTERDIR}/pkg-plist
PKGMESSAGE= ${MASTERDIR}/pkg-message
USE_EMACS= yes
-#EMACS_PORT_NAME= emacs22
-BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel
-RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel \
+EMACS_PORT_NAME= emacs22
+BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \
migemo:${PORTSDIR}/japanese/migemo
-CONFLICTS= ja-migemo-emacs21-[0-9]*
+CONFLICTS= ja-migemo-emacs23-[0-9]* \
+ ja-migemo-emacs21-[0-9]*
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-emacs=${EMACS_CMD}