6 files changed, 37 insertions, 49 deletions

diff --git a/textproc/kmfl-sil-ipa-unicode/Makefile b/textproc/kmfl-sil-ipa-unicode/Makefile
index 383f10cc7e26..5362e00d571d 100644
--- a/textproc/kmfl-sil-ipa-unicode/Makefile
+++ b/textproc/kmfl-sil-ipa-unicode/Makefile
@@ -5,25 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	scim-kmfl-sil-ipa-unicode5
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	textproc
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_112_Src\&filename=/:1 \
-		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_112.pdf\&filename=/:2
-DISTFILES=	IPAUni_Src11.zip:1 \
-   		IPA+Unicode+5.0c_ver+1.1.2_KMN.pdf:2
+MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12_Src\&filename=/:1 \
+		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12.pdf\&filename=/:2
+DISTFILES=	IPAUni_Src12.zip:1 \
+   		IPA+Unicode+5.1_ver+1.2_KMN.pdf:2
 DIST_SUBDIR=	kmfl
-EXTRACT_ONLY=	IPAUni_Src11.zip
+EXTRACT_ONLY=	IPAUni_Src12.zip
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	IPA Unicode 5 mnemonic keyboard for KMFL IMEngine of SCIM
+COMMENT=	IPA Unicode 5.1 mnemonic keyboard for KMFL IMEngine of SCIM
 
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
  		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/kmfl.so:${PORTSDIR}/textproc/scim-kmfl-imengine
 
-RESTRICTED=	SIL's Freeware License (a) doesn't allow distribution, (b) makes keyboard free for personal use only, (c) doesn't allow distribution of modified keyboard sources under the same name.
-
-WRKSRC=		${WRKDIR}/IPA112
+WRKSRC=		${WRKDIR}/IPA12
+USE_DOS2UNIX=	IPAUni12.kmn
 NO_BUILD=	yes
 USE_ZIP=	yes
 
@@ -35,9 +33,9 @@ SCIM_KMFL_ICONS_DIR=	share/scim/kmfl/icons
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 DOCSLIST=	${WRKSRC}/welcome.htm \
-		${DISTDIR}/${DIST_SUBDIR}/IPA+Unicode+5.0c_ver+1.1.2_KMN.pdf
-PLIST_FILES=	${SCIM_KMFL_DIR}/IPAUni11.kmn \
-		${SCIM_KMFL_ICONS_DIR}/IPA93.bmp \
+		${DISTDIR}/${DIST_SUBDIR}/IPA+Unicode+5.1_ver+1.2_KMN.pdf
+PLIST_FILES=	${SCIM_KMFL_DIR}/IPAUni12.kmn \
+		${SCIM_KMFL_ICONS_DIR}/ipa.bmp \
 		${SCIM_KMFL_ICONS_DIR}/sil.bmp
 
 do-install:
