Removed misc/m17n-contrib, merged back to m17n-db-1.7.0.

6 files changed, 1 insertions, 168 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 392a31e28f9..61e6431dcbf 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.444 2014/11/15 03:46:53 markd Exp $
+# $NetBSD: Makefile,v 1.445 2014/12/14 08:01:42 obache Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -176,7 +176,6 @@ SUBDIR+=	loco
 SUBDIR+=	logsurfer
 SUBDIR+=	lookup
 SUBDIR+=	lv
-SUBDIR+=	m17n-contrib
 SUBDIR+=	m17n-db
 SUBDIR+=	m17n-docs
 SUBDIR+=	marble
diff --git a/misc/m17n-contrib/DESCR b/misc/m17n-contrib/DESCR
deleted file mode 100644
index f50fee13494..00000000000
--- a/misc/m17n-contrib/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The m17n-contrib is a collection of contributed works to be used with
-the m17n library.
diff --git a/misc/m17n-contrib/Makefile b/misc/m17n-contrib/Makefile
deleted file mode 100644
index 572e3f2de7a..00000000000
--- a/misc/m17n-contrib/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2013/01/12 07:08:45 obache Exp $
-#
-
-DISTNAME=	m17n-contrib-1.1.14
-CATEGORIES=	misc
-MASTER_SITES=	http://download.savannah.gnu.org/releases//m17n/
-
-MAINTAINER=	obache@NetBSD.org
-HOMEPAGE=	http://www.nongnu.org/m17n/
-COMMENT=	Collection of contributed works used with the m17n library
-LICENSE=	gnu-lgpl-v2.1
-
-CONFLICTS+=	m17n-db<1.6.3
-
-GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c
-
-REPLACE_AWK=	tbl2mim.awk
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../misc/m17n-db/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/m17n-contrib/PLIST b/misc/m17n-contrib/PLIST
deleted file mode 100644
index f6eb4a08149..00000000000
--- a/misc/m17n-contrib/PLIST
+++ /dev/null
@@ -1,122 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2013/01/12 07:08:45 obache Exp $
-share/locale/de/LC_MESSAGES/m17n-contrib.mo
-share/locale/eo/LC_MESSAGES/m17n-contrib.mo
-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/scripts/tbl2mim.awk
-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
diff --git a/misc/m17n-contrib/distinfo b/misc/m17n-contrib/distinfo
deleted file mode 100644
index 61c0fa0c6ff..00000000000
--- a/misc/m17n-contrib/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2013/01/12 07:08:45 obache Exp $
-
-SHA1 (m17n-contrib-1.1.14.tar.gz) = 6122838c121c897d19f0f8d2bf731315944ebf50
-RMD160 (m17n-contrib-1.1.14.tar.gz) = cff3061a22ca742e57c3f49dbedc819288961023
-Size (m17n-contrib-1.1.14.tar.gz) = 698611 bytes
-SHA1 (patch-aa) = 519bbc86c70137b5ac62785895b91debbbd8c0fe
diff --git a/misc/m17n-contrib/patches/patch-aa b/misc/m17n-contrib/patches/patch-aa
deleted file mode 100644
index 590c9d0320b..00000000000
--- a/misc/m17n-contrib/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/27 14:04:58 obache Exp $
-
---- po/Makefile.in.in.orig	2006-11-28 12:20:03.000000000 +0000
-+++ po/Makefile.in.in
-@@ -30,6 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-+install_sh = @install_sh@
- mkinstalldirs = $(SHELL) @install_sh@ -d
- mkdir_p = @mkdir_p@
-