- 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, 12 insertions, 11 deletions

diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index 880d151beb38..c788e8d060ac 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -8,15 +8,16 @@
 PORTNAME=	kmflcomp
 PORTVERSION=	0.9.9
 CATEGORIES=	textproc
-MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION} \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
-		KMFL-Compiler.sxw
+MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION}:1 \
+		SF/kmfl/kmfl/Documentation:2 \
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/:1,2
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:1 \
+		KMFL-Compiler.sxw:2
 DIST_SUBDIR=	kmfl
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	Compiler of Keyman keyboard sources to use with SCIM KMFL IMEngine
+COMMENT=	Compiler of Keyman KMFL keyboard sources to use with SCIM/IBus
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 
@@ -24,8 +25,9 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 DOCS=		${DISTDIR}/${DIST_SUBDIR}/KMFL-Compiler.sxw \
diff --git a/textproc/kmflcomp/distinfo b/textproc/kmflcomp/distinfo
index b5ff512f6409..5223249ab054 100644
--- a/textproc/kmflcomp/distinfo
+++ b/textproc/kmflcomp/distinfo
@@ -1,6 +1,4 @@
-MD5 (kmfl/kmflcomp-0.9.9.tar.gz) = ece7fab3fd378ae93445912b6c90c29d
 SHA256 (kmfl/kmflcomp-0.9.9.tar.gz) = d07fe491ab4bfd6ad1d60a092c382c6e567f44729d406f066d804057ca9f716a
 SIZE (kmfl/kmflcomp-0.9.9.tar.gz) = 365124
-MD5 (kmfl/KMFL-Compiler.sxw) = d9bf9f5a45824354205ce8a4721b807d
 SHA256 (kmfl/KMFL-Compiler.sxw) = dedb0aee0b7d931dff48d0bcd3f9fa5c2c71d4684f9aa53e064df5bfb8b04841
 SIZE (kmfl/KMFL-Compiler.sxw) = 56675
diff --git a/textproc/kmflcomp/files/pkg-message.in b/textproc/kmflcomp/files/pkg-message.in
index 2794c379b73e..915a6f1c9358 100644
--- a/textproc/kmflcomp/files/pkg-message.in
+++ b/textproc/kmflcomp/files/pkg-message.in
@@ -14,6 +14,7 @@
 
     http://tavultesoft.com/keymandev/documentation/help/main/guide.php
 
-  You need textproc/scim-kmfl-imengine and textproc/scim-kmfl-* ports
-  in order to use actual keyboards through SCIM.
+  You need textproc/scim-kmfl-imengine to use KMFL keyboards through
+  SCIM, or textproc/ibus-kmfl to use them through IBus. The keyboard
+  ports are textproc/kmfl-*.
 ------------------------------------------------------------------------