diff --git a/hebrew/culmus/files/pkg-message.in b/hebrew/culmus/files/pkg-message.in
index d01354b03aa3..25cd4c249a4f 100644
--- a/hebrew/culmus/files/pkg-message.in
+++ b/hebrew/culmus/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You'll have to add this port's directory (%%PREFIX%%/lib/X11/fonts/culmus
 to you're X font path. Here's how:
 
@@ -11,3 +14,6 @@ X-server.
 If you're using XFS it is also a good idea to add this directory to
 your "catalogue" line in the XFS configuration file:
 %%PREFIX%%/lib/X11/fs/config
+EOM
+}
+]
diff --git a/hebrew/elmar-fonts/files/pkg-message.in b/hebrew/elmar-fonts/files/pkg-message.in
index 8f63746879b1..1d5a083e00cf 100644
--- a/hebrew/elmar-fonts/files/pkg-message.in
+++ b/hebrew/elmar-fonts/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You'll have to add this port's directory PREFIX/lib/X11/fonts/hebrew
 to your X font path:
 
@@ -6,3 +9,6 @@ $ xset fp rehash
 
 or by adding a FontPath line for it in the X-server configuration file (usually
 /etc/X11/xorg.conf) and restarting the X-server.
+EOM
+}
+]
diff --git a/hebrew/he2/pkg-message b/hebrew/he2/pkg-message
index d1c7125d4b13..9ddb0956b67f 100644
--- a/hebrew/he2/pkg-message
+++ b/hebrew/he2/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 I've installed a sample config file for you in
 ${PREFIX}/share/he2/.he2rc.sample
 
 You may want to copy it to either your home directory, or to a file named
 ${PREFIX}/share/he2/.he2rc to set some system-wide defaults.
+EOM
+}
+]
diff --git a/hebrew/hspell/files/pkg-message.in b/hebrew/hspell/files/pkg-message.in
index 757d32298ea3..f171007a0d0f 100644
--- a/hebrew/hspell/files/pkg-message.in
+++ b/hebrew/hspell/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 The recommended usage of this port is first to teach your terminal to display
 hebrew fonts, like this:
 
@@ -15,4 +17,6 @@ hspell file.txt | bidiv
 
 Plus, Hspell can use Ispell as a slave (option -i or executable hspell-i).
 Ispell can be found in %%PORTSDIR%%/textproc/ispell .
-
+EOM
+}
+]
diff --git a/irc/anope/files/pkg-message.in b/irc/anope/files/pkg-message.in
index 351348f024de..f4c60ba13053 100644
--- a/irc/anope/files/pkg-message.in
+++ b/irc/anope/files/pkg-message.in
@@ -1,15 +1,18 @@
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
+[
+{ type: install
+  message: <<EOM
 Anope now installs to %%LOCALBASE%%/anope
-
+EOM
+}
+{ type: upgrade
+  maximum_version: 2.0.0
+  message: <<EOM
 If you are upgrading from <2.0.0, you will need
 to migrate your configs to the new format. There
 is also a guide to migrate your databases to the
 new format. Please read the release notes for 2.0.0.
 
 https://www.anope.org/news.php?id=79
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-
+EOM
+}
+]
diff --git a/irc/bip/files/pkg-message.in b/irc/bip/files/pkg-message.in
index 5f2cf353e635..a0cc8d6dd17d 100644
--- a/irc/bip/files/pkg-message.in
+++ b/irc/bip/files/pkg-message.in
@@ -1,4 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+[
+{ type: install
+  message: <<EOM
 Your sample configuration files have been installed in:
 %%EXAMPLESDIR%%/bip.conf
 
@@ -6,4 +8,6 @@ You must create a directory named .bip in your home directory,
 copy bip.conf there and edit it for your settings.
 
 bip will not start if you don't do this.
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/irc/bitlbee/files/pkg-message.in b/irc/bitlbee/files/pkg-message.in
index 9ca1d122ed4a..12ef1b7d9f78 100644
--- a/irc/bitlbee/files/pkg-message.in
+++ b/irc/bitlbee/files/pkg-message.in
@@ -1,4 +1,6 @@
-/************************************************************************
+[
+{ type: install
+  message: <<EOM
 To configure bitlbee, do the following:
 
 Copy %%EXAMPLESDIR%%/bitlbee.conf
@@ -19,5 +21,6 @@ To instead launch bitlbee as a daemon, add the following line to
 /etc/rc.conf:
 
 bitlbee_enable="YES"
-
-*************************************************************************/
+EOM
+}
+]
diff --git a/irc/darkbot/files/pkg-message.in b/irc/darkbot/files/pkg-message.in
index 76a0e833a0d3..ab1ef37fa1b8 100644
--- a/irc/darkbot/files/pkg-message.in
+++ b/irc/darkbot/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Before using darkbot, it must be configured.
 
 Configuration is achieved using:
 
 # sh %%ETCDIR%%/configure
