Update m17n-docs to 1.5.5, for m17n-lib 1.5.5.

5 files changed, 144 insertions, 37 deletions

diff --git a/misc/m17n-docs/Makefile b/misc/m17n-docs/Makefile
index a6db373b655..a25c9b1c3e7 100644
--- a/misc/m17n-docs/Makefile
+++ b/misc/m17n-docs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/11/25 06:31:54 obache Exp $
 #
 
-DISTNAME=	m17n-docs-1.5.2
+DISTNAME=	m17n-docs-1.5.5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/
 
@@ -13,5 +13,6 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/m17n-docs/PLIST b/misc/m17n-docs/PLIST
index 5f0d782e5d0..660348c3447 100644
--- a/misc/m17n-docs/PLIST
+++ b/misc/m17n-docs/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/11/25 06:31:54 obache Exp $
 man/man1/m17n-config.1
 man/man1/m17n-db.1
-man/man3/M17NObjectHead.3m17n
-man/man3/MDrawMetric.3m17n
 man/man3/m17nCharacter.3m17n
 man/man3/m17nCharset.3m17n
 man/man3/m17nChartable.3m17n
@@ -263,12 +261,85 @@ man/man5/mdbTutorialIM.5
 share/doc/m17n/html/GFDL.html
 share/doc/m17n/html/annotated.html
 share/doc/m17n/html/bopo-kbd.png
+share/doc/m17n/html/character_8c.html
+share/doc/m17n/html/charset_8c.html
+share/doc/m17n/html/chartab_8c.html
 share/doc/m17n/html/classes.html
+share/doc/m17n/html/coding_8c.html
+share/doc/m17n/html/database_8c.html
+share/doc/m17n/html/dbdata_8txt.html
+share/doc/m17n/html/dbformat_8txt.html
+share/doc/m17n/html/dbtutorial_8txt.html
 share/doc/m17n/html/doxygen.png
+share/doc/m17n/html/draw_8c.html
 share/doc/m17n/html/el-kbd.png
+share/doc/m17n/html/exprog_8txt.html
+share/doc/m17n/html/face_8c.html
+share/doc/m17n/html/fdl_8txt.html
+share/doc/m17n/html/files.html
+share/doc/m17n/html/font_8c.html
+share/doc/m17n/html/fontset_8c.html
 share/doc/m17n/html/functions.html
 share/doc/m17n/html/functions_enum.html
+share/doc/m17n/html/functions_eval.html
 share/doc/m17n/html/functions_vars.html
+share/doc/m17n/html/globals.html
+share/doc/m17n/html/globals_0x61.html
+share/doc/m17n/html/globals_0x62.html
+share/doc/m17n/html/globals_0x63.html
+share/doc/m17n/html/globals_0x64.html
+share/doc/m17n/html/globals_0x65.html
+share/doc/m17n/html/globals_0x66.html
+share/doc/m17n/html/globals_0x67.html
+share/doc/m17n/html/globals_0x68.html
+share/doc/m17n/html/globals_0x69.html
+share/doc/m17n/html/globals_0x6c.html
+share/doc/m17n/html/globals_0x6d.html
+share/doc/m17n/html/globals_0x6e.html
+share/doc/m17n/html/globals_0x6f.html
+share/doc/m17n/html/globals_0x70.html
+share/doc/m17n/html/globals_0x72.html
+share/doc/m17n/html/globals_0x73.html
+share/doc/m17n/html/globals_0x74.html
+share/doc/m17n/html/globals_0x75.html
+share/doc/m17n/html/globals_0x76.html
+share/doc/m17n/html/globals_0x77.html
+share/doc/m17n/html/globals_0x78.html
+share/doc/m17n/html/globals_defs.html
+share/doc/m17n/html/globals_enum.html
+share/doc/m17n/html/globals_eval.html
+share/doc/m17n/html/globals_func.html
+share/doc/m17n/html/globals_func_0x63.html
+share/doc/m17n/html/globals_func_0x64.html
+share/doc/m17n/html/globals_func_0x66.html
+share/doc/m17n/html/globals_func_0x69.html
+share/doc/m17n/html/globals_func_0x6c.html
+share/doc/m17n/html/globals_func_0x70.html
+share/doc/m17n/html/globals_func_0x73.html
+share/doc/m17n/html/globals_func_0x74.html
+share/doc/m17n/html/globals_type.html
+share/doc/m17n/html/globals_vars.html
+share/doc/m17n/html/globals_vars_0x61.html
+share/doc/m17n/html/globals_vars_0x62.html
+share/doc/m17n/html/globals_vars_0x63.html
+share/doc/m17n/html/globals_vars_0x64.html
+share/doc/m17n/html/globals_vars_0x65.html
+share/doc/m17n/html/globals_vars_0x66.html
+share/doc/m17n/html/globals_vars_0x67.html
+share/doc/m17n/html/globals_vars_0x68.html
+share/doc/m17n/html/globals_vars_0x69.html
+share/doc/m17n/html/globals_vars_0x6c.html
+share/doc/m17n/html/globals_vars_0x6d.html
+share/doc/m17n/html/globals_vars_0x6e.html
+share/doc/m17n/html/globals_vars_0x6f.html
+share/doc/m17n/html/globals_vars_0x70.html
+share/doc/m17n/html/globals_vars_0x72.html
+share/doc/m17n/html/globals_vars_0x73.html
+share/doc/m17n/html/globals_vars_0x74.html
+share/doc/m17n/html/globals_vars_0x75.html
+share/doc/m17n/html/globals_vars_0x76.html
+share/doc/m17n/html/globals_vars_0x77.html
+share/doc/m17n/html/globals_vars_0x78.html
 share/doc/m17n/html/group__m17nCharacter.html
 share/doc/m17n/html/group__m17nCharset.html
 share/doc/m17n/html/group__m17nChartable.html
