- Fix KMFL on amd64

- Fix DIST_SUBDIR to be in corcondance with other
  textproc/scim-kmfl-* ports.

PR:		140911
Submitted by:	Nikola Lecic <nikola.lecic@anthesphoria.net> (maintainer)

6 files changed, 54 insertions, 12 deletions

diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile
index c2324644f396..2d72f9556188 100644
--- a/textproc/kmfl-european-latin/Makefile
+++ b/textproc/kmfl-european-latin/Makefile
@@ -6,10 +6,12 @@
 
 PORTNAME=	scim-kmfl-european-latin
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://eurolatin.keymankeyboards.com/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
 DISTNAME=	eurolatin-${PORTVERSION}
+DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Paneuropean Latin KMFL SCIM IMEngine keyboard covering 42 languages
@@ -18,6 +20,7 @@ RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
  		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
 
 NO_WRKSUBDIR=	yes
+USE_DOS2UNIX=	european.kmn
 NO_BUILD=	yes
 USE_ZIP=	yes
 
@@ -34,9 +37,6 @@ PLIST_FILES=	${SCIM_KMFL_DIR}/european.kmn \
 		${SCIM_KMFL_ICONS_DIR}/latin.bmp \
 		${SCIM_KMFL_ICONS_DIR}/latin.ico
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|latin.ico|latin.bmp|' ${WRKSRC}/european.kmn
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/*.bmp ${WRKSRC}/*.ico \
diff --git a/textproc/kmfl-european-latin/distinfo b/textproc/kmfl-european-latin/distinfo
index a85dae8761e3..72b20db8cc3b 100644
--- a/textproc/kmfl-european-latin/distinfo
+++ b/textproc/kmfl-european-latin/distinfo
@@ -1,3 +1,3 @@
-MD5 (eurolatin-1.2.zip) = 7785b7102296521294eb8c5db7f13a07
-SHA256 (eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
-SIZE (eurolatin-1.2.zip) = 362966
+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/files/patch-european.kmn b/textproc/kmfl-european-latin/files/patch-european.kmn
new file mode 100644
index 000000000000..ccaef21bd62b
--- /dev/null
+++ b/textproc/kmfl-european-latin/files/patch-european.kmn
@@ -0,0 +1,21 @@
+--- european.kmn	2009-11-20 01:07:20.000000000 +0000
++++ work/european.kmn	2009-11-20 01:07:56.000000000 +0000
+@@ -5,15 +5,15 @@
+ 
+ VERSION 7.0
+ NAME "European Latin"
+-store(&BITMAP) 'latin.ico'
++store(&BITMAP) 'latin.bmp'
+ store(&COPYRIGHT) 'Copyright (C) 1994-2008 Tavultesoft Pty Ltd'
+ 
+ store(&mnemoniclayout) '1'
+ 
+ c KeymanWeb-specific header statements
+ 
+-store(&KMW_HelpFile) 'european.html'
+-store(&KMW_EmbedJS) 'european_js.txt'
++c store(&KMW_HelpFile) 'european.html'
++c store(&KMW_EmbedJS) 'european_js.txt'
+ 
+ begin Unicode > use(Main)
+ 
diff --git a/textproc/scim-kmfl-european-latin/Makefile b/textproc/scim-kmfl-european-latin/Makefile
index c2324644f396..2d72f9556188 100644
--- a/textproc/scim-kmfl-european-latin/Makefile
+++ b/textproc/scim-kmfl-european-latin/Makefile
@@ -6,10 +6,12 @@
 
 PORTNAME=	scim-kmfl-european-latin
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://eurolatin.keymankeyboards.com/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
 DISTNAME=	eurolatin-${PORTVERSION}
+DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Paneuropean Latin KMFL SCIM IMEngine keyboard covering 42 languages
@@ -18,6 +20,7 @@ RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
  		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
 
 NO_WRKSUBDIR=	yes
+USE_DOS2UNIX=	european.kmn
 NO_BUILD=	yes
 USE_ZIP=	yes
 
@@ -34,9 +37,6 @@ PLIST_FILES=	${SCIM_KMFL_DIR}/european.kmn \
 		${SCIM_KMFL_ICONS_DIR}/latin.bmp \
 		${SCIM_KMFL_ICONS_DIR}/latin.ico
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|latin.ico|latin.bmp|' ${WRKSRC}/european.kmn
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${SCIM_KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/*.bmp ${WRKSRC}/*.ico \
diff --git a/textproc/scim-kmfl-european-latin/distinfo b/textproc/scim-kmfl-european-latin/distinfo
index a85dae8761e3..72b20db8cc3b 100644
--- a/textproc/scim-kmfl-european-latin/distinfo
+++ b/textproc/scim-kmfl-european-latin/distinfo
@@ -1,3 +1,3 @@
-MD5 (eurolatin-1.2.zip) = 7785b7102296521294eb8c5db7f13a07
-SHA256 (eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
-SIZE (eurolatin-1.2.zip) = 362966
+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/scim-kmfl-european-latin/files/patch-european.kmn b/textproc/scim-kmfl-european-latin/files/patch-european.kmn
new file mode 100644
index 000000000000..ccaef21bd62b
--- /dev/null
+++ b/textproc/scim-kmfl-european-latin/files/patch-european.kmn
@@ -0,0 +1,21 @@
+--- european.kmn	2009-11-20 01:07:20.000000000 +0000
++++ work/european.kmn	2009-11-20 01:07:56.000000000 +0000
+@@ -5,15 +5,15 @@
+ 
+ VERSION 7.0
+ NAME "European Latin"
+-store(&BITMAP) 'latin.ico'
++store(&BITMAP) 'latin.bmp'
+ store(&COPYRIGHT) 'Copyright (C) 1994-2008 Tavultesoft Pty Ltd'
+ 
+ store(&mnemoniclayout) '1'
+ 
+ c KeymanWeb-specific header statements
+ 
+-store(&KMW_HelpFile) 'european.html'
+-store(&KMW_EmbedJS) 'european_js.txt'
++c store(&KMW_HelpFile) 'european.html'
++c store(&KMW_EmbedJS) 'european_js.txt'
+ 
+ begin Unicode > use(Main)
+