4 files changed, 19 insertions, 17 deletions

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).