@@ -334,6 +405,7 @@ share/doc/m17n/html/icon-or-itrans.png
 share/doc/m17n/html/icon-pa-itrans.png
 share/doc/m17n/html/icon-rfc1345.png
 share/doc/m17n/html/icon-ru-kbd.png
+share/doc/m17n/html/icon-ru-phonetic.png
 share/doc/m17n/html/icon-ru-yawerty.png
 share/doc/m17n/html/icon-si-samanala.png
 share/doc/m17n/html/icon-si-wijesekera.png
@@ -343,17 +415,15 @@ share/doc/m17n/html/icon-sv-post.png
 share/doc/m17n/html/icon-syrc-phonetic.png
 share/doc/m17n/html/icon-ta-itrans.png
 share/doc/m17n/html/icon-te-itrans.png
-share/doc/m17n/html/icon-th-kesmanee-2.png
 share/doc/m17n/html/icon-th-kesmanee.png
-share/doc/m17n/html/icon-th-pattachote-2.png
 share/doc/m17n/html/icon-th-pattachote.png
-share/doc/m17n/html/icon-th-tis820-2.png
 share/doc/m17n/html/icon-th-tis820.png
 share/doc/m17n/html/icon-unicode.png
 share/doc/m17n/html/icon-vi-tcvn.png
 share/doc/m17n/html/icon-vi-telex.png
 share/doc/m17n/html/icon-vi-viqr.png
 share/doc/m17n/html/icon-vi-vni.png
+share/doc/m17n/html/icon-zh-bopomofo.png
 share/doc/m17n/html/icon-zh-cangjie.png
 share/doc/m17n/html/icon-zh-pinyin.png
 share/doc/m17n/html/icon-zh-py-b5.png
@@ -364,20 +434,44 @@ share/doc/m17n/html/icon-zh-tonepy-b5.png
 share/doc/m17n/html/icon-zh-tonepy-gb.png
 share/doc/m17n/html/icon-zh-tonepy.png
 share/doc/m17n/html/index.html
+share/doc/m17n/html/input-gui_8c.html
+share/doc/m17n/html/input_8c.html
 share/doc/m17n/html/ka-kbd.png
 share/doc/m17n/html/ka-kbd2.png
 share/doc/m17n/html/kk-kbd.png
+share/doc/m17n/html/ko-han2.png
+share/doc/m17n/html/language_8c.html
 share/doc/m17n/html/latn-post.png
 share/doc/m17n/html/latn-pre.png
+share/doc/m17n/html/locale_8c.html
+share/doc/m17n/html/m17n-X_8c.html
+share/doc/m17n/html/m17n-X_8h.html
 share/doc/m17n/html/m17n-config.html
+share/doc/m17n/html/m17n-config_8txt.html
+share/doc/m17n/html/m17n-core_8c.html
+share/doc/m17n/html/m17n-core_8h.html
 share/doc/m17n/html/m17n-db.html
