Convert to UCL & cleanup pkg-message (categories h-k)

58 files changed, 368 insertions, 123 deletions

diff --git a/japanese/alias-fonts/files/pkg-message.in b/japanese/alias-fonts/files/pkg-message.in
index d0a96bd7c553..2087d5001fb4 100644
--- a/japanese/alias-fonts/files/pkg-message.in
+++ b/japanese/alias-fonts/files/pkg-message.in
@@ -1,4 +1,6 @@
-********************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by the following instructions.  It is
 required for an application which uses XLFD.
 
@@ -20,4 +22,6 @@ Font Path setting:
 whether the following directories are listed:
 
     %%PREFIX%%/share/fonts/alias-fonts/	(This port)
-********************************************************************
+EOM
+}
+]
diff --git a/japanese/another-htmllint/files/pkg-message.in b/japanese/another-htmllint/files/pkg-message.in
index 5508dd0735d9..22594a8a6999 100644
--- a/japanese/another-htmllint/files/pkg-message.in
+++ b/japanese/another-htmllint/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate htmllint, use Alias directive in httd.conf or symbolic link
 from %%DATADIR%%/html/ like as:
 
@@ -7,3 +10,6 @@ Alias	/htmllint/	%%DATADIR%%/html/
   AddHandler cgi-script	.cgi
   Options +ExecCGI
 </Directory>
+EOM
+}
+]
diff --git a/japanese/asterisk-sounds/files/pkg-message.in b/japanese/asterisk-sounds/files/pkg-message.in
index a25fcfcfaa40..7fe45bfe5826 100644
--- a/japanese/asterisk-sounds/files/pkg-message.in
+++ b/japanese/asterisk-sounds/files/pkg-message.in
@@ -1,4 +1,6 @@
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 [FYI]
 
  To get natural word order in Japanese sentences
@@ -17,5 +19,6 @@
 
      [options]
      languageprefix=yes
-
-=============================================================================
+EOM
+}
+]
diff --git a/japanese/bugzilla44/pkg-message b/japanese/bugzilla44/pkg-message
index 39c27a506ec7..3f66a12eb4c5 100644
--- a/japanese/bugzilla44/pkg-message
+++ b/japanese/bugzilla44/pkg-message
@@ -1,5 +1,9 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
   Japanese localization for Bugzilla has now been installed.
 
   Please run "checksetup.pl" to re-generate templates.
-==========================================================================
+EOM
+}
+]
diff --git a/japanese/bugzilla50/pkg-message b/japanese/bugzilla50/pkg-message
index 39c27a506ec7..3f66a12eb4c5 100644
--- a/japanese/bugzilla50/pkg-message
+++ b/japanese/bugzilla50/pkg-message
@@ -1,5 +1,9 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
   Japanese localization for Bugzilla has now been installed.
 
   Please run "checksetup.pl" to re-generate templates.
-==========================================================================
+EOM
+}
+]
diff --git a/japanese/canna-server/pkg-message b/japanese/canna-server/pkg-message
index 08bf00526ed7..19de8b6f6294 100644
--- a/japanese/canna-server/pkg-message
+++ b/japanese/canna-server/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Now the cannaserver uses a UNIX domain socket by default.  If you need
 to use a TCP connection, please edit your /etc/rc.conf (or alike) and
 add the -inet command-line option to canna_flags, i.e.:
 
     canna_enable="yes"
     canna_flags="-u bin -inet"
+EOM
+}
+]
diff --git a/japanese/cannadic/files/pkg-message.in b/japanese/cannadic/files/pkg-message.in
index 450a0e3a3650..b52e9edfd73a 100644
--- a/japanese/cannadic/files/pkg-message.in
+++ b/japanese/cannadic/files/pkg-message.in
@@ -1,3 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 You should do set up after the installation.
 See %%PREFIX%%/share/doc/cannadic/README.FreeBSD
