8 files changed, 1 insertions, 96 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 704cf452dd63..2b7460567a81 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -359,8 +359,6 @@
     SUBDIR += trac
     SUBDIR += typist
     SUBDIR += uim-anthy
-    SUBDIR += uim-canna
-    SUBDIR += uim-prime
     SUBDIR += uim-tomoe-gtk
     SUBDIR += vera-fpw
     SUBDIR += vflib
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 9523a9895439..19e2ebf182e6 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -19,7 +19,7 @@ USE_GNOME=	gtk20
 .endif
 
 LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy \
-		uim.6:${PORTSDIR}/textproc/uim
+		uim.7:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
deleted file mode 100644
index fbf6a6468064..000000000000
--- a/japanese/uim-canna/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:   ja-uim-canna
-# Date created:        31 August 2003
-# Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-canna-nox11
-.else
-PKGNAMESUFFIX=	-canna
-.endif
-
-COMMENT=	Uim plugin using Canna input method
-
-LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib \
-		uim.6:${PORTSDIR}/textproc/uim
-
-MASTERDIR=	${.CURDIR}/../../textproc/uim
-PKGDIR=		${.CURDIR}
-CONFIGURE_ARGS=	--with-canna
-
-UIM_SLAVE=	yes
-
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-uim_Makefile.in
-
-do-build:
-	(cd ${WRKSRC}/uim && ${GMAKE} libuim-canna.la)
-
-do-install:
-	(cd ${WRKSRC}/uim && \
-	${GMAKE} uim_plugin_LTLIBRARIES=libuim-canna.la install-uim_pluginLTLIBRARIES)
-
-post-install:
-	${LOCALBASE}/bin/uim-module-manager --register canna
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-canna/pkg-descr b/japanese/uim-canna/pkg-descr
deleted file mode 100644
index 8998f761976a..000000000000
--- a/japanese/uim-canna/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-uim plugin using Canna input method.
-
-WWW: http://code.google.com/p/uim/
diff --git a/japanese/uim-canna/pkg-plist b/japanese/uim-canna/pkg-plist
deleted file mode 100644
index 04240b6c7c43..000000000000
--- a/japanese/uim-canna/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/uim/plugin/libuim-canna.a
-lib/uim/plugin/libuim-canna.la
-lib/uim/plugin/libuim-canna.so
-@exec uim-module-manager --register canna
-@unexec uim-module-manager --unregister canna
diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile
deleted file mode 100644
index 9aceb697e2c5..000000000000
--- a/japanese/uim-prime/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:   ja-uim-prime
-# Date created:        31 August 2003
-# Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-prime-nox11
-.else
-PKGNAMESUFFIX=	-prime
-.endif
-
-COMMENT=	Uim plugin using PRIME input method
-
-BUILD_DEPENDS=	prime:${PORTSDIR}/japanese/prime
-LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-
-MASTERDIR=	${.CURDIR}/../../textproc/uim
-PKGDIR=		${.CURDIR}
-CONFIGURE_ARGS=	--with-prime
-
-UIM_SLAVE=	yes
-
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-uim_Makefile.in
-
-do-build:
-	(cd ${WRKSRC}/uim && ${GMAKE} libuim-prime.la)
-
-do-install:
-	(cd ${WRKSRC}/uim && \
-	${GMAKE} uim_plugin_LTLIBRARIES=libuim-prime.la install-uim_pluginLTLIBRARIES)
-
-post-install:
-	${LOCALBASE}/bin/uim-module-manager --register prime
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-prime/pkg-descr b/japanese/uim-prime/pkg-descr
deleted file mode 100644
index 6dd8e8ed4461..000000000000
--- a/japanese/uim-prime/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-uim plugin using PRIME input method.
-
-WWW: http://code.google.com/p/uim/
diff --git a/japanese/uim-prime/pkg-plist b/japanese/uim-prime/pkg-plist
deleted file mode 100644
index 1de28f91443f..000000000000
--- a/japanese/uim-prime/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/uim/plugin/libuim-prime.a
-lib/uim/plugin/libuim-prime.la
-lib/uim/plugin/libuim-prime.so
-@exec uim-module-manager --register prime
-@unexec uim-module-manager --unregister prime