+share/doc/m17n/html/m17n-db_8txt.html
+share/doc/m17n/html/m17n-flt_8c.html
+share/doc/m17n/html/m17n-flt_8h.html
+share/doc/m17n/html/m17n-gd_8c.html
+share/doc/m17n/html/m17n-gui_8c.html
+share/doc/m17n/html/m17n-gui_8h.html
+share/doc/m17n/html/m17n-misc_8h.html
 share/doc/m17n/html/m17nDBData.html
 share/doc/m17n/html/m17nDBFormat.html
 share/doc/m17n/html/m17nDBTutorial.html
 share/doc/m17n/html/m17nExProg.html
+share/doc/m17n/html/m17n_8c.html
+share/doc/m17n/html/m17n_8h.html
+share/doc/m17n/html/mainpage_8txt.html
 share/doc/m17n/html/modules.html
+share/doc/m17n/html/mtext-lbrk_8c.html
+share/doc/m17n/html/mtext-wseg_8c.html
+share/doc/m17n/html/mtext_8c.html
 share/doc/m17n/html/pages.html
 share/doc/m17n/html/parrot.png
+share/doc/m17n/html/plist_8c.html
 share/doc/m17n/html/ru-kbd.png
 share/doc/m17n/html/ru-phonetic.png
 share/doc/m17n/html/ru-yawerty.png
@@ -394,6 +488,7 @@ share/doc/m17n/html/structMDrawGlyph.html
 share/doc/m17n/html/structMDrawGlyphInfo.html
 share/doc/m17n/html/structMDrawMetric.html
 share/doc/m17n/html/structMDrawTextItem.html
+share/doc/m17n/html/structMFLTFont.html
 share/doc/m17n/html/structMFLTGlyph.html
 share/doc/m17n/html/structMFLTGlyphAdjustment.html
 share/doc/m17n/html/structMFLTGlyphString.html
@@ -406,6 +501,6 @@ share/doc/m17n/html/structMInputGUIArgIC.html
 share/doc/m17n/html/structMInputMethod.html
 share/doc/m17n/html/structMInputXIMArgIC.html
 share/doc/m17n/html/structMInputXIMArgIM.html
-share/doc/m17n/html/struct__MFLTFont.html
-share/doc/m17n/m17n-lib.dvi
-share/doc/m17n/m17n-lib.ps
+share/doc/m17n/html/symbol_8c.html
+share/doc/m17n/html/textprop_8c.html
+share/doc/m17n/m17n-lib.pdf
diff --git a/misc/m17n-docs/distinfo b/misc/m17n-docs/distinfo
index bb4c6b306f9..161255e534a 100644
--- a/misc/m17n-docs/distinfo
+++ b/misc/m17n-docs/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/05/12 08:14:15 obache Exp $
+$NetBSD: distinfo,v 1.3 2009/11/25 06:31:55 obache Exp $
 
-SHA1 (m17n-docs-1.5.2.tar.gz) = 8e1cf315a637ae71af67e6203f39183b8e5799cc
-RMD160 (m17n-docs-1.5.2.tar.gz) = 54011b11c7745092c4bcd368e5b1c80a720832e3
-Size (m17n-docs-1.5.2.tar.gz) = 2383096 bytes
-SHA1 (patch-aa) = 8845f6e11a635df61a76381ef49a3a5c3098ad9a
-SHA1 (patch-ab) = 509544d34b90d52a75241d31f755f95b34ae5017
+SHA1 (m17n-docs-1.5.5.tar.gz) = c2c011f304f45c3117cdc934d8d9816697522559
+RMD160 (m17n-docs-1.5.5.tar.gz) = 83c6d3223e6304872b773534216dc1c4422f8901
+Size (m17n-docs-1.5.5.tar.gz) = 3052918 bytes
+SHA1 (patch-aa) = bedaa5ca70a013ba9dab032950e687ab8a599ea0
+SHA1 (patch-ab) = ea1684fbac1451657232f4379b6df842f7ac612b
diff --git a/misc/m17n-docs/patches/patch-aa b/misc/m17n-docs/patches/patch-aa
index 34ce86e562d..703928d10ef 100644
--- a/misc/m17n-docs/patches/patch-aa
+++ b/misc/m17n-docs/patches/patch-aa
@@ -1,27 +1,31 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/27 13:50:43 obache Exp $
+$NetBSD: patch-aa,v 1.2 2009/11/25 06:31:55 obache Exp $
 
