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

1 files changed, 14 insertions, 12 deletions

diff --git a/textproc/kmfl-sil-galatia/Makefile b/textproc/kmfl-sil-galatia/Makefile
index 36a266230c77..205019ba7cbd 100644
--- a/textproc/kmfl-sil-galatia/Makefile
+++ b/textproc/kmfl-sil-galatia/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	scim-kmfl-sil-galatia
+PORTNAME=	kmfl-sil-galatia
 PORTVERSION=	1.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=GrkPolyComp_Src&filename=/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -15,10 +15,9 @@ DISTNAME=	GrkPolyComp_Src
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	SCIM KMFL IMEngine Unicode keyboard for typesetting Ancient Greek
+COMMENT=	KMFL Unicode keyboard for typesetting Ancient Greek
 
-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}/GrkPolyComp_Src
 USE_DOS2UNIX=	GrkPolyComp.KMN
@@ -27,20 +26,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
 
 PORTDOCS=	*
 DOCSLIST=	Greek\ Poly\ Comp\ Kbrd\ Layout.pdf \
 		welcome.htm
 
-PLIST_FILES=	${SCIM_KMFL_DIR}/GrkPolyComp.kmn \
-		${SCIM_KMFL_ICONS_DIR}/ALPHA.bmp
+PLIST_FILES=	${KMFL_DIR}/GrkPolyComp.kmn \
+		${KMFL_ICONS_DIR}/ALPHA.bmp
+PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
+		${KMFL_DIR}
 
 do-install:
+	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
 	${CP} -f ${WRKSRC}/GrkPolyComp.KMN ${WRKSRC}/GrkPolyComp.kmn
-	${INSTALL_DATA} ${WRKSRC}/GrkPolyComp.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${LOCALBASE}/${SCIM_KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/GrkPolyComp.kmn ${LOCALBASE}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
@@ -51,7 +53,7 @@ do-install:
 post-install:
 	@${ECHO_MSG} "--------------------------------------------------------"
 	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Greek\" in your SCIM menu. If you don't see it,"
+	@${ECHO_MSG} "  \"Greek\" in your SCIM/IBus menu. If you don't see it,"
 	@${ECHO_MSG} "  restart X."
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG}