4 files changed, 42 insertions, 35 deletions

diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile
index 2eb9e8673b1c..8ad223fe7e42 100644
--- a/textproc/kmfl-european-latin/Makefile
+++ b/textproc/kmfl-european-latin/Makefile
@@ -5,22 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	kmfl-european-latin
-PORTVERSION=	1.2
-PORTREVISION=	5
+PORTVERSION=	1.6
 CATEGORIES=	textproc
-MASTER_SITES=	http://eurolatin.keymankeyboards.com/ \
-		http://anthesphoria.net/FreeBSD/ports/distfiles/
-DISTNAME=	eurolatin-${PORTVERSION}
+MASTER_SITES=	http://www.tavultesoft.com/eurolatin/ \
+		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
+DISTNAME=	eurolatin-source-${PORTVERSION}
 DIST_SUBDIR=	kmfl
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	Paneuropean Latin KMFL keyboard covering 42 languages
+COMMENT=	Paneuropean Latin KMFL keyboard covering 120 languages
 
+BUILD_DEPENDS=	base64:${PORTSDIR}/converters/base64
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/EuroLatin\ Source\ Files
 USE_DOS2UNIX=	european.kmn
-NO_BUILD=	yes
 USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
@@ -29,24 +28,25 @@ KMFL_DIR=	share/kmfl
 KMFL_ICONS_DIR=	share/kmfl/icons
 
 PORTDOCS=	*
-DOCSLIST=	eurolatin12.pdf european.html licence.txt readme.html \
-	       	welcome.htm
+DOCSLIST=	EuroLatin\ Keyman\ Desktop\ Keyboard\ Files/eurolatin1.6.pdf \
+		EuroLatin\ KeymanWeb\ Keyboard\ Files/european.html \
+		licence.txt
 PLIST_FILES=	${KMFL_DIR}/european.kmn \
-		${KMFL_ICONS_DIR}/european.bmp \
-		${KMFL_ICONS_DIR}/latin.bmp \
-		${KMFL_ICONS_DIR}/latin.ico
+		${KMFL_ICONS_DIR}/latin.png
 PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
 		${KMFL_DIR}
 
