aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2010-01-28 01:05:16 +0800
committernobutaka <nobutaka@FreeBSD.org>2010-01-28 01:05:16 +0800
commitc9a858a7046fac702ccfff1be24f25f356491e33 (patch)
tree02627102e8c6276fe6d139a5a41ef3fbb7b54df4 /japanese
parent78ec173462c671a0b5e1e7526c6ac123ef80f70d (diff)
downloadfreebsd-ports-gnome-c9a858a7046fac702ccfff1be24f25f356491e33.tar.gz
freebsd-ports-gnome-c9a858a7046fac702ccfff1be24f25f356491e33.tar.zst
freebsd-ports-gnome-c9a858a7046fac702ccfff1be24f25f356491e33.zip
Update BUILD_DEPENDS, RUN_DEPENDS and CONFLICTS.
Diffstat (limited to 'japanese')
-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}