+EOM
+}
+]
diff --git a/irc/dircproxy/files/pkg-message.in b/irc/dircproxy/files/pkg-message.in
index 376da0d3bfbf..87a0e9b9b74f 100644
--- a/irc/dircproxy/files/pkg-message.in
+++ b/irc/dircproxy/files/pkg-message.in
@@ -1,8 +1,10 @@
-##################################################################
-
+[
+{ type: install
+  message: <<EOM
 A default dircproxy configuration file has been installed as:
 %%DATADIR%%/dircproxyrc.sample
 
 Please read this and the dircproxy(1) manpage to set up dircproxy.
-
-##################################################################
+EOM
+}
+]
diff --git a/irc/eggdrop-devel/files/pkg-message.in b/irc/eggdrop-devel/files/pkg-message.in
index 68f969678c0c..b885cab6f1cf 100644
--- a/irc/eggdrop-devel/files/pkg-message.in
+++ b/irc/eggdrop-devel/files/pkg-message.in
@@ -1,10 +1,12 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 This Port of Eggdrop differs from a normal eggdrop installation, because
 it does respect hier(7). That means your eggdrop.conf goes to
 %%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to
 %%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and
 documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go
 to %%PREFIX%%/share/eggdrop/scripts.
-
-========================================================================
+EOM
+}
+]
diff --git a/irc/eggdrop/files/pkg-message.in b/irc/eggdrop/files/pkg-message.in
index 68f969678c0c..b885cab6f1cf 100644
--- a/irc/eggdrop/files/pkg-message.in
+++ b/irc/eggdrop/files/pkg-message.in
@@ -1,10 +1,12 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 This Port of Eggdrop differs from a normal eggdrop installation, because
 it does respect hier(7). That means your eggdrop.conf goes to
 %%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to
 %%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and
 documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go
 to %%PREFIX%%/share/eggdrop/scripts.
-
-========================================================================
+EOM
+}
+]
diff --git a/irc/epic4/pkg-message b/irc/epic4/pkg-message
index 48c6daacb768..3180174dd38f 100644
--- a/irc/epic4/pkg-message
+++ b/irc/epic4/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 EPIC is a toolkit, much akin to a box of legos.  It strives to let you
 build a client the way you want it.  You will not find EPIC usable without
 a script of some sort.
 
 Some of the more popular scripts can be found at:
 http://epicsol.org/doku.php?id=scripts
+EOM
+}
+]
diff --git a/irc/epic5/pkg-message b/irc/epic5/pkg-message
index 2e345279da73..31b8e91e4020 100644
--- a/irc/epic5/pkg-message
+++ b/irc/epic5/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 You will find EPIC to be a bit primitive without a script of some sort.
 
 Some of the more popular scripts can be found at:
 http://scripts.epicsol.org/doku.php/scripts
+EOM
+}
+]
diff --git a/irc/ezbounce/files/pkg-message.in b/irc/ezbounce/files/pkg-message.in
index 7019c64458a1..b8cfaeb98141 100644
--- a/irc/ezbounce/files/pkg-message.in
+++ b/irc/ezbounce/files/pkg-message.in
@@ -1,4 +1,8 @@
-------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 You will need to edit %%PREFIX%%/etc/ezb.conf and read the docs in
 %%DOCSDIR%%/README to set up this program.
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/gseen.mod/files/pkg-message.in b/irc/gseen.mod/files/pkg-message.in
index f26510132937..b4c46b788e13 100644
--- a/irc/gseen.mod/files/pkg-message.in
+++ b/irc/gseen.mod/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Please add the line source %%PREFIX%%/etc/gseen.conf at the end of
 your eggdrop config file and .rehash your bot
+EOM
+}
+]
diff --git a/irc/hexchat/files/pkg-message.in b/irc/hexchat/files/pkg-message.in
index 80d8bd6bb87c..2f12aae0ea86 100644
--- a/irc/hexchat/files/pkg-message.in
+++ b/irc/hexchat/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 HexChat has been installed.
 
 If you want spell-check to work, you need to install Aspell
@@ -7,5 +8,6 @@ dictionary for your language.
 
 For FiSH Protection it is best to use irc/py-fishcrypt, HexChat has one
 Option FiSHLiM which doesn't work good.
-
-===============================================================================
+EOM
+}
+]
diff --git a/irc/ircd-hybrid/files/pkg-message.in b/irc/ircd-hybrid/files/pkg-message.in
index 880ea30ac8fb..ec4ea2199b31 100644
--- a/irc/ircd-hybrid/files/pkg-message.in
+++ b/irc/ircd-hybrid/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ircd-hybrid has now been installed.
 
 *** IMPORTANT: ***
@@ -14,3 +17,6 @@ ircd_hybrid_enable="YES"
 into your /etc/rc.conf.  You may then start the server by running:
 
 	%%PREFIX%%/etc/rc.d/ircd-hybrid start