+do-build:
+	base64 -d ${FILESDIR}/latin.png.base64.txt > ${WRKSRC}/latin.png
+
 do-install:
 	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${WRKSRC}/*.ico \
-	       ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/latin.png ${LOCALBASE}/${KMFL_ICONS_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} ${WRKSRC}/$$doc ${DOCSDIR} ; \
+		${INSTALL_DATA} ${WRKSRC}/"$$doc" ${DOCSDIR} ; \
 	done
 .endif
 
diff --git a/textproc/kmfl-european-latin/distinfo b/textproc/kmfl-european-latin/distinfo
index caa7875d2a67..81880b2469ce 100644
--- a/textproc/kmfl-european-latin/distinfo
+++ b/textproc/kmfl-european-latin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmfl/eurolatin-1.2.zip) = 9a31983c240d1b3e46474a264e904b69dc3cc058eea25c7185e99af211454a77
-SIZE (kmfl/eurolatin-1.2.zip) = 362966
+SHA256 (kmfl/eurolatin-source-1.6.zip) = b036a615752fef85053c6092dd106a0c7a26c2c0e775a35752e811067488a23f
+SIZE (kmfl/eurolatin-source-1.6.zip) = 379309
diff --git a/textproc/kmfl-european-latin/files/patch-european.kmn b/textproc/kmfl-european-latin/files/patch-european.kmn
index 0d2c44cc8e22..415921f7b5f2 100644
--- a/textproc/kmfl-european-latin/files/patch-european.kmn
+++ b/textproc/kmfl-european-latin/files/patch-european.kmn
@@ -1,13 +1,15 @@
---- european.kmn.orig	2010-06-29 10:41:38.000000000 +0000
-+++ european.kmn	2010-06-29 10:42:30.000000000 +0000
-@@ -5,15 +5,15 @@
+--- european.kmn	2011-07-04 13:23:20.000000000 +0200
++++ european.kmn	2011-07-04 13:23:10.000000000 +0200
+@@ -4,18 +4,18 @@
+ c http://www.tavultesoft.com/forums/category.php?ForumSourceID=1&SourceID=348
  
  VERSION 7.0
- NAME "European Latin"
+-store(&NAME) 'EuroLatin Keyboard'
 -store(&BITMAP) 'latin.ico'
-+store(&BITMAP) 'latin.bmp'
- store(&COPYRIGHT) 'Copyright (C) 1994-2008 Tavultesoft Pty Ltd'
- 
++store(&NAME) 'European Latin Keyboard 1.6'
++store(&BITMAP) 'latin.png'
+ store(&COPYRIGHT) 'Copyright (C) 1994-2011 Tavultesoft Pty Ltd'
+      
  store(&mnemoniclayout) '1'
  
  c KeymanWeb-specific header statements
@@ -16,15 +18,18 @@
 -store(&KMW_EmbedJS) 'european_js.txt'
 +c store(&KMW_HelpFile) 'european.html'
 +c store(&KMW_EmbedJS) 'european_js.txt'
+ store(&ETHNOLOGUECODE) 'aae acf act afr aig ale aln als arg ast bah bar bch bda bgx bis bjs bjt ble bos bre bsc bzj bzk cae cat ces cim cks cor cos cou cqu crh crs csb csk cwt cym dan deu drt dsb dyo eja eml ems eng epo esi esk ess est esu eus ext fao fap fax ffm fil fin fit fkv fly fra frc frk frp frr frs fry fub fuc fue fuf fuh fui ful fuq fur fuv gag gaz gcf gcl gcr gct geh ghc gla gle glg glv gos gsl gsw gul gyn hat hbs hhr hrv hsb hun hwc icr ikt ipk isl ist ita jam jut kal kea kmv knf kqe krl krx ksh ktu lad lat lav lij lim lit liv lld lmo lou ltz lud mey mfe mfv mhn mkw mlo mlt mwl nap nde nds ndv nld nor oci olo oor pap pbo pbp pcd pdc pdt pfl pis pms pol por prg qub qud que quf qug quh quk qul qup qur qus quw qux quy quz qva qvc qve qvh qvi qvj qvl qvm qvn qvo qvp qvs qvw qvz qwa qwc qwh qws qxa qxc qxh qxl qxn qxo qxp qxr qxt qxu qxw rcf rmc rmf rmn rmo rmw rmy roh rom ron rop ruo rup ruq sag sav scn sco sdc sdn sdt sdz sia sje sjt sju sli slk slv sma sme smj smn sms snf snj spa spq sqi src srm srn sro srp srr ssw stl stq svc swe swg swh sxu szl tch tcs tgh tgl tpi trf tuk tur twd vec vel vep vic vls vmf vot wae wep wln wof wol wym xav xho yor zaa zab zac zad zae zaf zai zam zao zap zaq zar zas zat zav zaw zax zca zch zea zeh zgb zgm zgn zha zhd zhn zlj zln zlq zoo zpa zpb zpc zpd zpe zpf zpg zph zpi zpj zpk zpl zpm zpn zpo zpp zpq zpr zps zpt zpu zpv zpw zpx zpy zpz zqe zrp zsr zte ztg ztl ztm ztn ztp ztq zts ztt ztu ztx zty zul zyb zyg zyj zyn grn nhd gui gun gug gnw'
+-store(&WINDOWSLANGUAGES) 'x0436 x041C x0484 x042C x042D x0813 x080C x0414 x141A x0416 x047E x0403 x0483 x041A x041A x0405 x0406 x0413 x0C09 x2809 x1009 x4009 x1809 x2009 x4409 x1409 x4809 x1C09 x2409 x3409 x0809 x0409 x2C09 x3009 x0425 x0438 x040B x0C0C x140C x180C x100C x0462 x040C x083C x0456 x0C07 x1407 x1007 x0807 x0407 x046F x040E x040F x0810 x0410 x043F x0426 x0427 x082E x046E x043A x0481 x047C x0814 x0482 x0415 x0816 x046B x086B x0C6B x0417 x0418 x243B x103B x143B x0C3B x043B x083B x183B x1C3B x181A x081A x041B x0424 x0C0A x2C0A x400A x340A x240A x140A x300A x440A x100A x480A x080A x4C0A x180A x3C0A x280A x500A x1C0A x380A x540A x200A x040A x0441 x081D x041D x041F x0422 x0452 x0488 x0434 x046A x0435'
++c store(&WINDOWSLANGUAGES) 'x0436 x041C x0484 x042C x042D x0813 x080C x0414 x141A x0416 x047E x0403 x0483 x041A x041A x0405 x0406 x0413 x0C09 x2809 x1009 x4009 x1809 x2009 x4409 x1409 x4809 x1C09 x2409 x3409 x0809 x0409 x2C09 x3009 x0425 x0438 x040B x0C0C x140C x180C x100C x0462 x040C x083C x0456 x0C07 x1407 x1007 x0807 x0407 x046F x040E x040F x0810 x0410 x043F x0426 x0427 x082E x046E x043A x0481 x047C x0814 x0482 x0415 x0816 x046B x086B x0C6B x0417 x0418 x243B x103B x143B x0C3B x043B x083B x183B x1C3B x181A x081A x041B x0424 x0C0A x2C0A x400A x340A x240A x140A x300A x440A x100A x480A x080A x4C0A x180A x3C0A x280A x500A x1C0A x380A x540A x200A x040A x0441 x081D x041D x041F x0422 x0452 x0488 x0434 x046A x0435'
  
  begin Unicode > use(Main)
  
-@@ -70,7 +70,7 @@
- store(ringO) 'åÅůŮ'
- store(ringK) 'aAuU'
- 
+@@ -98,7 +98,7 @@
+ '=' dk(1) + "'" >  U+A78C c Lowercase Saltillo
+ '=' dk(1) + '"' >  U+A78B c Uppercase Saltillo
+    
 -c \
 +c backslash
- store(specialO) 'ĸʼnſÐðØø¡¦§¨©ª¬­®¯°±²³´µ¶·¸¹º¿×÷†‡‰–—•'
- store(specialK) "knsDdOo!|S:cf~-r_*+23'uP.,1m?x/tT%NM>"
+ store(specialO) '©ÐðƐɛªǤǥĸ—º–ʼnØø¶℗®§ſ‡†µ×¡¦¨¬­¯°±´·¸¿÷‰•¹²³⁴⁵⁶⁷⁸⁹⁰'
+ store(specialK) "cDdEefGgkMmNnOoPprSsTtux!|:~-_*+'.,?/%>1234567890"
  
diff --git a/textproc/kmfl-european-latin/pkg-descr b/textproc/kmfl-european-latin/pkg-descr
index 052a8b738792..c1dd8da9aa8e 100644
--- a/textproc/kmfl-european-latin/pkg-descr
+++ b/textproc/kmfl-european-latin/pkg-descr
@@ -1,6 +1,8 @@
-This keyboard is designed to enable simple input of most Latin script
-languages, including all major European Latin-script languages. The
-keyboard is written in KMN Keyboard Language by the KMN language
+This keyboard is designed to enable simple input in all European
+languages which use Latin-script, and in most Latin-script languages
+from the rest of the world.
+
+The keyboard is written in KMN Keyboard Language by the KMN language
 developer, Tavultesoft (http://www.tavultesoft.com). The keyboard
 uses punctuation and letter keys in sequence to access diacritic and
 other letters.
@@ -8,7 +10,7 @@ other letters.
 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,
+It currently covers 120 languages including: Afrikaans, Albanian,
 Balearic, Basque, Breton, Catalan, Croatian, Czech, Danish, Dutch,
 Esperanto, Estonian, Faroese, Finnish, French, Gaelic, Galician,
 German, Hungarian, Icelandic, Inuktitut, Italian, Kashubian, Ladin,