1 files changed, 16 insertions, 14 deletions

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}