+EOM
+}
+]
diff --git a/irc/ircd-ratbox-devel/files/pkg-message.in b/irc/ircd-ratbox-devel/files/pkg-message.in
index 75c12c16a970..796b5c987e81 100644
--- a/irc/ircd-ratbox-devel/files/pkg-message.in
+++ b/irc/ircd-ratbox-devel/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ircd-ratbox-devel has been successfully installed.
 
 Sample 'ircd.conf' and 'ircd.motd' files have been created in the
@@ -28,4 +30,6 @@ should be added as a configuration setting (use_sslonly) in the
 ircd.conf file in order to activate the +S channel mode.
 
 Be sure to check out 'ratbox-services' if you need a services package.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ircd-ratbox/files/pkg-message.in b/irc/ircd-ratbox/files/pkg-message.in
index 45d3fb825fef..c6c4b6a99c92 100644
--- a/irc/ircd-ratbox/files/pkg-message.in
+++ b/irc/ircd-ratbox/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ircd-ratbox has been successfully installed.
 
 Sample 'ircd.conf' and 'ircd.motd' files have been created in the
@@ -33,4 +35,6 @@ For more information on upgrading, see:
 	http://svn.ratbox.org/svnroot/ircd-ratbox/trunk/INSTALL
 
 Be sure to check out 'ratbox-services' if you need a services package.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ircd-ru/files/pkg-message.in b/irc/ircd-ru/files/pkg-message.in
index e96514060493..ac965c1abdc6 100644
--- a/irc/ircd-ru/files/pkg-message.in
+++ b/irc/ircd-ru/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-----------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 ircd-RU has now been installed.
 
 This port create user ircd and group ircd
@@ -12,5 +12,6 @@ You should now edit %%PREFIX%%/ircd-RU/etc/ircd.conf
 You may then start the server by running:
  echo ircd_enable=\"YES\" >> /etc/rc.conf
  %%PREFIX%%/etc/rc.d/ircd.sh start
-
-----------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ircservices/files/pkg-message.in b/irc/ircservices/files/pkg-message.in
index a5d6bc1603b3..a1c486b9bfdf 100644
--- a/irc/ircservices/files/pkg-message.in
+++ b/irc/ircservices/files/pkg-message.in
@@ -1,4 +1,8 @@
-**********          IMPORTANT           **********
+[
+{ type: install
+  message: <<EOM
 The configuration directory has changed to %%PREFIX%%/etc/ircservices
 Please copy your old config files there if updating
-**********          IMPORTANT           *********
+EOM
+}
+]
diff --git a/irc/iroffer-dinoex/pkg-message b/irc/iroffer-dinoex/pkg-message
index 827c9c101b63..fed23e24f7fc 100644
--- a/irc/iroffer-dinoex/pkg-message
+++ b/irc/iroffer-dinoex/pkg-message
@@ -1,5 +1,6 @@
-=========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Sample configuration and crontab files have been placed in
 ${PREFIX}/share/examples/iroffer.
 
@@ -17,5 +18,6 @@ For more details on how to use the program see the comments in
 ${PREFIX}/share/examples/iroffer/sample.config, as well as the README
 files ${PREFIX}/share/doc/iroffer/README and
 ${PREFIX}/share/doc/iroffer/WHATSNEW.
-
-=========================================================================
+EOM
+}
+]
diff --git a/irc/iroffer-lamm/pkg-message b/irc/iroffer-lamm/pkg-message
index 827c9c101b63..fed23e24f7fc 100644
--- a/irc/iroffer-lamm/pkg-message
+++ b/irc/iroffer-lamm/pkg-message
@@ -1,5 +1,6 @@
-=========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Sample configuration and crontab files have been placed in
 ${PREFIX}/share/examples/iroffer.
 
@@ -17,5 +18,6 @@ For more details on how to use the program see the comments in
 ${PREFIX}/share/examples/iroffer/sample.config, as well as the README
 files ${PREFIX}/share/doc/iroffer/README and
 ${PREFIX}/share/doc/iroffer/WHATSNEW.
-
-=========================================================================
+EOM
+}
+]
diff --git a/irc/minbif/files/pkg-message.in b/irc/minbif/files/pkg-message.in
index 50ab96117464..8bb89018232b 100644
--- a/irc/minbif/files/pkg-message.in
+++ b/irc/minbif/files/pkg-message.in
@@ -1,4 +1,6 @@
-/************************************************************************
+[
+{ type: install
+  message: <<EOM
 To configure minbif, do the following:
 
 Copy %%PREFIX%%/etc/minbif/minbif.conf-dist
@@ -14,5 +16,6 @@ minbif.
 To launch the minbif daemon, add the following line to /etc/rc.conf:
 
 minbif_enable="YES"
-
-*************************************************************************/
+EOM
+}
+]
diff --git a/irc/pircbot/files/pkg-message.in b/irc/pircbot/files/pkg-message.in
index e04808be2308..913fbf06da44 100644
--- a/irc/pircbot/files/pkg-message.in
+++ b/irc/pircbot/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To use pircbot add %%JAVAJARDIR%%/pircbot.jar to
 your classpath. A short tutorial can be found here:
     http://www.jibble.org/pircbot.php
