- Patch SCIM KMFL engine (textproc/scim-kmfl-imengine) to use

  the same neutral keyboard repository as textproc/ibus-kmfl does,
  ${LOCALBASE}/share/kmfl/. This approach is similar to m17n (its
  keyboard databases, devel/m17n-db and textproc/m17n-contrib, are
  shared between textproc/scim-m17n and textproc/ibus-m17n). This
  patch also makes both these KMFL engine ports to read ~/.kmfl/
  instead of SCIM-oriented ~/.scim/kmfl/.
  There is UPDATING text that informs KMFL users about this.

- Patch keyboard ports (7 of them) to install data to the new
  repository, ${LOCALBASE}/share/kmfl/; the keyboard ports were
  SCIM-only and used to install to ${LOCALBASE}/share/scim/kmfl/.

- Adapt descriptions in other KMFL ports (textproc/kmflcomp,
  textproc/libkmfl);

- While we are here, do some additional maintenance.

- Remove the 7 old ports.

- Please see the PR for full details.

PR:		ports/156694
Submitted by:	Nikola Lecic <nikola.lecic@anthesphoria.net> (maintainer)

64 files changed, 187 insertions, 863 deletions

diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index b941c8f3273c..4309cecfddd8 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ibus-kmfl
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/kmfl/${PORTNAME}/${PORTVERSION} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -24,8 +25,9 @@ USE_GNOME=	glib20 pkgconfig
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,7 +38,10 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
+	@${CP} ${WRKSRC}/icons/default.png ${WRKSRC}/icons/default-kmfl.png
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' \
 		${WRKSRC}/src/kmflutil.c ${WRKSRC}/src/kmfl.xml.in.in
+	@${REINPLACE_CMD} -e 's|default\.png|default-kmfl.png|g' \
+		${WRKSRC}/src/kmflutil.c ${WRKSRC}/icons/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/ibus-kmfl/distinfo b/textproc/ibus-kmfl/distinfo
index 6d5e807d43db..a0764ceb7cb1 100644
--- a/textproc/ibus-kmfl/distinfo
+++ b/textproc/ibus-kmfl/distinfo
@@ -1,3 +1,2 @@
-MD5 (kmfl/ibus-kmfl-1.0.3.tar.gz) = d98ed94d49ed2019008f7b4dc4a20e6c
 SHA256 (kmfl/ibus-kmfl-1.0.3.tar.gz) = 0befc497090f5d1f379aec333e2363c0c54192203b81fdfd8d102ce229f0af7f
 SIZE (kmfl/ibus-kmfl-1.0.3.tar.gz) = 526025
diff --git a/textproc/ibus-kmfl/pkg-descr b/textproc/ibus-kmfl/pkg-descr
index 1c4000ca92b3..57e30b363e25 100644
--- a/textproc/ibus-kmfl/pkg-descr
+++ b/textproc/ibus-kmfl/pkg-descr
@@ -14,5 +14,6 @@ constants, SIL Ethnologue language codes, etc.
 
 Official Tavultesoft repository contains keyboards that cover more
 than 220 languages. Significant number of them are open source.
+The keyboard ports are textproc/kmfl-*.
 
 WWW: http://kmfl.sourceforge.net/
diff --git a/textproc/ibus-kmfl/pkg-plist b/textproc/ibus-kmfl/pkg-plist
index 93c7b9ecaebb..8aa160b53977 100644
--- a/textproc/ibus-kmfl/pkg-plist
+++ b/textproc/ibus-kmfl/pkg-plist
@@ -1,7 +1,7 @@
 libexec/ibus-engine-kmfl
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-kmfl.mo
 share/ibus/component/kmfl.xml
-share/kmfl/icons/default.png
+share/kmfl/icons/default-kmfl.png
 share/kmfl/icons/ibus-kmfl.svg
-@dirrm share/kmfl/icons
-@dirrm share/kmfl
+@dirrmtry share/kmfl/icons
+@dirrmtry share/kmfl
diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile
index 69f74dec3e7c..2eb9e8673b1c 100644
--- a/textproc/kmfl-european-latin/Makefile
+++ b/textproc/kmfl-european-latin/Makefile
@@ -4,9 +4,9 @@
 #
 # $FreeBSD$
 
-PORTNAME=	scim-kmfl-european-latin
+PORTNAME=	kmfl-european-latin
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://eurolatin.keymankeyboards.com/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
@@ -14,10 +14,9 @@ DISTNAME=	eurolatin-${PORTVERSION}
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	Paneuropean Latin KMFL SCIM IMEngine keyboard covering 42 languages
+COMMENT=	Paneuropean Latin KMFL keyboard covering 42 languages
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 NO_WRKSUBDIR=	yes
 USE_DOS2UNIX=	european.kmn
@@ -26,21 +25,24 @@ USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
 PORTDOCS=	*
 DOCSLIST=	eurolatin12.pdf european.html licence.txt readme.html \
 	       	welcome.htm
