3 files changed, 19 insertions, 18 deletions

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.