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

3 files changed, 18 insertions, 18 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}
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.