+EOM
+}
+]
diff --git a/japanese/cdrom2/files/pkg-message.in b/japanese/cdrom2/files/pkg-message.in
index 6222a833c3b0..d20bbc97f74d 100644
--- a/japanese/cdrom2/files/pkg-message.in
+++ b/japanese/cdrom2/files/pkg-message.in
@@ -1,5 +1,8 @@
-
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 Consult documentation in %%DOCSDIR%% for
 various information.
-**********************************************************************
+EOM
+}
+]
diff --git a/japanese/cp5022x-el/pkg-message b/japanese/cp5022x-el/pkg-message
index 0e0345a51ee1..f8f32f6e9156 100644
--- a/japanese/cp5022x-el/pkg-message
+++ b/japanese/cp5022x-el/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 This elisp supports CP50220 and CP51932 as coding-system.  Add the following
 line to ~/.emacs to activate it:
 
 (require 'cp5022x)
+EOM
+}
+]
diff --git a/japanese/csrd/files/pkg-message.in b/japanese/csrd/files/pkg-message.in
index cd64358d0df5..68249e8ddf6b 100644
--- a/japanese/csrd/files/pkg-message.in
+++ b/japanese/csrd/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 If DOCS option is enabled then you can get more information from the
 following document (EUC-JP is used as file charset):
 
@@ -6,4 +8,6 @@ following document (EUC-JP is used as file charset):
 
 [Example of %%PREFIX%%/etc/csrd.rc]
 -d /cdrom/data -f %%DATADIR%%/csrd.fmt -g %%DATADIR%%/csrd.gai
-**********************************************************************
+EOM
+}
+]
diff --git a/japanese/ctags/files/pkg-message.in b/japanese/ctags/files/pkg-message.in
index 79ca5cbc7e20..790c6dc3cc72 100644
--- a/japanese/ctags/files/pkg-message.in
+++ b/japanese/ctags/files/pkg-message.in
@@ -1,3 +1,7 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 The executable for Exuberant CTAGS is installed as %%PREFIX%%/bin/jexctags
-************************************************************
+EOM
+}
+]
diff --git a/japanese/dbskkd-cdb/files/pkg-message.in b/japanese/dbskkd-cdb/files/pkg-message.in
index 6b26f8735280..8780f6fe1b08 100644
--- a/japanese/dbskkd-cdb/files/pkg-message.in
+++ b/japanese/dbskkd-cdb/files/pkg-message.in
@@ -1,3 +1,9 @@
-Note: the dbskkd-cdb requires inetd or daemontools to run.
+[
+{ type: install
+  message: <<EOM
+The dbskkd-cdb requires inetd or daemontools to run.
+dbskkd-cdb must not be invoked with the root privilege.
 Example configurations are available at %%DOCSDIR%%/examples.md.
-*Note well*: dbskkd-cdb must not be invoked with the root privilege.
+EOM
+}
+]
diff --git a/japanese/ebnetd/files/pkg-message.in b/japanese/ebnetd/files/pkg-message.in
index 43d606701232..1b20db76d809 100644
--- a/japanese/ebnetd/files/pkg-message.in
+++ b/japanese/ebnetd/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 You'll need manual configurations to actually activate EBNETD servers
 (ebhttpd/ebnetd/ndtpd).
 
@@ -30,4 +32,6 @@ Step 2b:
 To start EBNETD servers as child processes of 'inetd', edit
 /etc/inetd.conf. Consult the "Run `xxxx' as a child of `inetd'"
 sections of info file.
-**********************************************************************
+EOM
+}
+]
diff --git a/japanese/edyvalue/pkg-message b/japanese/edyvalue/pkg-message
index a0c31c3baa54..f08a6e97b2ec 100644
--- a/japanese/edyvalue/pkg-message
+++ b/japanese/edyvalue/pkg-message
@@ -1,3 +1,7 @@
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
 Place your Edy card on PaSoRi before executing EdyValue.
-******************************************************************************
+EOM
+}
+]
diff --git a/japanese/esecanna/pkg-message b/japanese/esecanna/pkg-message
index 9f2506529191..bddade586365 100644
--- a/japanese/esecanna/pkg-message
+++ b/japanese/esecanna/pkg-message
@@ -1,4 +1,6 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Quick Setup:
   Take the following steps all as root.
     1) Install one of the esecanna-module ports.
@@ -17,4 +19,6 @@ ${PREFIX}/share/doc/esecanna/ and log output kept in
 Note:
   Using VJE-Delta 3.0 trial, esecannaserver will fail to
 connect to vjed until after once you run vje.
-************************************************************
+EOM
+}
+]
diff --git a/japanese/fcitx-mozc/files/pkg-message.in b/japanese/fcitx-mozc/files/pkg-message.in
index e76eb3120804..ff54c7a8a50d 100644
--- a/japanese/fcitx-mozc/files/pkg-message.in
+++ b/japanese/fcitx-mozc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate fcitx-mozc, please add the following into ~/.xinitrc,
 ~/.xsession, or ~/.kde4/env (for KDE4):
 
@@ -6,3 +9,6 @@ export QT_IM_MODULE=xim
 export XMODIFIERS=@im=fcitx
 %%PREFIX%%/bin/mozc start
 fcitx -r -d
+EOM
+}
+]
diff --git a/japanese/font-ayu18/files/pkg-message.in b/japanese/font-ayu18/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-ayu18/files/pkg-message.in
+++ b/japanese/font-ayu18/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-ayu20/files/pkg-message.in b/japanese/font-ayu20/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-ayu20/files/pkg-message.in
+++ b/japanese/font-ayu20/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-elisa10/files/pkg-message.in b/japanese/font-elisa10/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-elisa10/files/pkg-message.in
+++ b/japanese/font-elisa10/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-elisa8/files/pkg-message.in b/japanese/font-elisa8/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-elisa8/files/pkg-message.in
+++ b/japanese/font-elisa8/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-kaname12/files/pkg-message.in b/japanese/font-kaname12/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-kaname12/files/pkg-message.in
+++ b/japanese/font-kaname12/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-kanji18/files/pkg-message.in b/japanese/font-kanji18/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-kanji18/files/pkg-message.in
+++ b/japanese/font-kanji18/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-kappa20/files/pkg-message.in b/japanese/font-kappa20/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-kappa20/files/pkg-message.in
+++ b/japanese/font-kappa20/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-mona/files/pkg-message.in b/japanese/font-mona/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-mona/files/pkg-message.in
+++ b/japanese/font-mona/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-mplus-bitmap/files/pkg-message.in b/japanese/font-mplus-bitmap/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-mplus-bitmap/files/pkg-message.in
+++ b/japanese/font-mplus-bitmap/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-naga10/files/pkg-message.in b/japanese/font-naga10/files/pkg-message.in
index 059c75d35d44..fd51f56edab9 100644
--- a/japanese/font-naga10/files/pkg-message.in
+++ b/japanese/font-naga10/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +14,6 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
+EOM
+}
+]
diff --git a/japanese/font-shinonome/files/pkg-message.in b/japanese/font-shinonome/files/pkg-message.in
index 059c75d35d44..574c914b973a 100644
--- a/japanese/font-shinonome/files/pkg-message.in
+++ b/japanese/font-shinonome/files/pkg-message.in
@@ -1,4 +1,3 @@
-*******************************************************************
 You can start using the font(s) by following these instructions:
 
 Either type the following in an X terminal:
@@ -12,4 +11,3 @@ of your X.Org configuration file (typically /etc/X11/xorg.conf):
         FontPath "%%FONTSDIR%%/"
 
 then restart X.
-*******************************************************************
diff --git a/japanese/gskk/files/pkg-message.in b/japanese/gskk/files/pkg-message.in
index 9ebf026e842b..ec2e911eb534 100644
--- a/japanese/gskk/files/pkg-message.in
+++ b/japanese/gskk/files/pkg-message.in
@@ -1,3 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 You should do set up after the installation.
 See %%DOCSDIR%%/README.FreeBSD