@@ -6,4 +8,6 @@ your classpath. A short tutorial can be found here:
 If you have the DOCS option enabled the pircbot javadoc
 documentation will also have been installed in:
     %%DOCSDIR%%
----------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/psybnc/files/pkg-message.in b/irc/psybnc/files/pkg-message.in
index 5adf0b170134..26c0128bf74d 100644
--- a/irc/psybnc/files/pkg-message.in
+++ b/irc/psybnc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 If you have not created SSL certificates for psybnc already, do so using the
 following commands:
 
@@ -8,3 +11,6 @@ cd %%PSYBASE%%
         -key key/psybnc.key.pem -out key/psybnc.cert.pem
 /usr/bin/openssl x509 -subject -dates -fingerprint -noout \
         -in key/psybnc.cert.pem
+EOM
+}
+]
diff --git a/irc/py-fishcrypt/files/pkg-message.in b/irc/py-fishcrypt/files/pkg-message.in
index d72aeeacbae7..1b8149580b18 100644
--- a/irc/py-fishcrypt/files/pkg-message.in
+++ b/irc/py-fishcrypt/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 py-fishcrypt has been installed.
 
 To make FiSH work with py-fishcrypt please do symlink as user
@@ -9,6 +10,6 @@ To make FiSH work with py-fishcrypt please do symlink as user
 For HexChat
 
     ln -sf %%DATADIR%%/fishcrypt.py ~/.config/hexchat/addons/
-
-
-===============================================================================
+EOM
+}
+]
diff --git a/irc/py-supybot/pkg-message b/irc/py-supybot/pkg-message
index 7c6c9845b7cf..2feea7ece9ea 100644
--- a/irc/py-supybot/pkg-message
+++ b/irc/py-supybot/pkg-message
@@ -1,4 +1,6 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Supybot is installed.
 
 For a quick start:
@@ -11,4 +13,6 @@ installed.
 
 **WARNING** Some config names changed between some versions.
 Review the ChangeLog document in the documentation directory.
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/quassel/files/pkg-message.in b/irc/quassel/files/pkg-message.in
index d492d5d4c84a..36e8ef204536 100644
--- a/irc/quassel/files/pkg-message.in
+++ b/irc/quassel/files/pkg-message.in
@@ -1,4 +1,6 @@
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 To run quasselcore at system start-up, add quasselcore_enable="YES"
 to /etc/rc.conf.
 
@@ -14,4 +16,6 @@ or
 By default quasselcore listens on 4242 port at localhost.
 To change default behavior set quasselcore_args variable in /etc/rc.conf.
 See 'quasselcore --help' for available arguments.
-=============================================================================
+EOM
+}
+]
diff --git a/irc/ratbox-respond/files/pkg-message.in b/irc/ratbox-respond/files/pkg-message.in
index 826b46ba980c..fbb8b9aa3fc1 100644
--- a/irc/ratbox-respond/files/pkg-message.in
+++ b/irc/ratbox-respond/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ratbox-respond has been successfully installed.
 
 Be sure to look in:
@@ -6,4 +8,6 @@ Be sure to look in:
   %%EXAMPLESDIR%%/client-scripts
 
 for some example scripts for various popular IRC clients.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ratbox-services/files/pkg-message.in b/irc/ratbox-services/files/pkg-message.in
index 43e4363b1aa2..aaf10aa5bcd7 100644
--- a/irc/ratbox-services/files/pkg-message.in
+++ b/irc/ratbox-services/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ratbox-services has been successfully installed.
 
 A sample configuration file 'ratbox-services.conf' has been created in
@@ -62,5 +64,6 @@ Database Support Note:
 In recent versions, support for MySQL and PgSQL lib detection has been slightly
 broken and currently does not work as expected. This problem should be resolved
 in the next release.
-
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/rbot/files/pkg-message.in b/irc/rbot/files/pkg-message.in
index 38728890e188..4a868bbde846 100644
--- a/irc/rbot/files/pkg-message.in
+++ b/irc/rbot/files/pkg-message.in
@@ -1,7 +1,11 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
   There are many plugins supported by rbot. Each plugin may require specific
   libraries. Before these plugins run correctly, you should make sure those
   libs required are available.
 
   For more details, please check %%DOCSDIR%%/REQUIREMENTS.
-===============================================================================
+EOM
+}
+]
diff --git a/irc/riece/pkg-message b/irc/riece/pkg-message
index ee36e575fc2f..47697dd14e45 100644
--- a/irc/riece/pkg-message
+++ b/irc/riece/pkg-message
@@ -1,8 +1,12 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To use riece, you should add the following line to your .emacs file:
 
 (autoload 'riece "riece" "Start Riece" t)
 
 Some add-ons (e.g. riece-async, riece-rdcc) require Ruby.
 If you use them, you need to install Ruby from port or package.
-**********************************************************************
+EOM
+}
+]
diff --git a/irc/sirc/files/pkg-message-socks b/irc/sirc/files/pkg-message-socks
index c8dcaf6086b5..3807d9c86e1a 100644
--- a/irc/sirc/files/pkg-message-socks
+++ b/irc/sirc/files/pkg-message-socks
@@ -1,5 +1,6 @@
-
-***************************************************************************
+[
+{ type: install
+  message: <<EOM
 	SOCKS support has been added.  To take advantage of it you
 	must add the following to ~/.sircrc.pl:
 
@@ -8,5 +9,6 @@ $ENV{"SOCKS_SERVER"}	=		# You must set this
 # $ENV{"SOCKS_DNS"}	= 1		# For DNS through the proxy
 
 &load("socks.pl");
-***************************************************************************
-
+EOM
+}
+]
diff --git a/irc/srvx/files/pkg-message.in b/irc/srvx/files/pkg-message.in
index 40c4b21c687a..fb2a17172db8 100644
--- a/irc/srvx/files/pkg-message.in
+++ b/irc/srvx/files/pkg-message.in
@@ -1,5 +1,9 @@
-------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 When you 'make deinstall', any files generated by srvx (logs, etc)
 will remain in %%PREFIX%%/etc/. These files must be removed
 manually.
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/undernet-ircu/files/pkg-message.in b/irc/undernet-ircu/files/pkg-message.in
index c796cfcc16ce..e9ba7e6fc6a7 100644
--- a/irc/undernet-ircu/files/pkg-message.in
+++ b/irc/undernet-ircu/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 	To run undernet ircu you must add 'undernet_enable="YES"' to
 	"/etc/rc.conf" .  It can then be started with
 	"%%PREFIX%%/etc/rc.d/undernet start"
@@ -5,3 +8,6 @@
 	You must also copy "%%PREFIX%%/etc/ircd.conf.example" to
 	"%%PREFIX%%/etc/ircd.conf\" and modify its settings according to
 	your needs.  See documentation at http://coder-com.undernet.org.
+EOM
+}
+]
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
+}
+]
diff --git a/java/bootstrap-openjdk11/pkg-message b/java/bootstrap-openjdk11/pkg-message
index 4dbc389a630e..55b9c8d630a8 100644
--- a/java/bootstrap-openjdk11/pkg-message
+++ b/java/bootstrap-openjdk11/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 WARNING: This port only exists for bootstrapping java/openjdk11.
 You are advised to remove this port as soon as a stable JDK is built.
 
@@ -15,5 +16,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/bootstrap-openjdk6/pkg-message b/java/bootstrap-openjdk6/pkg-message
index 0a651e40752f..23d70d8d4e60 100644
--- a/java/bootstrap-openjdk6/pkg-message
+++ b/java/bootstrap-openjdk6/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 WARNING: This port only exists for bootstrapping java/openjdk[67].
 You are advised to remove this port as soon as a stable JDK is built.
 
@@ -15,5 +16,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/bootstrap-openjdk8/pkg-message b/java/bootstrap-openjdk8/pkg-message
index f644fb30d822..99a30f357e43 100644
--- a/java/bootstrap-openjdk8/pkg-message
+++ b/java/bootstrap-openjdk8/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 WARNING: This port only exists for bootstrapping java/openjdk8.
 You are advised to remove this port as soon as a stable JDK is built.
 
@@ -15,5 +16,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/eclipse-pydev/pkg-message b/java/eclipse-pydev/pkg-message
index 625bab898943..bb0fa67128d8 100644
--- a/java/eclipse-pydev/pkg-message
+++ b/java/eclipse-pydev/pkg-message
@@ -1,5 +1,6 @@
-*********************************************************************
-
+[
+{ type: install
+  message: <<EOM
   The first time, run Eclipse with the option -clean, and configure
   a Python or Jython interpreter in  Window -> Preferences -> PyDev
   -> Interpreter before creating a new Pydev project
@@ -9,5 +10,6 @@
     eclipse -consoleLog -initialize
 
   as root or sudoer.
-
-*********************************************************************
+EOM
+}
+]
diff --git a/java/intellij-rubymine/files/pkg-message.in b/java/intellij-rubymine/files/pkg-message.in
index 210572bb37d4..dc0880e9dc5f 100644
--- a/java/intellij-rubymine/files/pkg-message.in
+++ b/java/intellij-rubymine/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 There is  native (faster) file watching support backed by kqueue which is
 enabled by default.  If you encounter problems  problems with watching large
 trees, you disable it by appending the following property into
 %%DATADIR%%/bin/idea.properties:
 
 	idea.filewatcher.disabled=true
+EOM
+}
+]
diff --git a/java/intellij-ultimate/files/pkg-message.in b/java/intellij-ultimate/files/pkg-message.in
index 6c58cbfb7011..19656dce9822 100644
--- a/java/intellij-ultimate/files/pkg-message.in
+++ b/java/intellij-ultimate/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 There is a native (faster) file watching support backed by kqueue which is
 enabled by default.  If you encounter problems with watching large
 trees you can disable it by appending the following property into
 %%IDEA_HOME%%/bin/idea.properties:
 
       idea.filewatcher.disabled=true
+EOM
+}
+]
diff --git a/java/intellij/files/pkg-message.in b/java/intellij/files/pkg-message.in
index 3830266040c0..ce5fe8305128 100644
--- a/java/intellij/files/pkg-message.in
+++ b/java/intellij/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 There is a native (faster) file watching support backed by kqueue which is
 enabled by default.  If you encounter problems with watching large
 trees, you can disable it by appending the following property into
@@ -10,3 +13,6 @@ Only enable fsnotifier if your projects have < 600 files.
 At systems which use links for /usr/home/user or /home/user apparently
 IDEA finds two different VCS roots while trying to integrate with Git.
 Please, use as a VCS root only one of them.
+EOM
+}
+]
diff --git a/java/jai/files/pkg-message.in b/java/jai/files/pkg-message.in
index 8f6737ef264a..691ba6271e1c 100644
--- a/java/jai/files/pkg-message.in
+++ b/java/jai/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 The JAI libraries are not installed in JRE, so you have to add
   %%TARGET_DIR%%/jai_codec.jar
   %%TARGET_DIR%%/jai_core.jar
 to the CLASSPATH environment variable.
+EOM
+}
+]
diff --git a/java/jfreechart/pkg-message b/java/jfreechart/pkg-message
index 202399e64aff..8d108df49e0f 100644
--- a/java/jfreechart/pkg-message
+++ b/java/jfreechart/pkg-message
@@ -1,6 +1,8 @@
-**************************************************************
-
+[
+{ type: install
+  message: <<EOM
 In order to use classes in org.jfree.chart.servlet package,
 please put Java Servlet 2.3 implementation in class path.
-
-**************************************************************
+EOM
+}
+]
diff --git a/java/jikes/pkg-message b/java/jikes/pkg-message
index 3563ce1f0109..88275808a6a1 100644
--- a/java/jikes/pkg-message
+++ b/java/jikes/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This distribution is covered by the "IBM Public License Version
 Version 1.0 - Jikes" contained in the file doc/license.htm. You
 must accept the terms of the license agreement to use this software.
@@ -8,3 +11,6 @@ Copyright (C) 1996, 1998, International Business Machines Corporation
 and others.  All Rights Reserved.
 
 You must accept the terms of that agreement to use this software.
+EOM
+}
+]
diff --git a/java/jlex/files/pkg-message.in b/java/jlex/files/pkg-message.in
index 4f883c6413e3..cc91aa953e12 100644
--- a/java/jlex/files/pkg-message.in
+++ b/java/jlex/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 JLex is installed into %%JAVAJARDIR%%.
 
 Run with 'jlex'
 
 See http://www.cs.princeton.edu/~appel/modern/java/JLex.
+EOM
+}
+]
diff --git a/java/lightweight-java-profiler/pkg-message b/java/lightweight-java-profiler/pkg-message
index f957b294f48b..26164e697ca1 100644
--- a/java/lightweight-java-profiler/pkg-message
+++ b/java/lightweight-java-profiler/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To use the lightweight-java-profiler, you can invoke Java as follows:
 
 java -agentpath:path/to/liblagent.so[:file=fname] It will spit out stack traces into traces.txt (or into the optional fname passed to the agent). The current implementation samples every 1/100th of a second. It stores the first 3000 stack traces it encounters; additional stack traces will be ignored, but duplicate stack traces will continue to be counted indefinitely (or until the counter overflows, which will take a while).
+EOM
+}
+]
diff --git a/java/linux-oracle-jdk10/pkg-message b/java/linux-oracle-jdk10/pkg-message
index 71cb926c4d73..c1bbde5f92c5 100644
--- a/java/linux-oracle-jdk10/pkg-message
+++ b/java/linux-oracle-jdk10/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JDK may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/linux-oracle-jdk18/pkg-message b/java/linux-oracle-jdk18/pkg-message
index 71cb926c4d73..c1bbde5f92c5 100644
--- a/java/linux-oracle-jdk18/pkg-message
+++ b/java/linux-oracle-jdk18/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JDK may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/linux-oracle-jdk9/pkg-message b/java/linux-oracle-jdk9/pkg-message
index 71cb926c4d73..c1bbde5f92c5 100644
--- a/java/linux-oracle-jdk9/pkg-message
+++ b/java/linux-oracle-jdk9/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JDK may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/linux-oracle-jre10/pkg-message b/java/linux-oracle-jre10/pkg-message
index 3fb23658a588..84187435394f 100644
--- a/java/linux-oracle-jre10/pkg-message
+++ b/java/linux-oracle-jre10/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JRE may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/linux-oracle-jre18/pkg-message b/java/linux-oracle-jre18/pkg-message
index 3fb23658a588..84187435394f 100644
--- a/java/linux-oracle-jre18/pkg-message
+++ b/java/linux-oracle-jre18/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JRE may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/linux-oracle-jre9/pkg-message b/java/linux-oracle-jre9/pkg-message
index 3fb23658a588..84187435394f 100644
--- a/java/linux-oracle-jre9/pkg-message
+++ b/java/linux-oracle-jre9/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JRE may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/linux-oracle-serverjre10/pkg-message b/java/linux-oracle-serverjre10/pkg-message
index 3fb23658a588..84187435394f 100644
--- a/java/linux-oracle-serverjre10/pkg-message
+++ b/java/linux-oracle-serverjre10/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Warning: This JRE may be unstable. You are advised to use the native
 FreeBSD JDK 8, in ports/java/openjdk8.
 