---- Makefile.am.orig	2007-10-24 11:21:06.000000000 +0000
+--- Makefile.am.orig	2009-09-03 01:25:18.000000000 +0000
 +++ Makefile.am
-@@ -32,27 +32,27 @@ pkgdata_DATA = \
+@@ -27,31 +27,31 @@ SUBDIRS = utils
+ 
+ pkgdata_DATA = \
+ 	usr/html/index.html \
+-	usr/latex/m17n-lib.ps \
++	usr/latex/m17n-lib.pdf \
+ 	man/man1/m17n-config.1 \
  	man/man3/m17nIntro.3m17n \
  	man/man5/mdbGeneral.5
  
 -pkgdatadir = $(datadir)/m17n/docs
 +pkgdatadir = $(datadir)/doc/m17n
  
- EXTRA_DIST = usr/html usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps \
- 	man/man1 man/man3 man/man5 \
- 	ja/html ja/latex/m17n-lib-ja.dvi ja/latex/m17n-lib-ja.ps
+ EXTRA_DIST = usr/html ja/html \
+ 	usr/latex ja/latex \
+ 	man/man1 man/man3 man/man5
  
  install-pkgdataDATA: $(pkgdata_DATA)
 -	$(mkinstalldirs) $(pkgdatadir)/html
 -	$(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5
--	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
--	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
+-	$(INSTALL_DATA) usr/latex/m17n-lib.pdf $(pkgdatadir)/m17n-lib.pdf
 +	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html
 +	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man5
-+	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(DESTDIR)$(pkgdatadir)/m17n-lib.dvi
-+	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(DESTDIR)$(pkgdatadir)/m17n-lib.ps
++	$(INSTALL_DATA) usr/latex/m17n-lib.pdf $(DESTDIR)$(pkgdatadir)/m17n-lib.pdf
  	cd usr/html; \
  	  for f in *.html *.png; do \
 -	    $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \
diff --git a/misc/m17n-docs/patches/patch-ab b/misc/m17n-docs/patches/patch-ab
index ceb4240ace8..03ad8adef95 100644
--- a/misc/m17n-docs/patches/patch-ab
+++ b/misc/m17n-docs/patches/patch-ab
@@ -1,28 +1,35 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/02/27 13:50:43 obache Exp $
+$NetBSD: patch-ab,v 1.2 2009/11/25 06:31:55 obache Exp $
 
---- Makefile.in.orig	2007-12-28 01:15:49.000000000 +0000
+--- Makefile.in.orig	2009-09-03 01:26:49.000000000 +0000
 +++ Makefile.in
-@@ -99,7 +99,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
+@@ -98,7 +98,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
  GZIP_ENV = --best
  distuninstallcheck_listfiles = find . -type f -print
  distcleancheck_listfiles = find . -type f -print
 -pkgdatadir = $(datadir)/m17n/docs
 +pkgdatadir = $(datadir)/doc/m17n
  ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -676,20 +676,20 @@ uninstall-info: uninstall-info-recursive
+ AMTAR = @AMTAR@
+ AUTOCONF = @AUTOCONF@
+@@ -193,7 +193,7 @@ top_srcdir = @top_srcdir@
+ SUBDIRS = utils
+ pkgdata_DATA = \
+ 	usr/html/index.html \
+-	usr/latex/m17n-lib.ps \
++	usr/latex/m17n-lib.pdf \
+ 	man/man1/m17n-config.1 \
+ 	man/man3/m17nIntro.3m17n \
+ 	man/man5/mdbGeneral.5
+@@ -692,19 +692,19 @@ uninstall-am: uninstall-pkgdataDATA
  
  
  install-pkgdataDATA: $(pkgdata_DATA)
 -	$(mkinstalldirs) $(pkgdatadir)/html
 -	$(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5
--	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
--	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
+-	$(INSTALL_DATA) usr/latex/m17n-lib.pdf $(pkgdatadir)/m17n-lib.pdf
 +	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html
 +	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man5
-+	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(DESTDIR)$(pkgdatadir)/m17n-lib.dvi
-+	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(DESTDIR)$(pkgdatadir)/m17n-lib.ps
++	$(INSTALL_DATA) usr/latex/m17n-lib.pdf $(DESTDIR)$(pkgdatadir)/m17n-lib.pdf
  	cd usr/html; \
  	  for f in *.html *.png; do \
 -	    $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \