- 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, 19 insertions, 18 deletions

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,