@@ -15,5 +16,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/java/openjdk11/pkg-message b/java/openjdk11/pkg-message
index a651593720d1..2ea3d87d89c8 100644
--- a/java/openjdk11/pkg-message
+++ b/java/openjdk11/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
 procfs(5) mounted on /proc.
 
@@ -12,5 +13,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/openjdk12/pkg-message b/java/openjdk12/pkg-message
index a651593720d1..2ea3d87d89c8 100644
--- a/java/openjdk12/pkg-message
+++ b/java/openjdk12/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
 procfs(5) mounted on /proc.
 
@@ -12,5 +13,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/openjdk6/pkg-message b/java/openjdk6/pkg-message
index a651593720d1..2ea3d87d89c8 100644
--- a/java/openjdk6/pkg-message
+++ b/java/openjdk6/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
 procfs(5) mounted on /proc.
 
@@ -12,5 +13,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/openjdk7/pkg-message b/java/openjdk7/pkg-message
index 9abb673c0b22..22b7b0145629 100644
--- a/java/openjdk7/pkg-message
+++ b/java/openjdk7/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
 procfs(5) mounted on /proc for some functionality.
 
@@ -12,5 +13,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/openjdk8/pkg-message b/java/openjdk8/pkg-message
index a651593720d1..2ea3d87d89c8 100644
--- a/java/openjdk8/pkg-message
+++ b/java/openjdk8/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
 procfs(5) mounted on /proc.
 
@@ -12,5 +13,6 @@ To make it permanent, you need the following lines in /etc/fstab:
 
 	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/java/phpeclipse/pkg-message b/java/phpeclipse/pkg-message
index 20de8b93fe47..ed6ad2dae985 100644
--- a/java/phpeclipse/pkg-message
+++ b/java/phpeclipse/pkg-message
@@ -1,6 +1,10 @@
-------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 If you are experiencing problems while saving files or opening HTML files
 please select
 "Window->Preferences->PHPeclipse Web Development->Browser Preview Defaults"
 and uncheck all checkboxes.
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/java/servingxml/pkg-message b/java/servingxml/pkg-message
index 7ab73d416ed8..a159fbc900be 100644
--- a/java/servingxml/pkg-message
+++ b/java/servingxml/pkg-message
@@ -1,10 +1,10 @@
-
-
-	*********************************************************
-	*        		USAGE				*
-	*********************************************************
-
+[
+{ type: install
+  message: <<EOM
 For using servingxml, you need to specify environnemnt variables :
 SERVINGXML_HOME={PREFIX}/share/java/servingxml
 PATH=$PATH:$SERVINGXML_HOME
 Any third party JAR must be added to CLASSPATH
+EOM
+}
+]
diff --git a/java/sqlitejdbc/pkg-message b/java/sqlitejdbc/pkg-message
index eecb4d63f0e1..8f4a700dd85a 100644
--- a/java/sqlitejdbc/pkg-message
+++ b/java/sqlitejdbc/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Warning: you need a sqlite3 port compiled with SQLITE_ENABLE_COLUMN_METADATA
 in order to use the following methods:
   String ResultSetMetaData.getCatalogName(int column)
   String ResultSetMetaData.getTableName(int column)
 any attemp to use them will close the JVM with an error of:
   Undefined symbol "sqlite3_column_table_name16"
+EOM
+}
+]
diff --git a/java/wildfly10/files/pkg-message.in b/java/wildfly10/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly10/files/pkg-message.in
+++ b/java/wildfly10/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly11/files/pkg-message.in b/java/wildfly11/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly11/files/pkg-message.in
+++ b/java/wildfly11/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly12/files/pkg-message.in b/java/wildfly12/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly12/files/pkg-message.in
+++ b/java/wildfly12/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly13/files/pkg-message.in b/java/wildfly13/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly13/files/pkg-message.in
+++ b/java/wildfly13/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly14/files/pkg-message.in b/java/wildfly14/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly14/files/pkg-message.in
+++ b/java/wildfly14/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly15/files/pkg-message.in b/java/wildfly15/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly15/files/pkg-message.in
+++ b/java/wildfly15/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly16/files/pkg-message.in b/java/wildfly16/files/pkg-message.in
index b23e35afe9b5..278924a8c27c 100644
--- a/java/wildfly16/files/pkg-message.in
+++ b/java/wildfly16/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 %%APP_SHORTNAME%%_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/java/wildfly90/files/pkg-message.in b/java/wildfly90/files/pkg-message.in
index 7f967c36ba6d..7e0548e7faf4 100644
--- a/java/wildfly90/files/pkg-message.in
+++ b/java/wildfly90/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To make WildFly bind to all interfaces add this to rc.conf:
 
 wildfly90_args="-Djboss.bind.address=0.0.0.0"
@@ -13,3 +16,6 @@ To change JVM args, edit appropriate standalone.conf.
 To add the initial admin user:
 
 %%APP_HOME%%/bin/add-user.sh
+EOM
+}
+]
diff --git a/korean/hanyangfonts/files/pkg-message.in b/korean/hanyangfonts/files/pkg-message.in
index 7305b3da4216..a935c579f55b 100644
--- a/korean/hanyangfonts/files/pkg-message.in
+++ b/korean/hanyangfonts/files/pkg-message.in
@@ -1,8 +1,6 @@
-Hanyang Font(KSC5601)
-=====================
-
-Please note:
-
+[
+{ type: install
+  message: <<EOM
  This package installed fonts in %%FONTSDIR%% directory.
  If you are using XFree86 3.3.2 or older, please upgrade to a new version
  or add this directory to your /etc/XF86Config:
@@ -18,3 +16,6 @@ Please note:
 
  Don't forget to add the directory to your /etc/XF86Config, for
  add the correct font path after you reboots X.
+EOM
+}
+]
diff --git a/korean/hpscat/files/pkg-message.in b/korean/hpscat/files/pkg-message.in
index 45dc62841a0d..d3d0d1516ddc 100644
--- a/korean/hpscat/files/pkg-message.in
+++ b/korean/hpscat/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To use hpscat with font loading in gs, use hpscat.sh instead.
 Otherwise, you must setup ghostscript to load font first.
 Read %%FONTDIR%%/README.jshin(.ks)
+EOM
+}
+]
diff --git a/korean/ibus-hangul/pkg-message b/korean/ibus-hangul/pkg-message
index 200c09752546..ff5e6e7c3c26 100644
--- a/korean/ibus-hangul/pkg-message
+++ b/korean/ibus-hangul/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ibus-hangul installation finished. To use ibus-hangul, please do the following:
 
 If you are using bash or zsh, please add following lines to your $HOME/.bashrc or
@@ -29,3 +32,6 @@ export QT_IM_MODULE=xim
 export XMODIFIERS=@im=ibus
 export XIM_PROGRAM="ibus-daemon"
 export XIM_ARGS="-r --daemonize --xim"
+EOM
+}
+]
diff --git a/korean/kaistfonts/files/pkg-message.in b/korean/kaistfonts/files/pkg-message.in
index 1eb85526f929..a935c579f55b 100644
--- a/korean/kaistfonts/files/pkg-message.in
+++ b/korean/kaistfonts/files/pkg-message.in
@@ -1,8 +1,6 @@
-KAIST Font(KSC5601)
-===================
-
-Please note:
-
+[
+{ type: install
+  message: <<EOM
  This package installed fonts in %%FONTSDIR%% directory.
  If you are using XFree86 3.3.2 or older, please upgrade to a new version
  or add this directory to your /etc/XF86Config:
@@ -18,3 +16,6 @@ Please note:
 
  Don't forget to add the directory to your /etc/XF86Config, for
  add the correct font path after you reboots X.
+EOM
+}
+]
diff --git a/korean/scim-hangul/pkg-message b/korean/scim-hangul/pkg-message
index 9d263404a293..04af64129ed7 100644
--- a/korean/scim-hangul/pkg-message
+++ b/korean/scim-hangul/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 ko_KR.UTF-8
@@ -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/korean/scim-tables/pkg-message b/korean/scim-tables/pkg-message
index 633c2e665440..33e71808ad37 100644
--- a/korean/scim-tables/pkg-message
+++ b/korean/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/korean/sourcehansans-otf/files/pkg-message.in b/korean/sourcehansans-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/korean/sourcehansans-otf/files/pkg-message.in
+++ b/korean/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/korean/sourcehanserif-otf/files/pkg-message.in b/korean/sourcehanserif-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/korean/sourcehanserif-otf/files/pkg-message.in
+++ b/korean/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/korean/spoqahansans-ttf/files/pkg-message.in b/korean/spoqahansans-ttf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/korean/spoqahansans-ttf/files/pkg-message.in
+++ b/korean/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
+}
+]