diff --git a/textproc/kmfl-sil-ipa-unicode/distinfo b/textproc/kmfl-sil-ipa-unicode/distinfo
index 91c83750624f..c9e9f813812b 100644
--- a/textproc/kmfl-sil-ipa-unicode/distinfo
+++ b/textproc/kmfl-sil-ipa-unicode/distinfo
@@ -1,6 +1,6 @@
-MD5 (kmfl/IPAUni_Src11.zip) = 3e9c76cfb174367c2a0d42c693844bbb
-SHA256 (kmfl/IPAUni_Src11.zip) = a87d0d0aa8a977304359ff7e75ce906f7ee6cf978ab5ef17ef8b9b929b38792a
-SIZE (kmfl/IPAUni_Src11.zip) = 125086
-MD5 (kmfl/IPA+Unicode+5.0c_ver+1.1.2_KMN.pdf) = 1bdc5482d0abeec34f053fbc317a59ef
-SHA256 (kmfl/IPA+Unicode+5.0c_ver+1.1.2_KMN.pdf) = f61d754f4f65a26860f63f94478b056800056fac2ab396a6b0cdd2787f69bf73
-SIZE (kmfl/IPA+Unicode+5.0c_ver+1.1.2_KMN.pdf) = 365961
+MD5 (kmfl/IPAUni_Src12.zip) = 68a280eda858cbb062581c760e68d362
+SHA256 (kmfl/IPAUni_Src12.zip) = e4ed6d9268c5877f800437a6d5e6f8ea664f469059c905ee4c3682a92511da69
+SIZE (kmfl/IPAUni_Src12.zip) = 123262
+MD5 (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = fdd096cbd0dfe39f819f8b62e53f96e6
+SHA256 (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = 778abed97671f7957c4e404b4f766ef636cffa7bd18195aa72d9883999ce28d6
+SIZE (kmfl/IPA+Unicode+5.1_ver+1.2_KMN.pdf) = 638769
diff --git a/textproc/kmfl-sil-ipa-unicode/files/patch-IPAUni11.kmn b/textproc/kmfl-sil-ipa-unicode/files/patch-IPAUni11.kmn
deleted file mode 100644
index f52fd255fa3e..000000000000
--- a/textproc/kmfl-sil-ipa-unicode/files/patch-IPAUni11.kmn
+++ /dev/null
@@ -1,14 +0,0 @@
---- IPAUni11.kmn.orig	2007-06-12 12:53:08.000000000 -0300
-+++ IPAUni11.kmn	2007-10-24 13:47:11.000000000 -0200
-@@ -48,8 +48,9 @@
- NAME "IPA Unicode 5.0c (ver 1.1.2) KMN"

- VERSION 6.0

- c BITMAPS IPA93ON IPA93OFF

--BITMAP IPA93

--HOTKEY  "^+P"

-+BITMAP IPA93.bmp

-+AUTHOR "Martin Hosken and Lorna A. Priest"

-+COPYRIGHT "SIL Non-Roman Script Initiative (NRSI)"

- 

- begin Unicode > use(Unicode)

- 

diff --git a/textproc/kmfl-sil-ipa-unicode/files/patch-IPAUni12.kmn b/textproc/kmfl-sil-ipa-unicode/files/patch-IPAUni12.kmn
new file mode 100644
index 000000000000..8fac10cf420b
--- /dev/null
+++ b/textproc/kmfl-sil-ipa-unicode/files/patch-IPAUni12.kmn
@@ -0,0 +1,17 @@
+--- IPAUni12.kmn.orig	2009-06-24 14:32:05.000000000 +0200
++++ IPAUni12.kmn	2009-06-24 14:35:27.000000000 +0200
+@@ -51,12 +51,11 @@
+  
+ NAME "IPA Unicode 5.1 (ver 1.2) KMN"
+ VERSION 6.0
+-BITMAP ipa
++BITMAP ipa.bmp
+ c BITMAP ipa.png
+-HOTKEY  "^+P"
+ COPYRIGHT "© 2002-2008 SIL International"
+ MESSAGE "The IPA Unicode 5.1 (ver 1.2) KMN Unicode keyboard is distributed under the X11 free software license (http://scripts.sil.org/X11License)."
+-c store(&author) "M. Hosken, D. Bevan"
++store(&author) "M. Hosken, D. Bevan"
+ c store(&language) ""
+ 
+ begin Unicode > use(Unicode)
diff --git a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
index 0fe7f4c1d4eb..d9bf80e47566 100644
--- a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
+++ b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
@@ -7,13 +7,4 @@
   found in 
 
     %%PREFIX%%/share/doc/kmfl/scim-kmfl-sil-ipa-unicode5/
-
-  This keyboard is distributed under SIL's Freeware Licence which
-    (a) doesn't allow distribution,
-    (b) makes keyboard free for personal use only,
-    (c) doesn't allow distribution of modified keyboard sources under
-        the same name.
-
-   http://www.sil.org/computing/catalog/freeware.html
-   http://scripts.sil.org/UniIPAKeyboard#dee994f5
 ------------------------------------------------------------------------
diff --git a/textproc/kmfl-sil-ipa-unicode/pkg-descr b/textproc/kmfl-sil-ipa-unicode/pkg-descr
index 0ee422a0c8e0..26957b02b4cd 100644
--- a/textproc/kmfl-sil-ipa-unicode/pkg-descr
+++ b/textproc/kmfl-sil-ipa-unicode/pkg-descr
@@ -4,11 +4,7 @@ language. The keyboard is developed by SIL Non-Roman Script Initiative
 (NRSI). This port installs the keyboard so that it can be used through
 SCIM KMFL IMEngine (textproc/scim-kmfl-imengine).
                          
-This open source keyboard is provided under SIL's Freeware licence
-(http://www.sil.org/computing/catalog/freeware.html) which makes it
-free for personal use only and non-distributable. Besides,
-                              
-  <quot>If you plan to redistribute your modified keyboard you must
-  rename it.</quot>
+This keyboard is provided under SIL International X11-style License
+(http://scripts.sil.org/X11License).
 	                          
 WWW: http://scripts.sil.org/UniIPAKeyboard#dee994f5