-PLIST_FILES=	${SCIM_KMFL_DIR}/european.kmn \
-		${SCIM_KMFL_ICONS_DIR}/european.bmp \
-		${SCIM_KMFL_ICONS_DIR}/latin.bmp \
-		${SCIM_KMFL_ICONS_DIR}/latin.ico
+PLIST_FILES=	${KMFL_DIR}/european.kmn \
+		${KMFL_ICONS_DIR}/european.bmp \
+		${KMFL_ICONS_DIR}/latin.bmp \
+		${KMFL_ICONS_DIR}/latin.ico
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/*.bmp ${WRKSRC}/*.ico \
-	       ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	       ${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
@@ -51,13 +53,13 @@ do-install:
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Others\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  The PDF documentation for use of the European Latin"
 	@${ECHO_MSG} "  Keyboard can be found in:"
-	@${ECHO_MSG} "  ${PREFIX}/share/doc/kmfl/scim-kmfl-european-latin/"
+	@${ECHO_MSG} "  ${PREFIX}/share/doc/kmfl/${PORTNAME}/"
 .endif
 	@${ECHO_MSG} "--------------------------------------------------------"
 
diff --git a/textproc/kmfl-european-latin/distinfo b/textproc/kmfl-european-latin/distinfo
index 72b20db8cc3b..caa7875d2a67 100644
--- a/textproc/kmfl-european-latin/distinfo
+++ b/textproc/kmfl-european-latin/distinfo
@@ -1,3 +1,2 @@
-MD5 (kmfl/eurolatin-1.2.zip) = 7785b7102296521294eb8c5db7f13a07
 SHA256 (kmfl/eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
 SIZE (kmfl/eurolatin-1.2.zip) = 362966
diff --git a/textproc/kmfl-european-latin/pkg-descr b/textproc/kmfl-european-latin/pkg-descr
index 01638056e9dd..052a8b738792 100644
--- a/textproc/kmfl-european-latin/pkg-descr
+++ b/textproc/kmfl-european-latin/pkg-descr
@@ -5,8 +5,8 @@ developer, Tavultesoft (http://www.tavultesoft.com). The keyboard
 uses punctuation and letter keys in sequence to access diacritic and
 other letters.
 
-This port installs the keyboard so that it can be used through SCIM
-KMFL IMEngine (textproc/scim-kmfl-imengine).
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
 
 Some of the supported languages include: Afrikaans, Albanian,
 Balearic, Basque, Breton, Catalan, Croatian, Czech, Danish, Dutch,
diff --git a/textproc/kmfl-sil-ezra/Makefile b/textproc/kmfl-sil-ezra/Makefile
index 1daf0ec27b4e..4553e4e5b80a 100644
--- a/textproc/kmfl-sil-ezra/Makefile
+++ b/textproc/kmfl-sil-ezra/Makefile
@@ -4,23 +4,22 @@
 #
 # $FreeBSD$
 
-PORTNAME=	scim-kmfl-sil-ezra
+PORTNAME=	kmfl-sil-ezra
 PORTVERSION=	2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=EzraSIL251_Src.zip\&filename=/:1 \
 		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=EzraSIL2.5Keying\&filename=/:2 \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/kmfl/:1,2
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/:1,2
 DISTFILES=	EzraSIL251_Src.zip:1 \
 		Keying+in+Hebrew.pdf:2
 DIST_SUBDIR=	kmfl
 EXTRACT_ONLY=	EzraSIL251_Src.zip
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine keyboard for Unicode Biblical Hebrew
+COMMENT=	KMFL keyboard for Unicode Biblical Hebrew
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/EzraSIL2.51
 USE_DOS2UNIX=	Keyman/EZRAUNI24.KMN
@@ -29,8 +28,8 @@ USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
 PORTDOCS=	*
 DOCSLIST=	${WRKSRC}/Licenses.txt ${WRKSRC}/README.txt \
@@ -38,14 +37,17 @@ DOCSLIST=	${WRKSRC}/Licenses.txt ${WRKSRC}/README.txt \
 		${DISTDIR}/${DIST_SUBDIR}/Keying+in+Hebrew.pdf \
 		${WRKSRC}/WordDocs/Simplified\ keyboard\ chart.doc
 
-PLIST_FILES=	${SCIM_KMFL_DIR}/EZRAUNI24.kmn \
-		${SCIM_KMFL_ICONS_DIR}/HEBDISPY.bmp \
-		${SCIM_KMFL_ICONS_DIR}/alef.bmp
+PLIST_FILES=	${KMFL_DIR}/EZRAUNI24.kmn \
+		${KMFL_ICONS_DIR}/HEBDISPY.bmp \
+		${KMFL_ICONS_DIR}/alef.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
 	${CP} -f ${WRKSRC}/Keyman/EZRAUNI24.KMN ${WRKSRC}/Keyman/EZRAUNI24.kmn
-	${INSTALL_DATA} ${WRKSRC}/Keyman/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/Keyman/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/Keyman/*.kmn ${LOCALBASE}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/Keyman/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
@@ -56,7 +58,7 @@ do-install:
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Hebrew\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Hebrew\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG}
diff --git a/textproc/kmfl-sil-ezra/distinfo b/textproc/kmfl-sil-ezra/distinfo
index 98b1d0017990..e3f33a87f2f8 100644
--- a/textproc/kmfl-sil-ezra/distinfo
+++ b/textproc/kmfl-sil-ezra/distinfo
@@ -1,6 +1,4 @@
-MD5 (kmfl/EzraSIL251_Src.zip) = 9c94d51b9dd6ab1b7fb0db7e67d5ed9e
 SHA256 (kmfl/EzraSIL251_Src.zip) = d0818f56c4d0e63b1d947cfef5f7dfec005e771e7d178a7197c12539bce454c4
 SIZE (kmfl/EzraSIL251_Src.zip) = 1030435
-MD5 (kmfl/Keying+in+Hebrew.pdf) = 1817c823ac75e59f57a96ee059263033
 SHA256 (kmfl/Keying+in+Hebrew.pdf) = c034cc1e97cab0e4fc692c2e70e25745f7375e2bd6a7089506e876f66cf5f731
 SIZE (kmfl/Keying+in+Hebrew.pdf) = 89974
diff --git a/textproc/kmfl-sil-ezra/pkg-descr b/textproc/kmfl-sil-ezra/pkg-descr
index 981ba36bc52f..aad6fb986c9b 100644
--- a/textproc/kmfl-sil-ezra/pkg-descr
+++ b/textproc/kmfl-sil-ezra/pkg-descr
@@ -2,8 +2,8 @@ This is a keyboard for input of the complex Biblical Hebrew (including
 cantillation marks) with Unicode fonts. It is written in Keyman keyboard
 language and developed by SIL Non-Roman Script Initiative (NRSI).
 
-This port installs the keyboard so that it can be used through SCIM KMFL
-IMEngine (textproc/scim-kmfl-imengine).
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
 
 The keyboard is provided under the terms of MIT/X11 License.
 
diff --git a/textproc/kmfl-sil-galatia/Makefile b/textproc/kmfl-sil-galatia/Makefile
index 36a266230c77..205019ba7cbd 100644
--- a/textproc/kmfl-sil-galatia/Makefile
+++ b/textproc/kmfl-sil-galatia/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	scim-kmfl-sil-galatia
+PORTNAME=	kmfl-sil-galatia
 PORTVERSION=	1.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=GrkPolyComp_Src&filename=/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -15,10 +15,9 @@ DISTNAME=	GrkPolyComp_Src
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Unicode keyboard for typesetting Ancient Greek
+COMMENT=	KMFL Unicode keyboard for typesetting Ancient Greek
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/GrkPolyComp_Src
 USE_DOS2UNIX=	GrkPolyComp.KMN
@@ -27,20 +26,23 @@ USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
 PORTDOCS=	*
 DOCSLIST=	Greek\ Poly\ Comp\ Kbrd\ Layout.pdf \
 		welcome.htm
 
-PLIST_FILES=	${SCIM_KMFL_DIR}/GrkPolyComp.kmn \
-		${SCIM_KMFL_ICONS_DIR}/ALPHA.bmp
+PLIST_FILES=	${KMFL_DIR}/GrkPolyComp.kmn \
+		${KMFL_ICONS_DIR}/ALPHA.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
 	${CP} -f ${WRKSRC}/GrkPolyComp.KMN ${WRKSRC}/GrkPolyComp.kmn
-	${INSTALL_DATA} ${WRKSRC}/GrkPolyComp.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/GrkPolyComp.kmn ${LOCALBASE}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
@@ -51,7 +53,7 @@ do-install:
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Greek\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Greek\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG}
diff --git a/textproc/kmfl-sil-galatia/distinfo b/textproc/kmfl-sil-galatia/distinfo
index 8caab4fd023e..eeface13e6aa 100644
--- a/textproc/kmfl-sil-galatia/distinfo
+++ b/textproc/kmfl-sil-galatia/distinfo
@@ -1,3 +1,2 @@
-MD5 (kmfl/GrkPolyComp_Src.zip) = 5e7bf6186a3917d796f1abb710bed539
 SHA256 (kmfl/GrkPolyComp_Src.zip) = 59b4ad7f7a31f66a674f1867979baf07ae5143957cec6575e3d1428f5acf66e7
 SIZE (kmfl/GrkPolyComp_Src.zip) = 197829
diff --git a/textproc/kmfl-sil-galatia/pkg-descr b/textproc/kmfl-sil-galatia/pkg-descr
index d110dfb2d483..9e500b985ce5 100644
--- a/textproc/kmfl-sil-galatia/pkg-descr
+++ b/textproc/kmfl-sil-galatia/pkg-descr
@@ -2,6 +2,9 @@ This is a keyboard for typesetting Ancient Greek with precomposed Unicode
 characters. It is written in Keyman Keyboard Language by SIL Non-Roman Script
 Initiative (NRSI).
 
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
+
 The main purpose of the keyboards is to provide a wide range of keying options,
 so many characters can be entered in multiple ways. The features include:
 
diff --git a/textproc/kmfl-sil-ipa-unicode/Makefile b/textproc/kmfl-sil-ipa-unicode/Makefile
index 57e76b02f759..474eb846482e 100644
--- a/textproc/kmfl-sil-ipa-unicode/Makefile
+++ b/textproc/kmfl-sil-ipa-unicode/Makefile
@@ -4,9 +4,9 @@
 #
 # $FreeBSD$
 
-PORTNAME=	scim-kmfl-sil-ipa-unicode5
+PORTNAME=	kmfl-sil-ipa-unicode
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12_Src\&filename=/:1 \
 		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12.pdf\&filename=/:2
@@ -16,10 +16,9 @@ DIST_SUBDIR=	kmfl
 EXTRACT_ONLY=	IPAUni_Src12.zip
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	IPA Unicode 5.1 mnemonic keyboard for KMFL IMEngine of SCIM
+COMMENT=	IPA Unicode 5.1 mnemonic keyboard for KMFL IMEngine
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/IPA12
 USE_DOS2UNIX=	IPAUni12.kmn
@@ -28,20 +27,23 @@ USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 DOCSLIST=	${WRKSRC}/welcome.htm \
 		${DISTDIR}/${DIST_SUBDIR}/IPA+Unicode+5.1_ver+1.2_KMN.pdf
-PLIST_FILES=	${SCIM_KMFL_DIR}/IPAUni12.kmn \
-		${SCIM_KMFL_ICONS_DIR}/ipa.bmp \
-		${SCIM_KMFL_ICONS_DIR}/sil.bmp
+PLIST_FILES=	${KMFL_DIR}/IPAUni12.kmn \
+		${KMFL_ICONS_DIR}/ipa.bmp \
+		${KMFL_ICONS_DIR}/sil.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
diff --git a/textproc/kmfl-sil-ipa-unicode/distinfo b/textproc/kmfl-sil-ipa-unicode/distinfo
index c9e9f813812b..9d7161c23835 100644
--- a/textproc/kmfl-sil-ipa-unicode/distinfo
+++ b/textproc/kmfl-sil-ipa-unicode/distinfo
@@ -1,6 +1,4 @@
-MD5 (kmfl/IPAUni_Src12.zip) = 68a280eda858cbb062581c760e68d362
 SHA256 (kmfl/IPAUni_Src12.zip) = e4ed6d9268c5877f800437a6d5e6f8ea664f469059c905ee4c3682a92511da69
 SIZE (kmfl/IPAUni_Src12.zip) = 123262
-MD5 (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = fdd096cbd0dfe39f819f8b62e53f96e6
 SHA256 (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = 778abed97671f7957c4e404b4f766ef636cffa7bd18195aa72d9883999ce28d6
 SIZE (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = 638769
diff --git a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
index d9bf80e47566..a2544bd6871e 100644
--- a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
+++ b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
@@ -1,7 +1,7 @@
 
 ------------------------------------------------------------------------
   You should now have the new keyboard in section "Others" of your
-  SCIM menu. If you don't see it, restart X.
+  SCIM/IBus menu. If you don't see it, restart X.
 
   The PDF documentation for use of SIL IPA Unicode5 keyboard can be
   found in 
diff --git a/textproc/kmfl-sil-ipa-unicode/pkg-descr b/textproc/kmfl-sil-ipa-unicode/pkg-descr
index 26957b02b4cd..cca851fc4587 100644
--- a/textproc/kmfl-sil-ipa-unicode/pkg-descr
+++ b/textproc/kmfl-sil-ipa-unicode/pkg-descr
@@ -1,8 +1,10 @@
 This is mnemonic keyboard that covers entire IPA (International
 Phonetic Alphabet) Unicode 5 range, written in Keyman keyboard
 language. The keyboard is developed by SIL Non-Roman Script Initiative
-(NRSI). This port installs the keyboard so that it can be used through
-SCIM KMFL IMEngine (textproc/scim-kmfl-imengine).
+(NRSI).
+
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
                          
 This keyboard is provided under SIL International X11-style License
 (http://scripts.sil.org/X11License).
diff --git a/textproc/kmfl-sil-panafrican-latin/Makefile b/textproc/kmfl-sil-panafrican-latin/Makefile
index bee2ecac8e9f..3f04691f9362 100644
--- a/textproc/kmfl-sil-panafrican-latin/Makefile
+++ b/textproc/kmfl-sil-panafrican-latin/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	scim-kmfl-sil-panafrican-latin
+PORTNAME=	kmfl-sil-panafrican-latin
 PORTVERSION=	20090831
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=AfricaKeyboardDead2009\&filename=/:1 \
 		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=AfricaKeyboardUS2009\&filename=/:2 \
@@ -16,10 +16,9 @@ DISTFILES=	AfricaKeyboardDead.zip:1 AfricaKeyboardUS.zip:2
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine keyboard for African Latin writing systems
+COMMENT=	KMFL keyboard for African Latin writing systems
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}
 USE_DOS2UNIX=	PanAfricaMnemonic/AfricaDeadKey.kmn \
@@ -29,8 +28,8 @@ USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
 post-patch:
 		@${REINPLACE_CMD} -e 's|^BITMAP AFR|BITMAP AFR.bmp|' \
@@ -41,17 +40,20 @@ PORTDOCS=	*
 DOCSLIST=	PanAfricaMnemonic/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ deadkeys.pdf \
 		PanAfricaUSlayout/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ shiftkeys.pdf
 
-PLIST_FILES=	${SCIM_KMFL_DIR}/AfricaDeadKey.kmn \
-		${SCIM_KMFL_DIR}/AfricaUS.kmn \
-		${SCIM_KMFL_ICONS_DIR}/AFR.bmp
+PLIST_FILES=	${KMFL_DIR}/AfricaDeadKey.kmn \
+		${KMFL_DIR}/AfricaUS.kmn \
+		${KMFL_ICONS_DIR}/AFR.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/PanAfricaMnemonic/*.kmn \
-		${LOCALBASE}/${SCIM_KMFL_DIR}
+		${LOCALBASE}/${KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/PanAfricaUSlayout/*.kmn \
-		${LOCALBASE}/${SCIM_KMFL_DIR}
+		${LOCALBASE}/${KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/PanAfricaMnemonic/*.bmp \
-		${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+		${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
@@ -62,7 +64,7 @@ do-install:
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Others\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG}
diff --git a/textproc/kmfl-sil-panafrican-latin/distinfo b/textproc/kmfl-sil-panafrican-latin/distinfo
index aab7e63e6bca..ccb3848c70f2 100644
--- a/textproc/kmfl-sil-panafrican-latin/distinfo
+++ b/textproc/kmfl-sil-panafrican-latin/distinfo
@@ -1,6 +1,4 @@
-MD5 (kmfl/AfricaKeyboardDead.zip) = 820822a611f9480a878d4f6322b749e7
 SHA256 (kmfl/AfricaKeyboardDead.zip) = b6dace0151891a249d9ee61307a7f95105be9445e91a8bb0b0f36f229ff5d6eb
 SIZE (kmfl/AfricaKeyboardDead.zip) = 386610
-MD5 (kmfl/AfricaKeyboardUS.zip) = 02917a406aa67b3065a097dc3e3a67c5
 SHA256 (kmfl/AfricaKeyboardUS.zip) = fea2fe19ada6a16b134ae85d7fd3fa8f9b71a26235b11a5bfbb941ffbd4e0507
 SIZE (kmfl/AfricaKeyboardUS.zip) = 399319
diff --git a/textproc/kmfl-sil-panafrican-latin/pkg-descr b/textproc/kmfl-sil-panafrican-latin/pkg-descr
index 8d382e0fd687..dd878d1cf6ad 100644
--- a/textproc/kmfl-sil-panafrican-latin/pkg-descr
+++ b/textproc/kmfl-sil-panafrican-latin/pkg-descr
@@ -6,8 +6,9 @@ The keyboards are written in Keyman keyboard language and developed by SIL
 Non-Roman Script Initiative (NRSI). The software is distributed under the
 X11-style license (http://scripts.sil.org/X11License).
 
-This port installs the keyboards so that they can be used through SCIM KMFL
-IMEngine (textproc/scim-kmfl-imengine). Two layouts are provided:
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
+Two layouts are provided:
 
   * mnemonic layout for any keyboard (using deadkeys);
   * positional layout for US keyboard (using deadkeys and/or shift-states, i.e.
diff --git a/textproc/kmfl-sil-yi/Makefile b/textproc/kmfl-sil-yi/Makefile
index 51db1967f9bc..878557276618 100644
--- a/textproc/kmfl-sil-yi/Makefile
+++ b/textproc/kmfl-sil-yi/Makefile
@@ -5,40 +5,42 @@
 # $FreeBSD$
 #
 
-PORTNAME=	scim-kmfl-sil-yi
+PORTNAME=	kmfl-sil-yi
 PORTVERSION=	20020903
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=SILYi12OFL_Src&filename=/ \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/kmfl/
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
 DISTNAME=	SILYiOFL1.2Src
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Unicode keyboard for standardized Yi script
+COMMENT=	KMFL Unicode keyboard for standardized Yi script
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}
 USE_DOS2UNIX=	SourceFiles/Yi7.kmn
 NO_BUILD=	yes
 USE_ZIP=	yes
 
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
-PLIST_FILES=	${SCIM_KMFL_DIR}/Yi7.kmn \
-		${SCIM_KMFL_ICONS_DIR}/YiPinYin.bmp
+PLIST_FILES=	${KMFL_DIR}/Yi7.kmn \
+		${KMFL_ICONS_DIR}/YiPinYin.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.kmn ${LOCALBASE}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
 
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Others\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  At the moment, this keyboard has no documentation."
diff --git a/textproc/kmfl-sil-yi/distinfo b/textproc/kmfl-sil-yi/distinfo
index ac88e485ae99..8fe797b79a07 100644
--- a/textproc/kmfl-sil-yi/distinfo
+++ b/textproc/kmfl-sil-yi/distinfo
@@ -1,3 +1,2 @@
-MD5 (kmfl/SILYiOFL1.2Src.zip) = 9565edac15ec019b935d7a8e0a841968
 SHA256 (kmfl/SILYiOFL1.2Src.zip) = 7733011014f3a4ad77456d668db318d78f19ca03613dd6857cf80cf3a0ef3245
 SIZE (kmfl/SILYiOFL1.2Src.zip) = 2627553
diff --git a/textproc/kmfl-sil-yi/pkg-descr b/textproc/kmfl-sil-yi/pkg-descr
index 2a8a4dfe70e5..cd3be0ca6cfe 100644
--- a/textproc/kmfl-sil-yi/pkg-descr
+++ b/textproc/kmfl-sil-yi/pkg-descr
@@ -2,6 +2,9 @@ This is a keyboard for input of the standardized Yi script of southwestern
 China with Unicode Yi fonts. It is written in Keyman keyboard language and
 developed by SIL Non-Roman Script Initiative (NRSI).
 
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
+
 To keyboard a Yi syllable, you should type the Pinyin romanization for that
 syllable, followed by a space. For keyboarding punctuation, use the usual
 punctuation keystrokes.
diff --git a/textproc/kmfl-varamozhi-malayalam/Makefile b/textproc/kmfl-varamozhi-malayalam/Makefile
index 328e779c4472..aba26297e64a 100644
--- a/textproc/kmfl-varamozhi-malayalam/Makefile
+++ b/textproc/kmfl-varamozhi-malayalam/Makefile
@@ -5,39 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	scim-kmfl-varamozhi-malayalam
+PORTNAME=	kmfl-varamozhi-malayalam
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/varamozhi/2%20Mozhi%20Keyman%20-%20Input%20Method/${PORTVERSION} \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/kmfl/
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
 DISTNAME=	mozhi_${PORTVERSION}
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Malayalam keyboard according to the Mozhi scheme
+COMMENT=	KMFL Malayalam keyboard according to the Mozhi scheme
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
+RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 USE_DOS2UNIX=	mozhi_1.1.0.kmn
 NO_BUILD=	yes
 USE_ZIP=	yes
 
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
 
-PLIST_FILES=	${SCIM_KMFL_DIR}/mozhi_1.1.0.kmn \
-		${SCIM_KMFL_ICONS_DIR}/mozhi.bmp
+PLIST_FILES=	${KMFL_DIR}/mozhi_1.1.0.kmn \
+		${KMFL_ICONS_DIR}/mozhi.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
 
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Malayalam\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Malayalam\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  At the moment, this keyboard has no downloadable"
diff --git a/textproc/kmfl-varamozhi-malayalam/distinfo b/textproc/kmfl-varamozhi-malayalam/distinfo
index 65522ce3a7bc..95a706706030 100644
--- a/textproc/kmfl-varamozhi-malayalam/distinfo
+++ b/textproc/kmfl-varamozhi-malayalam/distinfo
@@ -1,3 +1,2 @@
-MD5 (kmfl/mozhi_1.1.1.zip) = 69eb4fd5405c5fbed69bc401a48bef67
 SHA256 (kmfl/mozhi_1.1.1.zip) = b1d584c60ecde1c2c40ca96945bf062be5d32d52249570328cd112f9f29037f1
 SIZE (kmfl/mozhi_1.1.1.zip) = 208053
diff --git a/textproc/kmfl-varamozhi-malayalam/pkg-descr b/textproc/kmfl-varamozhi-malayalam/pkg-descr
index f002ba048e3f..2d8efef0726a 100644
--- a/textproc/kmfl-varamozhi-malayalam/pkg-descr
+++ b/textproc/kmfl-varamozhi-malayalam/pkg-descr
@@ -11,7 +11,7 @@ This keymap supports the current standard for Malayalam Chillus (i.e. without
 special encoding). It offers mnemonic keyboard functionality and smart-quote
 functionality with comas and numerals.
 
-This port installs the keyboard so that it can be used through SCIM KMFL
-IMEngine (textproc/scim-kmfl-imengine).
+This port installs the keyboard so that it can be used through SCIM or
+IBus KMFL IMEngine (textproc/scim-kmfl-imengine, textproc/ibus-kmfl).
 
 WWW: http://varamozhi.sourceforge.net/
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index 880d151beb38..c788e8d060ac 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -8,15 +8,16 @@
 PORTNAME=	kmflcomp
 PORTVERSION=	0.9.9
 CATEGORIES=	textproc
-MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION} \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
-		KMFL-Compiler.sxw
+MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION}:1 \
+		SF/kmfl/kmfl/Documentation:2 \
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/:1,2
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:1 \
+		KMFL-Compiler.sxw:2
 DIST_SUBDIR=	kmfl
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	Compiler of Keyman keyboard sources to use with SCIM KMFL IMEngine
+COMMENT=	Compiler of Keyman KMFL keyboard sources to use with SCIM/IBus
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 
@@ -24,8 +25,9 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 DOCS=		${DISTDIR}/${DIST_SUBDIR}/KMFL-Compiler.sxw \
diff --git a/textproc/kmflcomp/distinfo b/textproc/kmflcomp/distinfo
index b5ff512f6409..5223249ab054 100644
--- a/textproc/kmflcomp/distinfo
+++ b/textproc/kmflcomp/distinfo
@@ -1,6 +1,4 @@
-MD5 (kmfl/kmflcomp-0.9.9.tar.gz) = ece7fab3fd378ae93445912b6c90c29d
 SHA256 (kmfl/kmflcomp-0.9.9.tar.gz) = d07fe491ab4bfd6ad1d60a092c382c6e567f44729d406f066d804057ca9f716a
 SIZE (kmfl/kmflcomp-0.9.9.tar.gz) = 365124
-MD5 (kmfl/KMFL-Compiler.sxw) = d9bf9f5a45824354205ce8a4721b807d
 SHA256 (kmfl/KMFL-Compiler.sxw) = dedb0aee0b7d931dff48d0bcd3f9fa5c2c71d4684f9aa53e064df5bfb8b04841
 SIZE (kmfl/KMFL-Compiler.sxw) = 56675
diff --git a/textproc/kmflcomp/files/pkg-message.in b/textproc/kmflcomp/files/pkg-message.in
index 2794c379b73e..915a6f1c9358 100644
--- a/textproc/kmflcomp/files/pkg-message.in
+++ b/textproc/kmflcomp/files/pkg-message.in
@@ -14,6 +14,7 @@
 
     http://tavultesoft.com/keymandev/documentation/help/main/guide.php
 
-  You need textproc/scim-kmfl-imengine and textproc/scim-kmfl-* ports
-  in order to use actual keyboards through SCIM.
+  You need textproc/scim-kmfl-imengine to use KMFL keyboards through
+  SCIM, or textproc/ibus-kmfl to use them through IBus. The keyboard
+  ports are textproc/kmfl-*.
 ------------------------------------------------------------------------
diff --git a/textproc/libkmfl/Makefile b/textproc/libkmfl/Makefile
index 9e5abc39f12a..e19a00026ee4 100644
--- a/textproc/libkmfl/Makefile
+++ b/textproc/libkmfl/Makefile
@@ -7,20 +7,22 @@
 
 PORTNAME=	libkmfl
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION} \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	An engine to interpret compiled KMFL keyboard tables
 
-LIB_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+LIB_DEPENDS=	kmflcomp.0:${PORTSDIR}/textproc/kmflcomp
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 PORTDOCS=	AUTHORS COPYING ChangeLog
@@ -30,7 +32,7 @@ PLIST_FILES=	include/kmfl/libkmfl.h \
 		lib/libkmfl.la \
 		lib/libkmfl.so \
 		lib/libkmfl.so.0
-PLIST_DIRS=	include/kmfl
+PLIST_DIRSTRY=	include/kmfl
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/textproc/libkmfl/pkg-descr b/textproc/libkmfl/pkg-descr
index 24991c136261..bd773d1a57d6 100644
--- a/textproc/libkmfl/pkg-descr
+++ b/textproc/libkmfl/pkg-descr
@@ -1,7 +1,9 @@
-This library provides an engine to interpret compiled
-(textproc/kmflcomp) KMFL keyboard tables written in Keyman keyboard
-language for use with SCIM KMFL IMEngine
-(textproc/scim-kmfl-imengine).
+This library provides an engine to interpret compiled KMFL keyboard
+tables (textproc/kmflcomp) written in Keyman keyboard language.
+
+The current implementation of KMFL uses either the IBus framework (via
+textproc/ibus-kmfl) or the older SCIM framework (via
+textproc/scim-kmfl-imengine) to handle the input method interface to X.
 
 KMFL aims to bring Tavultesoft Keyman functionality to *nix operating
 systems. KMFL is being jointly developed by SIL International
diff --git a/textproc/scim-kmfl-european-latin/Makefile b/textproc/scim-kmfl-european-latin/Makefile
deleted file mode 100644
index 69f74dec3e7c..000000000000
--- a/textproc/scim-kmfl-european-latin/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-european-latin
-# Date created:		27 June 2009
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-
-PORTNAME=	scim-kmfl-european-latin
-PORTVERSION=	1.2
-PORTREVISION=	4
-CATEGORIES=	textproc
-MASTER_SITES=	http://eurolatin.keymankeyboards.com/ \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/
-DISTNAME=	eurolatin-${PORTVERSION}
-DIST_SUBDIR=	kmfl
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	Paneuropean Latin KMFL SCIM IMEngine keyboard covering 42 languages
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-NO_WRKSUBDIR=	yes
-USE_DOS2UNIX=	european.kmn
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-PORTDOCS=	*
-DOCSLIST=	eurolatin12.pdf european.html licence.txt readme.html \
-	       	welcome.htm
-PLIST_FILES=	${SCIM_KMFL_DIR}/european.kmn \
-		${SCIM_KMFL_ICONS_DIR}/european.bmp \
-		${SCIM_KMFL_ICONS_DIR}/latin.bmp \
-		${SCIM_KMFL_ICONS_DIR}/latin.ico
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${WRKSRC}/*.ico \
-	       ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} ${WRKSRC}/$$doc ${DOCSDIR} ; \
-	done
-.endif
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  The PDF documentation for use of the European Latin"
-	@${ECHO_MSG} "  Keyboard can be found in:"
-	@${ECHO_MSG} "  ${PREFIX}/share/doc/kmfl/scim-kmfl-european-latin/"
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-european-latin/distinfo b/textproc/scim-kmfl-european-latin/distinfo
deleted file mode 100644
index 72b20db8cc3b..000000000000
--- a/textproc/scim-kmfl-european-latin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kmfl/eurolatin-1.2.zip) = 7785b7102296521294eb8c5db7f13a07
-SHA256 (kmfl/eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
-SIZE (kmfl/eurolatin-1.2.zip) = 362966
diff --git a/textproc/scim-kmfl-european-latin/files/patch-european.kmn b/textproc/scim-kmfl-european-latin/files/patch-european.kmn
deleted file mode 100644
index 0d2c44cc8e22..000000000000
--- a/textproc/scim-kmfl-european-latin/files/patch-european.kmn
+++ /dev/null
@@ -1,30 +0,0 @@
---- european.kmn.orig	2010-06-29 10:41:38.000000000 +0000
-+++ european.kmn	2010-06-29 10:42:30.000000000 +0000
-@@ -5,15 +5,15 @@
- 
- VERSION 7.0
- NAME "European Latin"
--store(&BITMAP) 'latin.ico'
-+store(&BITMAP) 'latin.bmp'
- store(&COPYRIGHT) 'Copyright (C) 1994-2008 Tavultesoft Pty Ltd'
- 
- store(&mnemoniclayout) '1'
- 
- c KeymanWeb-specific header statements
- 
--store(&KMW_HelpFile) 'european.html'
--store(&KMW_EmbedJS) 'european_js.txt'
-+c store(&KMW_HelpFile) 'european.html'
-+c store(&KMW_EmbedJS) 'european_js.txt'
- 
- begin Unicode > use(Main)
- 
-@@ -70,7 +70,7 @@
- store(ringO) 'åÅůŮ'
- store(ringK) 'aAuU'
- 
--c \
-+c backslash
- store(specialO) 'ĸʼnſÐðØø¡¦§¨©ª¬­®¯°±²³´µ¶·¸¹º¿×÷†‡‰–—•'
- store(specialK) "knsDdOo!|S:cf~-r_*+23'uP.,1m?x/tT%NM>"
- 
diff --git a/textproc/scim-kmfl-european-latin/pkg-descr b/textproc/scim-kmfl-european-latin/pkg-descr
deleted file mode 100644
index 01638056e9dd..000000000000
--- a/textproc/scim-kmfl-european-latin/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-This keyboard is designed to enable simple input of most Latin script
-languages, including all major European Latin-script languages. The
-keyboard is written in KMN Keyboard Language by the KMN language
-developer, Tavultesoft (http://www.tavultesoft.com). The keyboard
-uses punctuation and letter keys in sequence to access diacritic and
-other letters.
-
-This port installs the keyboard so that it can be used through SCIM
-KMFL IMEngine (textproc/scim-kmfl-imengine).
-
-Some of the supported languages include: Afrikaans, Albanian,
-Balearic, Basque, Breton, Catalan, Croatian, Czech, Danish, Dutch,
-Esperanto, Estonian, Faroese, Finnish, French, Gaelic, Galician,
-German, Hungarian, Icelandic, Inuktitut, Italian, Kashubian, Ladin,
-Latvian, Lithuanian, Maltese, Norwegian, Nynorsk, Polish, Portugese,
-Romansch, Saami, Serbian, Slovak, Slovenian, Sorbian, Spanish,
-Swedish, Tagalog, Turkish, Valencian, Vlaams, Walloon, Welsh and Zulu.
-
-The keyboard is distributed under the terms of 3-clause BSD-licence.
-
-WWW: http://eurolatin.keymankeyboards.com/
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 1aefc6d75404..75e7b8bfd429 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	scim-kmfl-imengine
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION} \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
@@ -30,8 +31,9 @@ USE_GNOME=	glib20 gtk20 intlhack
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 PORTDOCS=	AUTHORS COPYING ChangeLog
@@ -41,7 +43,7 @@ SUB_FILES=	pkg-message
 pre-patch:
 	@${ECHO_MSG} ---------------------------------------------------------
 	@${ECHO_MSG}   You have SKIM installed. KMFL-SCIM-IMEngine will work
-	@${ECHO_MSG}   and you will be able to use textproc/scim-kmfl-* key-
+	@${ECHO_MSG}   and you will be able to use textproc/kmfl-* key-
 	@${ECHO_MSG}   boards, but KMFL IME does not have SKIM frontend yet.
 	@${ECHO_MSG}   Please refer to the textproc/kmflcomp docs on how to
 	@${ECHO_MSG}   use KMFL keyboards in QT applications.
@@ -55,6 +57,19 @@ post-patch:
 	@${REINPLACE_CMD} \
 		's|/usr/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/scim_kmfl_imengine_setup/scim_kmfl_imengine_setup.cpp
+	@${REINPLACE_CMD} \
+		's|$$(datadir)/scim/kmfl|$$(datadir)/kmfl|g' \
+		${WRKSRC}/src/Makefile.* \
+		${WRKSRC}/scim_kmfl_imengine_setup/Makefile.*
+	@${REINPLACE_CMD} \
+		's|SCIM_DATADIR="$$datadir/scim"|SCIM_DATADIR="$$datadir"|' \
+		${WRKSRC}/configure.in
+	@${REINPLACE_CMD} \
+		's|"\.scim" SCIM_PATH_DELIM_STRING "kmfl"|".kmfl"|' \
+		${WRKSRC}/scim_kmfl_imengine_setup/scim_kmfl_imengine_setup.cpp
+	@${REINPLACE_CMD} \
+		's|"\.scim" + SCIM_PATH_DELIM_STRING + "kmfl"|".kmfl"|' \
+		${WRKSRC}/src/scim_kmfl_imengine.cpp
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/textproc/scim-kmfl-imengine/distinfo b/textproc/scim-kmfl-imengine/distinfo
index c1ff08eb2056..4463b96769dd 100644
--- a/textproc/scim-kmfl-imengine/distinfo
+++ b/textproc/scim-kmfl-imengine/distinfo
@@ -1,3 +1,2 @@
-MD5 (kmfl/scim-kmfl-imengine-0.9.9.tar.gz) = 81acd6ed58e0d5f3f52cfa575afa47da
-SHA256 (kmfl/scim-kmfl-imengine-0.9.9.tar.gz) = 22e384b9add2f30e5cce13564cff72f45919be4ede529d4ba6483206e0a92a73
-SIZE (kmfl/scim-kmfl-imengine-0.9.9.tar.gz) = 513455
+SHA256 (kmfl/scim-kmfl-imengine-0.9.9.tar.gz) = cf0b029d54d1468028be2f82a73606152504cacb2f436f65db6dea48d2d460cc
+SIZE (kmfl/scim-kmfl-imengine-0.9.9.tar.gz) = 509576
diff --git a/textproc/scim-kmfl-imengine/files/pkg-message.in b/textproc/scim-kmfl-imengine/files/pkg-message.in
index dc25050b57d6..55f831120673 100644
--- a/textproc/scim-kmfl-imengine/files/pkg-message.in
+++ b/textproc/scim-kmfl-imengine/files/pkg-message.in
@@ -7,6 +7,6 @@
 
     %%PREFIX%%/share/doc/kmfl/kmflcomp/KMFL-Compiler.sxw
 
-  You need textproc/scim-kmfl-* ports in order to use actual keyboards
+  You need textproc/kmfl-* ports in order to use actual keyboards
   through SCIM.
 ------------------------------------------------------------------------
diff --git a/textproc/scim-kmfl-imengine/pkg-descr b/textproc/scim-kmfl-imengine/pkg-descr
index 3331231e6224..d70e178a9c11 100644
--- a/textproc/scim-kmfl-imengine/pkg-descr
+++ b/textproc/scim-kmfl-imengine/pkg-descr
@@ -12,6 +12,6 @@ character constants, SIL Ethnologue language codes, etc.
 
 Official Tavultesoft repository contains keyboards that cover more
 than 220 languages. Significant number of them are open source.
-Ported keyboards are textproc/scim-kmfl-*.
+The keyboards ports are textproc/kmfl-*.
 
 WWW: http://kmfl.sourceforge.net/
diff --git a/textproc/scim-kmfl-imengine/pkg-plist b/textproc/scim-kmfl-imengine/pkg-plist
index a9bb19e9c2f9..c20e9aed84ae 100644
--- a/textproc/scim-kmfl-imengine/pkg-plist
+++ b/textproc/scim-kmfl-imengine/pkg-plist
@@ -7,3 +7,4 @@ lib/scim-1.0/1.4.0/SetupUI/kmfl_imengine_setup.so
 share/scim/kmfl/icons/default.png
 @dirrmtry share/scim/kmfl/icons
 @dirrmtry share/scim/kmfl
+@dirrmtry share/scim
diff --git a/textproc/scim-kmfl-sil-ezra/Makefile b/textproc/scim-kmfl-sil-ezra/Makefile
deleted file mode 100644
index 1daf0ec27b4e..000000000000
--- a/textproc/scim-kmfl-sil-ezra/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-sil-ezra
-# Date created:		14 July 2009
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-
-PORTNAME=	scim-kmfl-sil-ezra
-PORTVERSION=	2.4
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=EzraSIL251_Src.zip\&filename=/:1 \
-		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=EzraSIL2.5Keying\&filename=/:2 \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/kmfl/:1,2
-DISTFILES=	EzraSIL251_Src.zip:1 \
-		Keying+in+Hebrew.pdf:2
-DIST_SUBDIR=	kmfl
-EXTRACT_ONLY=	EzraSIL251_Src.zip
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine keyboard for Unicode Biblical Hebrew
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-WRKSRC=		${WRKDIR}/EzraSIL2.51
-USE_DOS2UNIX=	Keyman/EZRAUNI24.KMN
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-PORTDOCS=	*
-DOCSLIST=	${WRKSRC}/Licenses.txt ${WRKSRC}/README.txt \
-		${WRKSRC}/WordDocs/Ezra\ SIL\ Keyboard\ Chart.doc \
-		${DISTDIR}/${DIST_SUBDIR}/Keying+in+Hebrew.pdf \
-		${WRKSRC}/WordDocs/Simplified\ keyboard\ chart.doc
-
-PLIST_FILES=	${SCIM_KMFL_DIR}/EZRAUNI24.kmn \
-		${SCIM_KMFL_ICONS_DIR}/HEBDISPY.bmp \
-		${SCIM_KMFL_ICONS_DIR}/alef.bmp
-
-do-install:
-	${CP} -f ${WRKSRC}/Keyman/EZRAUNI24.KMN ${WRKSRC}/Keyman/EZRAUNI24.kmn
-	${INSTALL_DATA} ${WRKSRC}/Keyman/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/Keyman/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} "$$doc" ${DOCSDIR} ; \
-	done
-.endif
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Hebrew\" in your SCIM menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  The documentation is installed into:"
-	@${ECHO_MSG} "    ${DOCSDIR}"
-	@${ECHO_MSG} "  Please note that some documentation files are"
-	@${ECHO_MSG} "  officially released in proprietary formats only and"
-	@${ECHO_MSG} "  that they are installed as such."
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-sil-ezra/distinfo b/textproc/scim-kmfl-sil-ezra/distinfo
deleted file mode 100644
index 98b1d0017990..000000000000
--- a/textproc/scim-kmfl-sil-ezra/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (kmfl/EzraSIL251_Src.zip) = 9c94d51b9dd6ab1b7fb0db7e67d5ed9e
-SHA256 (kmfl/EzraSIL251_Src.zip) = d0818f56c4d0e63b1d947cfef5f7dfec005e771e7d178a7197c12539bce454c4
-SIZE (kmfl/EzraSIL251_Src.zip) = 1030435
-MD5 (kmfl/Keying+in+Hebrew.pdf) = 1817c823ac75e59f57a96ee059263033
-SHA256 (kmfl/Keying+in+Hebrew.pdf) = c034cc1e97cab0e4fc692c2e70e25745f7375e2bd6a7089506e876f66cf5f731
-SIZE (kmfl/Keying+in+Hebrew.pdf) = 89974
diff --git a/textproc/scim-kmfl-sil-ezra/files/patch-Keyman::EZRAUNI24.KMN b/textproc/scim-kmfl-sil-ezra/files/patch-Keyman::EZRAUNI24.KMN
deleted file mode 100644
index b25078756e07..000000000000
--- a/textproc/scim-kmfl-sil-ezra/files/patch-Keyman::EZRAUNI24.KMN
+++ /dev/null
@@ -1,14 +0,0 @@
---- Keyman/EZRAUNI24.KMN.orig	2009-07-01 09:56:34.000000000 +0200
-+++ Keyman/EZRAUNI24.KMN	2009-07-01 09:56:08.000000000 +0200
-@@ -63,9 +63,10 @@
- 
- 
- NAME "Ezra SIL Unicode 2.4"
--BITMAP HebDispy      c 8/21/02
-+BITMAP HEBDISPY.bmp      c 8/21/02
- c HOTKEY "^+M"
- VERSION 6.0         c 7/9/02 
-+store(&language) "he_IL"
- 
- begin UNICODE > use(Main)  
- 
diff --git a/textproc/scim-kmfl-sil-ezra/pkg-descr b/textproc/scim-kmfl-sil-ezra/pkg-descr
deleted file mode 100644
index 981ba36bc52f..000000000000
--- a/textproc/scim-kmfl-sil-ezra/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This is a keyboard for input of the complex Biblical Hebrew (including
-cantillation marks) with Unicode fonts. It is written in Keyman keyboard
-language and developed by SIL Non-Roman Script Initiative (NRSI).
-
-This port installs the keyboard so that it can be used through SCIM KMFL
-IMEngine (textproc/scim-kmfl-imengine).
-
-The keyboard is provided under the terms of MIT/X11 License.
-
-WWW: http://scripts.sil.org/SILHebrUnic2
-     http://scripts.sil.org/SILHebrUni_Documentation
diff --git a/textproc/scim-kmfl-sil-galatia/Makefile b/textproc/scim-kmfl-sil-galatia/Makefile
deleted file mode 100644
index 36a266230c77..000000000000
--- a/textproc/scim-kmfl-sil-galatia/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-sil-galatia
-# Date created:		24 August 2009
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	scim-kmfl-sil-galatia
-PORTVERSION=	1.02
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=GrkPolyComp_Src&filename=/ \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
-DISTNAME=	GrkPolyComp_Src
-DIST_SUBDIR=	kmfl
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Unicode keyboard for typesetting Ancient Greek
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-WRKSRC=		${WRKDIR}/GrkPolyComp_Src
-USE_DOS2UNIX=	GrkPolyComp.KMN
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-PORTDOCS=	*
-DOCSLIST=	Greek\ Poly\ Comp\ Kbrd\ Layout.pdf \
-		welcome.htm
-
-PLIST_FILES=	${SCIM_KMFL_DIR}/GrkPolyComp.kmn \
-		${SCIM_KMFL_ICONS_DIR}/ALPHA.bmp
-
-do-install:
-	${CP} -f ${WRKSRC}/GrkPolyComp.KMN ${WRKSRC}/GrkPolyComp.kmn
-	${INSTALL_DATA} ${WRKSRC}/GrkPolyComp.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} "${WRKSRC}/$$doc" ${DOCSDIR} ; \
-	done
-.endif
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Greek\" in your SCIM menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  The documentation is installed into:"
-	@${ECHO_MSG} "    ${DOCSDIR}"
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-sil-galatia/distinfo b/textproc/scim-kmfl-sil-galatia/distinfo
deleted file mode 100644
index 8caab4fd023e..000000000000
--- a/textproc/scim-kmfl-sil-galatia/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kmfl/GrkPolyComp_Src.zip) = 5e7bf6186a3917d796f1abb710bed539
-SHA256 (kmfl/GrkPolyComp_Src.zip) = 59b4ad7f7a31f66a674f1867979baf07ae5143957cec6575e3d1428f5acf66e7
-SIZE (kmfl/GrkPolyComp_Src.zip) = 197829
diff --git a/textproc/scim-kmfl-sil-galatia/files/patch-GrkPolyComp.KMN b/textproc/scim-kmfl-sil-galatia/files/patch-GrkPolyComp.KMN
deleted file mode 100644
index e3c20268bbfc..000000000000
--- a/textproc/scim-kmfl-sil-galatia/files/patch-GrkPolyComp.KMN
+++ /dev/null
@@ -1,43 +0,0 @@
---- GrkPolyComp.KMN.orig	2009-08-24 13:49:16.000000000 +0200
-+++ GrkPolyComp.KMN	2009-08-24 14:03:17.000000000 +0200
-@@ -24,14 +24,13 @@
- c                   See REVISION.TXT
- c ----------------------------------------------------------------------------
-    
--NAME "Greek (polytonic precomposed) Unicode 1.02"
-+NAME "Galatia Greek (polytonic precomposed) Unicode 1.02"
- VERSION 6.0
--BITMAP ALPHA
-+BITMAP ALPHA.bmp
- HOTKEY "^+G"
- COPYRIGHT "� 2002-2008 SIL International"
- MESSAGE "The Greek (polytonic precomposed) Unicode keyboard is distributed under the X11 free software license (http://scripts.sil.org/X11License)."
--
--c LANGUAGE x208, x22
-+store(&language) "el_GR"
- 
- c ----------------------------------------------------------------------------
- 
-@@ -520,9 +519,9 @@
- any(vUIoSm0)            + any(K_Io) > index(vUIoSm,1)                c >A_
- any(vUIo2)              + any(K_Ro) > index(vUIoRo,1)                c A_<
- any(vUIoRo0)            + any(K_Io) > index(vUIoRo,1)                c <A_
--any(vUIoSm)             + any(K_Gr) > index(vUIoSmGr,1)              c A_>\ 
-+any(vUIoSm)             + any(K_Gr) > index(vUIoSmGr,1)              c A_>\ c
- any(vUIoSmGr0)          + any(K_Io) > index(vUIoSmGr,1)              c >\A_
--any(vUIoRo)             + any(K_Gr) > index(vUIoRoGr,1)              c A_<\ 
-+any(vUIoRo)             + any(K_Gr) > index(vUIoRoGr,1)              c A_<\ c
- any(vUIoRoGr0)          + any(K_Io) > index(vUIoRoGr,1)              c <\A_
- any(vUIoSm)             + any(K_Ac) > index(vUIoSmAc,1)              c A_>/
- any(vUIoSmAc0)          + any(K_Io) > index(vUIoSmAc,1)              c >/A_
-@@ -668,8 +667,8 @@
- any(GC_Ci)                + any(K_Gr) > index(GC_Gr,1)          c a^  + \  a\.  
- any(Ac)                   + any(K_Gr) > outs(Gr)                c /   + \  \.   
- any(Ci)                   + any(K_Gr) > outs(Gr)                c ^   + \  \.   
--any(lowvRo)               + any(K_Gr) > index(lowvRoGr,1)       c >a   + \ a>\ 
--any(lowvSm)               + any(K_Gr) > index(lowvSmGr,1)       c <a   + \ a<\ 
-+any(lowvRo)               + any(K_Gr) > index(lowvRoGr,1)       c >a   + \ a>\ c 
-+any(lowvSm)               + any(K_Gr) > index(lowvSmGr,1)       c <a   + \ a<\ c 
- any(upV)                  + any(K_Gr) > index(upVGr,1)          c A   + \  >A
- any(upVSm_Sm)             + any(K_Gr) > index(upVSmGr,1)         c >A  + \  >\A 
- any(upVSm_Gr)             + any(K_Sm) > index(upVSmGr,1)         c >A  + \  >\A 
diff --git a/textproc/scim-kmfl-sil-galatia/pkg-descr b/textproc/scim-kmfl-sil-galatia/pkg-descr
deleted file mode 100644
index d110dfb2d483..000000000000
--- a/textproc/scim-kmfl-sil-galatia/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-This is a keyboard for typesetting Ancient Greek with precomposed Unicode
-characters. It is written in Keyman Keyboard Language by SIL Non-Roman Script
-Initiative (NRSI).
-
-The main purpose of the keyboards is to provide a wide range of keying options,
-so many characters can be entered in multiple ways. The features include:
-
-  * preserving the context when deleting;
-  * choosing the correct code for the sigma depending upon the encoding and
-    the context (so the correct final form is used when appropriate);
-  * understanding the context of gamma so that it can be typed as 'n' before
-    kappa, xi or chi and as 'ng' before another gamma.
-  * support for Greek punctuation.
-
-WWW: http://scripts.sil.org/KeymanKeyboardLinks#e9f80714
diff --git a/textproc/scim-kmfl-sil-ipa-unicode5/Makefile b/textproc/scim-kmfl-sil-ipa-unicode5/Makefile
deleted file mode 100644
index 57e76b02f759..000000000000
--- a/textproc/scim-kmfl-sil-ipa-unicode5/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-sil-ipa-unicode5
-# Date created:		10 October 2007
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-
-PORTNAME=	scim-kmfl-sil-ipa-unicode5
-PORTVERSION=	1.2
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12_Src\&filename=/:1 \
-		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12.pdf\&filename=/:2
-DISTFILES=	IPAUni_Src12.zip:1 \
-   		IPA+Unicode+5.1_ver+1.2_KMN.pdf:2
-DIST_SUBDIR=	kmfl
-EXTRACT_ONLY=	IPAUni_Src12.zip
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	IPA Unicode 5.1 mnemonic keyboard for KMFL IMEngine of SCIM
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-WRKSRC=		${WRKDIR}/IPA12
-USE_DOS2UNIX=	IPAUni12.kmn
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-SUB_FILES=	pkg-message
-PORTDOCS=	*
-DOCSLIST=	${WRKSRC}/welcome.htm \
-		${DISTDIR}/${DIST_SUBDIR}/IPA+Unicode+5.1_ver+1.2_KMN.pdf
-PLIST_FILES=	${SCIM_KMFL_DIR}/IPAUni12.kmn \
-		${SCIM_KMFL_ICONS_DIR}/ipa.bmp \
-		${SCIM_KMFL_ICONS_DIR}/sil.bmp
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} $$doc ${DOCSDIR} ; \
-	done
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-sil-ipa-unicode5/distinfo b/textproc/scim-kmfl-sil-ipa-unicode5/distinfo
deleted file mode 100644
index c9e9f813812b..000000000000
--- a/textproc/scim-kmfl-sil-ipa-unicode5/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (kmfl/IPAUni_Src12.zip) = 68a280eda858cbb062581c760e68d362
-SHA256 (kmfl/IPAUni_Src12.zip) = e4ed6d9268c5877f800437a6d5e6f8ea664f469059c905ee4c3682a92511da69
-SIZE (kmfl/IPAUni_Src12.zip) = 123262
-MD5 (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = fdd096cbd0dfe39f819f8b62e53f96e6
-SHA256 (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = 778abed97671f7957c4e404b4f766ef636cffa7bd18195aa72d9883999ce28d6
-SIZE (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = 638769
diff --git a/textproc/scim-kmfl-sil-ipa-unicode5/files/patch-IPAUni12.kmn b/textproc/scim-kmfl-sil-ipa-unicode5/files/patch-IPAUni12.kmn
deleted file mode 100644
index 8fac10cf420b..000000000000
--- a/textproc/scim-kmfl-sil-ipa-unicode5/files/patch-IPAUni12.kmn
+++ /dev/null
@@ -1,17 +0,0 @@
---- IPAUni12.kmn.orig	2009-06-24 14:32:05.000000000 +0200
-+++ IPAUni12.kmn	2009-06-24 14:35:27.000000000 +0200
-@@ -51,12 +51,11 @@
-  
- NAME "IPA Unicode 5.1 (ver 1.2) KMN"
- VERSION 6.0
--BITMAP ipa
-+BITMAP ipa.bmp
- c BITMAP ipa.png
--HOTKEY  "^+P"
- COPYRIGHT "© 2002-2008 SIL International"
- MESSAGE "The IPA Unicode 5.1 (ver 1.2) KMN Unicode keyboard is distributed under the X11 free software license (http://scripts.sil.org/X11License)."
--c store(&author) "M. Hosken, D. Bevan"
-+store(&author) "M. Hosken, D. Bevan"
- c store(&language) ""
- 
- begin Unicode > use(Unicode)
diff --git a/textproc/scim-kmfl-sil-ipa-unicode5/files/pkg-message.in b/textproc/scim-kmfl-sil-ipa-unicode5/files/pkg-message.in
deleted file mode 100644
index d9bf80e47566..000000000000
--- a/textproc/scim-kmfl-sil-ipa-unicode5/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-------------------------------------------------------------------------
-  You should now have the new keyboard in section "Others" of your
-  SCIM menu. If you don't see it, restart X.
-
-  The PDF documentation for use of SIL IPA Unicode5 keyboard can be
-  found in 
-
-    %%PREFIX%%/share/doc/kmfl/scim-kmfl-sil-ipa-unicode5/
-------------------------------------------------------------------------
diff --git a/textproc/scim-kmfl-sil-ipa-unicode5/pkg-descr b/textproc/scim-kmfl-sil-ipa-unicode5/pkg-descr
deleted file mode 100644
index 26957b02b4cd..000000000000
--- a/textproc/scim-kmfl-sil-ipa-unicode5/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is mnemonic keyboard that covers entire IPA (International
-Phonetic Alphabet) Unicode 5 range, written in Keyman keyboard
-language. The keyboard is developed by SIL Non-Roman Script Initiative
-(NRSI). This port installs the keyboard so that it can be used through
-SCIM KMFL IMEngine (textproc/scim-kmfl-imengine).
-                         
-This keyboard is provided under SIL International X11-style License
-(http://scripts.sil.org/X11License).
-	                          
-WWW: http://scripts.sil.org/UniIPAKeyboard#dee994f5
diff --git a/textproc/scim-kmfl-sil-panafrican-latin/Makefile b/textproc/scim-kmfl-sil-panafrican-latin/Makefile
deleted file mode 100644
index bee2ecac8e9f..000000000000
--- a/textproc/scim-kmfl-sil-panafrican-latin/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-sil-panafrican-latin
-# Date created:		1 September 2009
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	scim-kmfl-sil-panafrican-latin
-PORTVERSION=	20090831
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=AfricaKeyboardDead2009\&filename=/:1 \
-		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=AfricaKeyboardUS2009\&filename=/:2 \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/:1,2
-DISTFILES=	AfricaKeyboardDead.zip:1 AfricaKeyboardUS.zip:2
-DIST_SUBDIR=	kmfl
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine keyboard for African Latin writing systems
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-WRKSRC=		${WRKDIR}
-USE_DOS2UNIX=	PanAfricaMnemonic/AfricaDeadKey.kmn \
-		PanAfricaUSlayout/AfricaUS.kmn
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-post-patch:
-		@${REINPLACE_CMD} -e 's|^BITMAP AFR|BITMAP AFR.bmp|' \
-			${WRKSRC}/PanAfricaMnemonic/AfricaDeadKey.kmn \
-			${WRKSRC}/PanAfricaUSlayout/AfricaUS.kmn
-
-PORTDOCS=	*
-DOCSLIST=	PanAfricaMnemonic/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ deadkeys.pdf \
-		PanAfricaUSlayout/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ shiftkeys.pdf
-
-PLIST_FILES=	${SCIM_KMFL_DIR}/AfricaDeadKey.kmn \
-		${SCIM_KMFL_DIR}/AfricaUS.kmn \
-		${SCIM_KMFL_ICONS_DIR}/AFR.bmp
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/PanAfricaMnemonic/*.kmn \
-		${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/PanAfricaUSlayout/*.kmn \
-		${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/PanAfricaMnemonic/*.bmp \
-		${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} "${WRKSRC}/$$doc" ${DOCSDIR} ; \
-	done
-.endif
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  The documentation is installed into:"
-	@${ECHO_MSG} "    ${DOCSDIR}"
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-sil-panafrican-latin/distinfo b/textproc/scim-kmfl-sil-panafrican-latin/distinfo
deleted file mode 100644
index aab7e63e6bca..000000000000
--- a/textproc/scim-kmfl-sil-panafrican-latin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (kmfl/AfricaKeyboardDead.zip) = 820822a611f9480a878d4f6322b749e7
-SHA256 (kmfl/AfricaKeyboardDead.zip) = b6dace0151891a249d9ee61307a7f95105be9445e91a8bb0b0f36f229ff5d6eb
-SIZE (kmfl/AfricaKeyboardDead.zip) = 386610
-MD5 (kmfl/AfricaKeyboardUS.zip) = 02917a406aa67b3065a097dc3e3a67c5
-SHA256 (kmfl/AfricaKeyboardUS.zip) = fea2fe19ada6a16b134ae85d7fd3fa8f9b71a26235b11a5bfbb941ffbd4e0507
-SIZE (kmfl/AfricaKeyboardUS.zip) = 399319
diff --git a/textproc/scim-kmfl-sil-panafrican-latin/pkg-descr b/textproc/scim-kmfl-sil-panafrican-latin/pkg-descr
deleted file mode 100644
index 8d382e0fd687..000000000000
--- a/textproc/scim-kmfl-sil-panafrican-latin/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a set of two keyboards that provides a single implementation for many
-Roman writing systems across Africa, based on results compiled from data from
-Benin, Burkina Faso, Cameroon, Chad, Cote d'Ivoire, Nigeria, Senegal and Togo.
-
-The keyboards are written in Keyman keyboard language and developed by SIL
-Non-Roman Script Initiative (NRSI). The software is distributed under the
-X11-style license (http://scripts.sil.org/X11License).
-
-This port installs the keyboards so that they can be used through SCIM KMFL
-IMEngine (textproc/scim-kmfl-imengine). Two layouts are provided:
-
-  * mnemonic layout for any keyboard (using deadkeys);
-  * positional layout for US keyboard (using deadkeys and/or shift-states, i.e.
-    RALT and LALT keys).
-                         
-WWW: http://scripts.sil.org/AfricanKeyboard1
diff --git a/textproc/scim-kmfl-sil-yi/Makefile b/textproc/scim-kmfl-sil-yi/Makefile
deleted file mode 100644
index 51db1967f9bc..000000000000
--- a/textproc/scim-kmfl-sil-yi/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-sil-yi
-# Date created:		1 September 2009
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	scim-kmfl-sil-yi
-PORTVERSION=	20020903
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=SILYi12OFL_Src&filename=/ \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/kmfl/
-DISTNAME=	SILYiOFL1.2Src
-DIST_SUBDIR=	kmfl
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Unicode keyboard for standardized Yi script
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-WRKSRC=		${WRKDIR}
-USE_DOS2UNIX=	SourceFiles/Yi7.kmn
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-PLIST_FILES=	${SCIM_KMFL_DIR}/Yi7.kmn \
-		${SCIM_KMFL_ICONS_DIR}/YiPinYin.bmp
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  At the moment, this keyboard has no documentation."
-	@${ECHO_MSG} "  As a general rule, type the Pinyin romanization for"
-	@${ECHO_MSG} "  that syllable, followed by a space. For punctuation,"
-	@${ECHO_MSG} "  try usual punctuation keystrokes."
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-sil-yi/distinfo b/textproc/scim-kmfl-sil-yi/distinfo
deleted file mode 100644
index ac88e485ae99..000000000000
--- a/textproc/scim-kmfl-sil-yi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kmfl/SILYiOFL1.2Src.zip) = 9565edac15ec019b935d7a8e0a841968
-SHA256 (kmfl/SILYiOFL1.2Src.zip) = 7733011014f3a4ad77456d668db318d78f19ca03613dd6857cf80cf3a0ef3245
-SIZE (kmfl/SILYiOFL1.2Src.zip) = 2627553
diff --git a/textproc/scim-kmfl-sil-yi/files/patch-SourceFiles::Yi7.kmn b/textproc/scim-kmfl-sil-yi/files/patch-SourceFiles::Yi7.kmn
deleted file mode 100644
index bb5fa6b87bbc..000000000000
--- a/textproc/scim-kmfl-sil-yi/files/patch-SourceFiles::Yi7.kmn
+++ /dev/null
@@ -1,17 +0,0 @@
---- SourceFiles/Yi7.kmn.orig	2009-09-01 17:32:24.000000000 +0200
-+++ SourceFiles/Yi7.kmn	2009-09-01 17:32:20.000000000 +0200
-@@ -8,10 +8,12 @@
- c this software is licensed under the SIL Open Font License
- c http://scripts.sil.org/OFL
-           
--NAME "Yi"
--BITMAP YiPinYin
-+NAME "SIL Yi 20020903"
-+BITMAP YiPinYin.bmp
- VERSION 6.0
- HOTKEY  "^+P"
-+MESSAGE "This software is licensed under the SIL Open Font License (http://scripts.sil.org/OFL)"
-+store(&author) "Andy Eatough"
- 
- begin Unicode> use(Unicode Group)
- 
diff --git a/textproc/scim-kmfl-sil-yi/pkg-descr b/textproc/scim-kmfl-sil-yi/pkg-descr
deleted file mode 100644
index 2a8a4dfe70e5..000000000000
--- a/textproc/scim-kmfl-sil-yi/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a keyboard for input of the standardized Yi script of southwestern
-China with Unicode Yi fonts. It is written in Keyman keyboard language and
-developed by SIL Non-Roman Script Initiative (NRSI).
-
-To keyboard a Yi syllable, you should type the Pinyin romanization for that
-syllable, followed by a space. For keyboarding punctuation, use the usual
-punctuation keystrokes.
-
-The keyboard is compatible with Yi range as defined in Unicode 3.0 and it does
-not provide keystrokes for the Yi Radicals which were added to Unicode 3.2
-(U+A4A2..U+A4A3, U+A4B4, U+A4C1, U+A4C5).
-
-WWW: http://scripts.sil.org/SILYI_home
diff --git a/textproc/scim-kmfl-varamozhi-malayalam/Makefile b/textproc/scim-kmfl-varamozhi-malayalam/Makefile
deleted file mode 100644
index 328e779c4472..000000000000
--- a/textproc/scim-kmfl-varamozhi-malayalam/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	scim-kmfl-varamozhi-malayalam
-# Date created:		10 October 2009
-# Whom:			Nikola Lecic <nikola.lecic@anthesphoria.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	scim-kmfl-varamozhi-malayalam
-PORTVERSION=	1.1.1
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	SF/varamozhi/2%20Mozhi%20Keyman%20-%20Input%20Method/${PORTVERSION} \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/kmfl/
-DISTNAME=	mozhi_${PORTVERSION}
-DIST_SUBDIR=	kmfl
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Malayalam keyboard according to the Mozhi scheme
-
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
- 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
-
-USE_DOS2UNIX=	mozhi_1.1.0.kmn
-NO_BUILD=	yes
-USE_ZIP=	yes
-
-SCIM_KMFL_DIR=	share/scim/kmfl
-SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
-
-PLIST_FILES=	${SCIM_KMFL_DIR}/mozhi_1.1.0.kmn \
-		${SCIM_KMFL_ICONS_DIR}/mozhi.bmp
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Malayalam\" in your SCIM menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  At the moment, this keyboard has no downloadable"
-	@${ECHO_MSG} "  documentation. For the details on the Mozhi scheme,"
-	@${ECHO_MSG} "  please see the Project's homepage, especially"
-	@${ECHO_MSG} "  https://sites.google.com/site/cibu/mozhi."
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
diff --git a/textproc/scim-kmfl-varamozhi-malayalam/distinfo b/textproc/scim-kmfl-varamozhi-malayalam/distinfo
deleted file mode 100644
index 65522ce3a7bc..000000000000
--- a/textproc/scim-kmfl-varamozhi-malayalam/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kmfl/mozhi_1.1.1.zip) = 69eb4fd5405c5fbed69bc401a48bef67
-SHA256 (kmfl/mozhi_1.1.1.zip) = b1d584c60ecde1c2c40ca96945bf062be5d32d52249570328cd112f9f29037f1
-SIZE (kmfl/mozhi_1.1.1.zip) = 208053
diff --git a/textproc/scim-kmfl-varamozhi-malayalam/files/patch-mozhi_1.1.0.kmn b/textproc/scim-kmfl-varamozhi-malayalam/files/patch-mozhi_1.1.0.kmn
deleted file mode 100644
index 4cd940c19a3e..000000000000
--- a/textproc/scim-kmfl-varamozhi-malayalam/files/patch-mozhi_1.1.0.kmn
+++ /dev/null
@@ -1,24 +0,0 @@
---- mozhi_1.1.0.kmn.orig	2009-11-04 09:05:06.000000000 +0100
-+++ mozhi_1.1.0.kmn	2009-11-04 09:06:50.000000000 +0100
-@@ -6,12 +6,13 @@
- c License along with this library; if not, write to the Free Software
- c Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA          
- 
--NAME "Mozhi Keymap 1.1.1"                         
-+NAME "Varamozhi Mozhi Keymap 1.1.1"                         
- COPYRIGHT "2006 © Raj Nair (peringz at gmail dot com)" 
- MESSAGE "Mozhi Keymap is a varamozhi based Tavultesoft keyboard available for Windows & Linux OS. Mozhi Keymap is distributed under GNU LGPL."
- VERSION 6.0 
- BITMAP mozhi.bmp
- CAPS ALWAYS OFF
-+store(&language) "ml_IN"
- 
- store(&MnemonicLayout) "1"
- begin Unicode > use(main)
-@@ -436,4 +437,4 @@
- U+0D46 + [K_I] > U+0D48 
- U+0D28 U+0D4D U+0D28 U+0D4D + [K_G] > U+0D19 U+0D4D U+0D19 U+0D4D
-                                                                                                            
--c EOF                              
-\ No newline at end of file
-+c EOF                              
diff --git a/textproc/scim-kmfl-varamozhi-malayalam/pkg-descr b/textproc/scim-kmfl-varamozhi-malayalam/pkg-descr
deleted file mode 100644
index f002ba048e3f..000000000000
--- a/textproc/scim-kmfl-varamozhi-malayalam/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-This is a keyboard for input of the Malayalam according to the transliteration
-scheme called Mozhi (https://sites.google.com/site/cibu/mozhi). The keymap is
-written in Keyman keyboard language and developed as a part of Varamozhi
-Project under the LGPL license.
-
-The Mozhi is intended to be the most intuitive scheme for Malayalam speakers.
-It simplifies what the user needs to remember and is is not phonetically
-accurate.
-
-This keymap supports the current standard for Malayalam Chillus (i.e. without
-special encoding). It offers mnemonic keyboard functionality and smart-quote
-functionality with comas and numerals.
-
-This port installs the keyboard so that it can be used through SCIM KMFL
-IMEngine (textproc/scim-kmfl-imengine).
-
-WWW: http://varamozhi.sourceforge.net/