+EOM
+}
+]
diff --git a/japanese/hns/pkg-message b/japanese/hns/pkg-message
index cd99aca519f1..6a5811435d4f 100644
--- a/japanese/hns/pkg-message
+++ b/japanese/hns/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Installation of hns is not finished completely. Run `hns-setup' manually.
+EOM
+}
+]
diff --git a/japanese/ibus-anthy/pkg-message b/japanese/ibus-anthy/pkg-message
index 6a0b3412b474..1f6d6706d88f 100644
--- a/japanese/ibus-anthy/pkg-message
+++ b/japanese/ibus-anthy/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ibus-anthy installation finished. To use ibus-anthy, please do the following:
 
 If you are using bash or zsh, please add following lines to your $HOME/.bashrc or
@@ -33,3 +36,6 @@ export XIM_ARGS="-r --daemonize --xim"
 If ibus cannot start or the panel does not appear, please ensure
 that you are using up-to-date python.
 There's a bug in python 2.5, which may prevent the panel from appearing.
+EOM
+}
+]
diff --git a/japanese/ibus-mozc/files/pkg-message.in b/japanese/ibus-mozc/files/pkg-message.in
index 56ef2419467d..f7af7fe7cc3b 100644
--- a/japanese/ibus-mozc/files/pkg-message.in
+++ b/japanese/ibus-mozc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate ibus-mozc, please add the following into ~/.xinitrc,
 ~/.xsession, or ~/.kde4/env (for KDE4):
 
@@ -9,3 +12,6 @@ ibus-daemon -r --daemonize --xim
 
 Note that textproc/ibus-qt with IBUS option is required to
 make QT_IM_MODULE=ibus work.
+EOM
+}
+]
diff --git a/japanese/ibus-skk/pkg-message b/japanese/ibus-skk/pkg-message
index 5f81d840c87d..74ea277e5f78 100644
--- a/japanese/ibus-skk/pkg-message
+++ b/japanese/ibus-skk/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ibus-skk installation finished. To use ibus-skk, please do the following:
 
 If you are using bash or zsh, please add following lines to your $HOME/.bashrc or
@@ -33,3 +36,6 @@ export XIM_ARGS="--daemonize --xim"
 If ibus cannot start or the panel does not appear, please ensure
 that you are using up-to-date python.
 There's a bug in python 2.5, which may prevent the panel from appearing.
+EOM
+}
+]
diff --git a/japanese/jed/pkg-message b/japanese/jed/pkg-message
index 98ac916b4969..f77d70546944 100644
--- a/japanese/jed/pkg-message
+++ b/japanese/jed/pkg-message
@@ -1,7 +1,11 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Quickstart:
 	cp ${PREFIX}/share/jed/lib/jed.rc ~/.jedrc
 	jed ~/.jedrc
 
 Read ${PREFIX}/share/doc/jed/jed-j.doc for details.
-************************************************************
+EOM
+}
+]
diff --git a/japanese/kinput2/pkg-message b/japanese/kinput2/pkg-message
index 96f8f88fcb82..c9ba28dba3db 100644
--- a/japanese/kinput2/pkg-message
+++ b/japanese/kinput2/pkg-message
@@ -1,4 +1,6 @@
----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 - The default key-binding is now "egg" style.  See the following line in
   in ${LOCALBASE}/lib/X11/app-defaults/Kinput2:
 
@@ -11,4 +13,6 @@
 
   Note that $JSERVER environment variable can be used to override the
   configuration file.
----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/mailman/files/pkg-message.in b/japanese/mailman/files/pkg-message.in
index 96ccb8d19042..cef1be6017dc 100644
--- a/japanese/mailman/files/pkg-message.in
+++ b/japanese/mailman/files/pkg-message.in
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Mailman has been installed, but requires further configuration before use!
 
 You will have to configure both your MTA (mail server) and web server to
@@ -25,4 +27,6 @@ or link %%LOCALBASE%%/libexec/namazu.cgi to
 to refer to %%LOCALBASE%%/etc/namazu/namazu-sample.
 You can also see the Japanese document in
 <http://www.python.jp/pipermail/mailman-users-jp/2004-August/001008.html>
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/man-doc/pkg-message b/japanese/man-doc/pkg-message
index 7da4a02fe014..1a1e14092f40 100644
--- a/japanese/man-doc/pkg-message
+++ b/japanese/man-doc/pkg-message
@@ -1,16 +1,20 @@
-***********************************************************************
-* Japanese online manual has been successfully installed.             *
-*                                                                     *
-* (1) To read jman(1), use the following command sequence:            *
-*        % setenv LC_CTYPE ja_JP.eucJP                                *
-*        % setenv PAGER jless                                         *
-*        % jman jman                                                  *
-*                                                                     *
-* (2) For more info, please visit following web page (Japanese):      *
-*        Jpman project <URL:http://www.jp.FreeBSD.org/man-jp/>        *
-*                                                                     *
-* (3) If you have any questions, comments, bug reports, suggestions,  *
-*     and/or requests for modifications, please send e-mail to:       *
-*        Jpman project mailing list <man-jp@jp.FreeBSD.org>           *
-*                                                                     *
-***********************************************************************
+[
+{ type: install
+  message: <<EOM
+ Japanese online manual has been successfully installed.
+
+ (1) To read jman(1), use the following command sequence:
+        % setenv LC_CTYPE ja_JP.eucJP
+        % setenv PAGER jless
+        % jman jman
+
+ (2) For more info, please visit following web page (Japanese):
+        Jpman project <URL:http://www.jp.FreeBSD.org/man-jp/>
+
+ (3) If you have any questions, comments, bug reports, suggestions,
+     and/or requests for modifications, please send e-mail to:
+        Jpman project mailing list <man-jp@jp.FreeBSD.org>
+
+EOM
+}
+]
diff --git a/japanese/mecab/pkg-message b/japanese/mecab/pkg-message
index d26c6f82447e..e16c879d3d85 100644
--- a/japanese/mecab/pkg-message
+++ b/japanese/mecab/pkg-message
@@ -1,5 +1,7 @@
-
-========================================================
-                     **** NOTE ****
+[
+{ type: install
+  message: <<EOM
   ipadic was split into japanese/mecab-ipadic port.
-========================================================
+EOM
+}
+]
diff --git a/japanese/migemo.el/pkg-message b/japanese/migemo.el/pkg-message
index 1097b4063fdf..de24eabd2914 100644
--- a/japanese/migemo.el/pkg-message
+++ b/japanese/migemo.el/pkg-message
@@ -1,5 +1,6 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use migemo.el, please set the following elisp to your own
 ~/.emacs.d/init.el file.
 
@@ -14,5 +15,6 @@ To use migemo.el, please set the following elisp to your own
 (setq migemo-coding-system 'utf-8-unix)
 (load-library "migemo")
 (migemo-init)
-
-===========================================================================
+EOM
+}
+]
diff --git a/japanese/migemo/pkg-message b/japanese/migemo/pkg-message
index f5f48e01a589..5e4d153be71a 100644
--- a/japanese/migemo/pkg-message
+++ b/japanese/migemo/pkg-message
@@ -1,7 +1,10 @@
-********************************************************
-* Before using Migemo, you must set following elisp to *
-* your own .emacs file.                                *
-*                                                      *
-* (load-library "migemo")                              *
-*                                                      *
-********************************************************
+[
+{ type: install
+  message: <<EOM
+ Before using Migemo, you must set following elisp to
+ your own .emacs file.
+
+ (load-library "migemo")
+EOM
+}
+]
diff --git a/japanese/mozc-el/pkg-message b/japanese/mozc-el/pkg-message
index 0f7281b2231f..a83191f74d72 100644
--- a/japanese/mozc-el/pkg-message
+++ b/japanese/mozc-el/pkg-message
@@ -1,7 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 To activate mozc, you will need to add the following lines to
 your ~/.emacs:
 
 (set-language-environment "Japanese")
 (setq default-input-method "japanese-mozc")
 (global-set-key (kbd "C-o") 'toggle-input-method)
+EOM
+}
+]
diff --git a/japanese/navi2ch/pkg-message b/japanese/navi2ch/pkg-message
index fb91f29b9334..5712aff8ae80 100644
--- a/japanese/navi2ch/pkg-message
+++ b/japanese/navi2ch/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 navi2ch now requires ja-p5-2chproxy(japanese/p5-2chproxy) to access 2ch.net.
 Before using navi2ch, put the following line into /etc/rc.conf:
 
@@ -6,3 +9,6 @@ Before using navi2ch, put the following line into /etc/rc.conf:
 and start twochproxy service:
 
   # service twochproxy start
+EOM
+}
+]
diff --git a/japanese/p5-Encode-EUCJPMS/pkg-message b/japanese/p5-Encode-EUCJPMS/pkg-message
index c321793162d8..96e8bcaa92e9 100644
--- a/japanese/p5-Encode-EUCJPMS/pkg-message
+++ b/japanese/p5-Encode-EUCJPMS/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 If you want to add eucJP-ms to Encode's demand-loading list (so you
 don't have to "use Encode::EUCJPMS"), run
 
@@ -6,4 +8,6 @@ don't have to "use Encode::EUCJPMS"), run
 
 to update Encode::ConfigLocal, a module that controls local settings.
 After that, "use Encode;" is enough to load eucJP-ms on demand.
-======================================================================
+EOM
+}
+]
diff --git a/japanese/scim-anthy/pkg-message b/japanese/scim-anthy/pkg-message
index 316515697de1..4e1b40beb7f6 100644
--- a/japanese/scim-anthy/pkg-message
+++ b/japanese/scim-anthy/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variables XMODIFIERS and LANG:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM  ; setenv LANG ja_JP.eucJP
@@ -7,5 +9,6 @@ Remember to set environment variables XMODIFIERS and LANG:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/scim-canna/pkg-message b/japanese/scim-canna/pkg-message
index 316515697de1..4e1b40beb7f6 100644
--- a/japanese/scim-canna/pkg-message
+++ b/japanese/scim-canna/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variables XMODIFIERS and LANG:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM  ; setenv LANG ja_JP.eucJP
@@ -7,5 +9,6 @@ Remember to set environment variables XMODIFIERS and LANG:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/scim-honoka/pkg-message b/japanese/scim-honoka/pkg-message
index 316515697de1..4e1b40beb7f6 100644
--- a/japanese/scim-honoka/pkg-message
+++ b/japanese/scim-honoka/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variables XMODIFIERS and LANG:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM  ; setenv LANG ja_JP.eucJP
@@ -7,5 +9,6 @@ Remember to set environment variables XMODIFIERS and LANG:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/scim-skk/pkg-message b/japanese/scim-skk/pkg-message
index 316515697de1..4e1b40beb7f6 100644
--- a/japanese/scim-skk/pkg-message
+++ b/japanese/scim-skk/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variables XMODIFIERS and LANG:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM  ; setenv LANG ja_JP.eucJP
@@ -7,5 +9,6 @@ Remember to set environment variables XMODIFIERS and LANG:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/scim-tables/pkg-message b/japanese/scim-tables/pkg-message
index 8f85821923d6..239266b0a66b 100644
--- a/japanese/scim-tables/pkg-message
+++ b/japanese/scim-tables/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variable XMODIFIERS:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM
@@ -10,5 +12,6 @@ utility to configure the supported locale.
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/scim-tomoe/pkg-message b/japanese/scim-tomoe/pkg-message
index 316515697de1..4e1b40beb7f6 100644
--- a/japanese/scim-tomoe/pkg-message
+++ b/japanese/scim-tomoe/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variables XMODIFIERS and LANG:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM  ; setenv LANG ja_JP.eucJP
@@ -7,5 +9,6 @@ Remember to set environment variables XMODIFIERS and LANG:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/scim-uim/pkg-message b/japanese/scim-uim/pkg-message
index 316515697de1..4e1b40beb7f6 100644
--- a/japanese/scim-uim/pkg-message
+++ b/japanese/scim-uim/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variables XMODIFIERS and LANG:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM  ; setenv LANG ja_JP.eucJP
@@ -7,5 +9,6 @@ Remember to set environment variables XMODIFIERS and LANG:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/japanese/seaside/pkg-message b/japanese/seaside/pkg-message
index 33789b36aba6..65254f4ac318 100644
--- a/japanese/seaside/pkg-message
+++ b/japanese/seaside/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Run seaside image and access:
 	http://localhost:9090/seaside/config
 
 Default user/passwd is:
 	user:	admin
 	passwd:	admin.
+EOM
+}
+]
diff --git a/japanese/sourcehansans-otf/files/pkg-message.in b/japanese/sourcehansans-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/japanese/sourcehansans-otf/files/pkg-message.in
+++ b/japanese/sourcehansans-otf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/japanese/sourcehanserif-otf/files/pkg-message.in b/japanese/sourcehanserif-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/japanese/sourcehanserif-otf/files/pkg-message.in
+++ b/japanese/sourcehanserif-otf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/japanese/spoqahansans-ttf/files/pkg-message.in b/japanese/spoqahansans-ttf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/japanese/spoqahansans-ttf/files/pkg-message.in
+++ b/japanese/spoqahansans-ttf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/japanese/suicavalue/pkg-message b/japanese/suicavalue/pkg-message
index a01009ee6ca1..5c1efdba0028 100644
--- a/japanese/suicavalue/pkg-message
+++ b/japanese/suicavalue/pkg-message
@@ -1,3 +1,7 @@
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
 Place your Suica card on PaSoRi before executing SuicaValue.
-******************************************************************************
+EOM
+}
+]
diff --git a/japanese/tiarra/files/pkg-message.in b/japanese/tiarra/files/pkg-message.in
index 10946d0d7677..f9b8e5cf363e 100644
--- a/japanese/tiarra/files/pkg-message.in
+++ b/japanese/tiarra/files/pkg-message.in
@@ -1,3 +1,7 @@
-
+[
+{ type: install
+  message: <<EOM
 You need to edit %%PREFIX%%/tiarra/tiarra.conf to work properly.
-
+EOM
+}
+]
diff --git a/japanese/uim-mozc/files/pkg-message.in b/japanese/uim-mozc/files/pkg-message.in
index 0ad0ae007dc5..42bbe916e7d2 100644
--- a/japanese/uim-mozc/files/pkg-message.in
+++ b/japanese/uim-mozc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate uim-mozc, please add the following into ~/.xinitrc,
 ~/.xsession, or ~/.kde4/env (for KDE4):
 
@@ -7,3 +10,6 @@ export XMODIFIERS=@im=uim
 export XIM=uim
 %%PREFIX%%/bin/mozc start
 uim-xim &
+EOM
+}
+]
diff --git a/japanese/wordpress/files/pkg-message.in b/japanese/wordpress/files/pkg-message.in
index a3c01e1be0d6..92426c987e83 100644
--- a/japanese/wordpress/files/pkg-message.in
+++ b/japanese/wordpress/files/pkg-message.in
@@ -1,6 +1,16 @@
-                  **** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
 in %%WWWDIR%% and modify it to fit your MySQL.
 Maybe you need 'mysqladmin create wordpress' first.
+EOM
+}
+{ type: upgrade
+  maximum_version: 3
+  message: <<EOM
 If you are upgrading from 1.x or 2.x to 3.x, please run
 http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
+EOM
+}
+]
diff --git a/japanese/yc.el/pkg-message b/japanese/yc.el/pkg-message
index f8e9c0392b67..a907b71102ba 100644
--- a/japanese/yc.el/pkg-message
+++ b/japanese/yc.el/pkg-message
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 Quick Setup:
 
 (1) Add the following two lines in your $HOME/.emacs file;
@@ -13,9 +15,11 @@ Quick Setup:
 
   These values are also configurable in .emacs by setting variables
   'yc-server-host' and 'yc-canna-lib-path'.
-**********************************************************************
+
 Note:
   If you want to use UNIX-domain socket for communication with cannaserver
   in emacs21 or former version of emacsen, define WITH_ICANNA to add
   dependency to ports ja-icanna.
-**********************************************************************
+EOM
+}
+]