- Remove textproc/m17n-contrib was incorporated into m17n-db

PR:		191107

8 files changed, 9 insertions, 190 deletions

diff --git a/MOVED b/MOVED
index 57e93a8de4a0..2cee71360469 100644
--- a/MOVED
+++ b/MOVED
@@ -6133,3 +6133,4 @@ games/mangos||2014-06-15|Has expired: Broken for more than 6 months
 lang/clojure-contrib||2014-06-15|Has expired: monolithic contrib library is obsolete
 devel/bzapi||2014-06-15|Has expired: Bugzilla has a native REST API, see https://wiki.mozilla.org/BMO/REST
 graphics/GraphicsMagick13|graphics/GraphicsMagick|2014-06-17|Removed, duplicate of unversioned GraphicsMagick port
+textproc/m17n-contrib|devel/m17n-db|2014-06-18|m17n-contrib was incorporated into m17n-db
diff --git a/UPDATING b/UPDATING
index 9f2fdb9b04aa..1abd01172477 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140618:
+  AFFECTS: users of devel/m17n-* textproc/*m17n*
+  AUTHOR: Nikola Lecic <nikola.lecic@anthesphoria.net>
+
+  devel/m17n-db now incorporates a set of user-contributed input methods and
+  a conversion script, formerly available through textproc/m17n-contrib.
+  Delete textproc/m17n-contrib first and then update/install devel/m17n-db.
+
 20140616:
   AFFECTS: users of devel/subversion
   AUTHOR: lev@FreeBSD.org
diff --git a/textproc/Makefile b/textproc/Makefile
index 564a74cddd96..ea2bf3b5a6f6 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -412,7 +412,6 @@
     SUBDIR += lucene
     SUBDIR += lucene4
     SUBDIR += lv-aspell
-    SUBDIR += m17n-contrib
     SUBDIR += m17n-im-config
     SUBDIR += makefaq
     SUBDIR += makepatch
diff --git a/textproc/m17n-contrib/Makefile b/textproc/m17n-contrib/Makefile
deleted file mode 100644
index 99371c5c2c5e..000000000000
--- a/textproc/m17n-contrib/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Nikola Lecic <nikola.lecic@anthesphoria.net>
-# $FreeBSD$
-
-PORTNAME=	m17n-contrib
-PORTVERSION=	1.1.14
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	m17n
-
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	User-contributed input methods for the m17n library
-
-BUILD_DEPENDS=	m17n-db>=1.6.4:${PORTSDIR}/devel/m17n-db
-RUN_DEPENDS=	m17n-db>=1.6.4:${PORTSDIR}/devel/m17n-db
-
-USES=		gmake
-GNU_CONFIGURE=	yes
-
-OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^m17n_scriptdir = $${m17ndir}/scripts|m17n_scriptdir = ${LOCALBASE}/bin|'\
-		${WRKSRC}/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/textproc/m17n-contrib/distinfo b/textproc/m17n-contrib/distinfo
deleted file mode 100644
index d6df126551bd..000000000000
--- a/textproc/m17n-contrib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (m17n-contrib-1.1.14.tar.gz) = 4f623be23979e2d52c1275621b3d4488c24b9fbd81f5a9d28260d88f93d23d2c
-SIZE (m17n-contrib-1.1.14.tar.gz) = 698611
diff --git a/textproc/m17n-contrib/files/patch-tbl2mim.awk b/textproc/m17n-contrib/files/patch-tbl2mim.awk
deleted file mode 100644
index 666550fc4a8b..000000000000
--- a/textproc/m17n-contrib/files/patch-tbl2mim.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- tbl2mim.awk.orig	2006-12-08 03:01:57.000000000 +0100
-+++ tbl2mim.awk	2008-03-30 19:20:34.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/gawk
-+#!/usr/bin/awk
- # Copyright (C) 2006
- #   National Institute of Advanced Industrial Science and Technology (AIST)
- #   Registration Number H15PRO112
-@@ -25,6 +25,7 @@
-     begin_table = 0;
- }
- 
-+/^ *###/ { next; }
- /^ICON *=/ { ICON = " \""$3"\""; next; }
- /^NAME *=/ { NAME = tolower($3); next; }
- /^LANGUAGES *=/ { LANG = $3; next; }
diff --git a/textproc/m17n-contrib/pkg-descr b/textproc/m17n-contrib/pkg-descr
deleted file mode 100644
index a32a94c74602..000000000000
--- a/textproc/m17n-contrib/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This port installs the user-contributed input methods for the m17n library
-(the official ones are installed through devel/m17n-lib). It currently
-supports Assamese, Eastern and Western Cree syllabics, Bengali, Belarusian,
-Czech, Esperanto, Gujarati, Hindi, Yi, Inuktitut, Kannada, Kashmiri, Malayalam,
-Marathi, Nepali, Ojibwe syllabics, Oriya, Punjabi, Pashto, Russian, Sindhi,
-Sinhala, Tamil, Tai Viet, Telugu, Urdu, Han Viet, Yiddish and Chinese Pinyin
-layouts with various sub-variants.
-
-The port also provides the tbl2mim.awk script for conversion of keyboard
-files used by textproc/scim-table-imengine into SCIM-independent .mim format
-(usable by m17n library).
-
-WWW: http://www.nongnu.org/m17n/
diff --git a/textproc/m17n-contrib/pkg-plist b/textproc/m17n-contrib/pkg-plist
deleted file mode 100644
index ae6673ac72a5..000000000000
--- a/textproc/m17n-contrib/pkg-plist
+++ /dev/null
@@ -1,123 +0,0 @@
-%%NLS%%share/locale/eo/LC_MESSAGES/m17n-contrib.mo
-%%NLS%%share/locale/de/LC_MESSAGES/m17n-contrib.mo
-bin/tbl2mim.awk
-share/m17n/as-inscript.mim
-share/m17n/as-phonetic.mim
-share/m17n/ath-phonetic.mim
-share/m17n/be-kbd.mim
-share/m17n/bla-phonetic.mim
-share/m17n/bn-inscript.mim
-share/m17n/bn-probhat.mim
-share/m17n/bo-ewts.mim
-share/m17n/cr-western.mim
-share/m17n/cs-kbd.mim
-share/m17n/eo-h-f.mim
-share/m17n/eo-h.mim
-share/m17n/eo-plena.mim
-share/m17n/eo-q.mim
-share/m17n/eo-vi.mim
-share/m17n/eo-x.mim
-share/m17n/gu-inscript.mim
-share/m17n/gu-phonetic.mim
-share/m17n/hi-inscript.mim
-share/m17n/hi-phonetic.mim
-share/m17n/hi-remington.mim
-share/m17n/hi-vedmata.mim
-share/m17n/icons/as-inscript.png
-share/m17n/icons/as-phonetic.png
-share/m17n/icons/be-kbd.png
-share/m17n/icons/bn-inscript.png
-share/m17n/icons/bn-probhat.png
-share/m17n/icons/cs-kbd.png
-share/m17n/icons/eo-h-fundamente.png
-share/m17n/icons/eo-h-sistemo.png
-share/m17n/icons/eo-plena.png
-share/m17n/icons/eo-q-sistemo.png
-share/m17n/icons/eo-x-sistemo.png
-share/m17n/icons/gu-inscript.png
-share/m17n/icons/gu-phonetic.png
-share/m17n/icons/hi-inscript.png
-share/m17n/icons/hi-phonetic.png
-share/m17n/icons/hi-remington.png
-share/m17n/icons/hi-vedmata.png
-share/m17n/icons/ii-phonetic.png
-share/m17n/icons/kn-inscript.png
-share/m17n/icons/kn-kgp.png
-share/m17n/icons/ml-inscript.png
-share/m17n/icons/ml-mozhi.png
-share/m17n/icons/ml-swanalekha.png
-share/m17n/icons/mr-inscript.png
-share/m17n/icons/ne-rom.png
-share/m17n/icons/ne-trad.png
-share/m17n/icons/or-inscript.png
-share/m17n/icons/pa-inscript.png
-share/m17n/icons/pa-jhelum.png
-share/m17n/icons/pa-phonetic.png
-share/m17n/icons/ps-phonetic.png
-share/m17n/icons/sd-inscript.png
-share/m17n/icons/si-phonetic-dynamic.png
-share/m17n/icons/si-sumihiri.png
-share/m17n/icons/si-transliteration.png
-share/m17n/icons/ta-inscript.png
-share/m17n/icons/ta-phonetic.png
-share/m17n/icons/ta-tamil99.png
-share/m17n/icons/ta-typewriter.png
-share/m17n/icons/ta-vutam.png
-share/m17n/icons/te-apple.png
-share/m17n/icons/te-inscript.png
-share/m17n/icons/te-pothana.png
-share/m17n/icons/ur-phonetic.png
-share/m17n/icons/uz-kbd.png
-share/m17n/icons/vi-nom-vni.png
-share/m17n/icons/vi-nom.png
-share/m17n/icons/yi-yivo.png
-share/m17n/icons/zh-zhuyin.png
-share/m17n/ii-phonetic.mim
-share/m17n/iu-phonetic.mim
-share/m17n/kn-inscript.mim
-share/m17n/kn-kgp.mim
-share/m17n/ks-inscript.mim
-share/m17n/ks-kbd.mim
-share/m17n/ml-inscript.mim
-share/m17n/ml-mozhi.mim
-share/m17n/ml-swanalekha.mim
-share/m17n/mr-inscript.mim
-share/m17n/mr-itrans.mim
-share/m17n/mr-phonetic.mim
-share/m17n/ne-rom.mim
-share/m17n/ne-trad.mim
-share/m17n/nsk-phonetic.mim
-share/m17n/oj-phonetic.mim
-share/m17n/or-inscript.mim
-share/m17n/or-phonetic.mim
-share/m17n/pa-inscript.mim
-share/m17n/pa-jhelum.mim
-share/m17n/pa-phonetic.mim
-share/m17n/ps-phonetic.mim
-share/m17n/ru-translit.mim
-share/m17n/sa-iast.mim
-share/m17n/sd-inscript.mim
-share/m17n/si-phonetic-dynamic.mim
-share/m17n/si-singlish.mim
-share/m17n/si-sumihiri.mim
-share/m17n/si-trans.mim
-share/m17n/ta-inscript.mim
-share/m17n/ta-phonetic.mim
-share/m17n/ta-tamil99.mim
-share/m17n/ta-typewriter.mim
-share/m17n/ta-vutam.mim
-share/m17n/tai-sonla.mim
-share/m17n/te-apple.mim
-share/m17n/te-inscript.mim
-share/m17n/te-pothana.mim
-share/m17n/te-rts.mim
-share/m17n/ur-phonetic.mim
-share/m17n/uz-kbd.mim
-share/m17n/vi-han.mim
-share/m17n/vi-nom-vni.mim
-share/m17n/vi-nom.mim
-share/m17n/yi-yivo.mim
-share/m17n/zh-pinyin-vi.mim
-share/m17n/zh-zhuyin.mim
-@dirrmtry share/m17n/icons
-@dirrmtry share/m17n