From 153fb8d6f62207ff017855dafedd01ce3b7b3482 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 14 Aug 2019 12:16:41 +0000
Subject: [PATCH] Convert to UCL & cleanup pkg-message (categories [t-u])

---
 textproc/apache-solr/files/pkg-message.in       | 17 ++++++++++-------
 textproc/codespell/files/pkg-message.in         | 10 ++++++----
 textproc/crimson/files/pkg-message.in           |  6 ++++++
 textproc/dictionary/pkg-message                 |  6 ++++++
 textproc/diff-so-fancy/files/pkg-message.in     |  6 ++++++
 textproc/dsssl-docbook-modular/pkg-message      |  6 ++++++
 .../elasticsearch5-search-guard/pkg-message     |  8 ++++++--
 textproc/elasticsearch5/files/pkg-message.in    | 10 ++++++----
 textproc/elasticsearch6/files/pkg-message.in    | 10 ++++++----
 textproc/extract_url/files/pkg-message.in       | 10 ++++++----
 textproc/fzf/files/pkg-message.in               |  7 ++++++-
 textproc/hevea/pkg-message                      |  8 ++++++--
 textproc/htmlize.el/pkg-message                 |  9 ++++++---
 textproc/ibus-typing-booster/pkg-message        |  7 ++++++-
 textproc/ibus/pkg-message                       |  8 ++++++--
 .../kmfl-european-latin/files/pkg-message.in    |  8 ++++++--
 textproc/kmfl-sil-ezra/files/pkg-message.in     |  8 ++++++--
 textproc/kmfl-sil-galatia/files/pkg-message.in  |  8 ++++++--
 .../kmfl-sil-ipa-unicode/files/pkg-message.in   |  8 ++++++--
 .../files/pkg-message.in                        |  8 ++++++--
 textproc/kmfl-sil-yi/files/pkg-message.in       |  8 ++++++--
 .../files/pkg-message.in                        |  8 ++++++--
 textproc/kmflcomp/files/pkg-message.in          |  9 ++++++---
 textproc/latex2html/files/pkg-message.in        |  6 ++++++
 textproc/markdown-mode.el/pkg-message           | 10 ++++++----
 textproc/mifluz/files/pkg-message.in            | 10 ++++++----
 textproc/ml1/pkg-message                        |  6 ++++++
 textproc/py-gensim/pkg-message                  |  6 ++++++
 textproc/py-mkdocs/pkg-message                  |  6 ++++++
 textproc/py-tablib/files/pkg-message.in         | 10 ++++++----
 textproc/qstardict/pkg-message                  |  8 ++++++--
 textproc/resume/files/pkg-message.in            | 10 ++++++----
 textproc/ruby-rd-mode.el/pkg-message            |  8 ++++++--
 textproc/ruby-rdtool/pkg-message                |  8 ++++++--
 textproc/rubygem-rdtool/pkg-message             |  8 ++++++--
 textproc/scim-input-pad/pkg-message             |  8 ++++++--
 .../scim-kmfl-imengine/files/pkg-message.in     |  9 ++++++---
 textproc/scim-table-imengine/pkg-message        |  8 ++++++--
 textproc/scim/pkg-message                       |  8 ++++++--
 textproc/sdcv/files/pkg-message.in              |  9 ++++++---
 textproc/sgmlformat/pkg-message                 |  8 ++++++--
 textproc/stardict3/pkg-message                  |  8 ++++++--
 textproc/tth/pkg-message                        |  8 ++++++--
 textproc/unoconv/files/pkg-message.in           | 10 ++++++----
 textproc/wordnet/files/pkg-message.in           |  8 ++++++--
 textproc/wv/pkg-message                         | 10 ++++++----
 textproc/xml-lite.el/pkg-message                |  6 ++++++
 textproc/xml2rfc/pkg-message                    |  7 ++++++-
 textproc/xmlcatmgr/files/pkg-message.in         |  6 ++++++
 textproc/xmlto/files/pkg-message.in             |  6 ++++++
 textproc/xslide.el/pkg-message                  |  8 ++++++--
 textproc/yaml-mode.el/pkg-message               |  9 ++++++---
 ukrainian/emacs-koi8u/pkg-message               |  8 ++++++--
 ukrainian/monacofonts/pkg-message               |  8 ++++++--
 54 files changed, 328 insertions(+), 113 deletions(-)

diff --git a/textproc/apache-solr/files/pkg-message.in b/textproc/apache-solr/files/pkg-message.in
index a51b37b6ba68..e59155b84ff4 100644
--- a/textproc/apache-solr/files/pkg-message.in
+++ b/textproc/apache-solr/files/pkg-message.in
@@ -1,5 +1,6 @@
-=======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Make sure to edit the following files to adapt to your setup:
 
 %%LOCALBASE%%/etc/solr.in.sh
@@ -26,9 +27,10 @@ sysrc solr_enable="YES"
 
 And start it with:
 service solr start
-
------------------------------------------------------------------------
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 If you update, make sure you update your %%LOCALBASE%%/etc/solr.in.sh
 The LOG4J_PROPS has changed.
 If you would like to change logging, copy:
@@ -38,5 +40,6 @@ Change it and make sure it is loaded in %%LOCALBASE%%/etc/solr.in.sh.
 Make also sure to always check the manual if you need to modify your
 configs or schemas:
 https://www-eu.apache.org/dist/lucene/solr/8.0.0/changes/Changes.html
-
-=======================================================================
+EOM
+}
+]
diff --git a/textproc/codespell/files/pkg-message.in b/textproc/codespell/files/pkg-message.in
index ed2513f20f20..696e2bd056dc 100644
--- a/textproc/codespell/files/pkg-message.in
+++ b/textproc/codespell/files/pkg-message.in
@@ -1,7 +1,9 @@
-***************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You have successfully installed codespell!
 The dictionary file has been installed to:
 %%EXAMPLESDIR%%/data/dictionary.txt
-
-***************************************************************
+EOM
+}
+]
diff --git a/textproc/crimson/files/pkg-message.in b/textproc/crimson/files/pkg-message.in
index 4131d3ad2fb2..9293842d19c8 100644
--- a/textproc/crimson/files/pkg-message.in
+++ b/textproc/crimson/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The following jar file has been installed:
 
   %%PREFIX%%/share/java/classes/crimson.jar
@@ -11,3 +14,6 @@ NOTE:
 
 Documentation is in %%PREFIX%%/share/doc/crimson
 Examples is in %%PREFIX%%/share/examples/crimson
+EOM
+}
+]
diff --git a/textproc/dictionary/pkg-message b/textproc/dictionary/pkg-message
index 46b61df13787..ec9a4cfdfc35 100644
--- a/textproc/dictionary/pkg-message
+++ b/textproc/dictionary/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To use dictionary, add to your ~/.emacs the following line:
 
 (load "dictionary-init")
+EOM
+}
+]
diff --git a/textproc/diff-so-fancy/files/pkg-message.in b/textproc/diff-so-fancy/files/pkg-message.in
index ac819dca5045..ef6268a5e08f 100644
--- a/textproc/diff-so-fancy/files/pkg-message.in
+++ b/textproc/diff-so-fancy/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 diff-so-fancy is normally used to format git's diff output.
 
 In order to configure git to use diff-so-fancy automatically, you can run:
     $ git config --global core.pager "diff-so-fancy | less -R"
 
 See %%DOCSDIR%%/readme.md for more information.
+EOM
+}
+]
diff --git a/textproc/dsssl-docbook-modular/pkg-message b/textproc/dsssl-docbook-modular/pkg-message
index 022eb0321529..92a6f3581e15 100644
--- a/textproc/dsssl-docbook-modular/pkg-message
+++ b/textproc/dsssl-docbook-modular/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 These are DSSSL stylesheets for the DocBook DTD by Norm Walsh. Use them
 in conjunction with a DSSSL processor (such as jade) to convert documents
 marked up as DocBook to other formats.
@@ -14,3 +17,6 @@ To further parse the output of the 'tex' transformation you will need the
 More documentation (in HTML format) is available in
 
    $PREFIX/share/sgml/docbook/dsssl/modular/doc/
+EOM
+}
+]
diff --git a/textproc/elasticsearch5-search-guard/pkg-message b/textproc/elasticsearch5-search-guard/pkg-message
index 5d07ec00b3c1..aa85d98e7e59 100644
--- a/textproc/elasticsearch5-search-guard/pkg-message
+++ b/textproc/elasticsearch5-search-guard/pkg-message
@@ -1,4 +1,6 @@
--------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 cd into %%PREFIX%%/lib/elasticsearch/plugins/search-guard-5/tools/
 
 Execute ./install_demo_configuration.sh, chmod the script first if necessary. 
@@ -18,4 +20,6 @@ to the cluster.
 
 Display information about the currently logged in user by visiting
  https://localhost:9200/_searchguard/authinfo
--------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/elasticsearch5/files/pkg-message.in b/textproc/elasticsearch5/files/pkg-message.in
index f94be9023f6a..fd3820bc23c0 100644
--- a/textproc/elasticsearch5/files/pkg-message.in
+++ b/textproc/elasticsearch5/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Please see %%ETCDIR%% for sample versions of
 elasticsearch.yml and logging.yml.
 
@@ -20,5 +21,6 @@ bootstrap.system_call_filter: false
 
 in your elasticsearch.yml file to successfully bootstrap on non-Linux
 OSes now.
-
-======================================================================
+EOM
+}
+]
diff --git a/textproc/elasticsearch6/files/pkg-message.in b/textproc/elasticsearch6/files/pkg-message.in
index 4cba88e90f3f..e62bba0a7faf 100644
--- a/textproc/elasticsearch6/files/pkg-message.in
+++ b/textproc/elasticsearch6/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Please see %%ETCDIR%% for sample versions of
 elasticsearch.yml and logging.yml.
 
@@ -28,5 +29,6 @@ e.g., after installing X-Pack you will have to correct:
 %%ETCDIR%%/x-pack directory/files to be owned by elasticsearch:elasticsearch
 
 !!! PLUGINS NOTICE !!!
-
-======================================================================
+EOM
+}
+]
diff --git a/textproc/extract_url/files/pkg-message.in b/textproc/extract_url/files/pkg-message.in
index 72eb7f882f13..194e30aabad9 100644
--- a/textproc/extract_url/files/pkg-message.in
+++ b/textproc/extract_url/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 extract_url has been installed.
 
 If you don't have ~/.extract_urlview
@@ -11,5 +12,6 @@ the extract_url configuration file can be copied, please type as user:
     cp %%DATADIR%%/extract_urlview.sample ~/.extract_urlview
 
     exit
-
-===============================================================================
+EOM
+}
+]
diff --git a/textproc/fzf/files/pkg-message.in b/textproc/fzf/files/pkg-message.in
index 8ecef4613f2e..8d59872650f1 100644
--- a/textproc/fzf/files/pkg-message.in
+++ b/textproc/fzf/files/pkg-message.in
@@ -1,5 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Various shell key bindings and completion files have been installed
 to %%EXAMPLESDIR%%/shell.
 
 To use these include them in your shell configuration.
-
+EOM
+}
+]
diff --git a/textproc/hevea/pkg-message b/textproc/hevea/pkg-message
index f06feafd81df..3de9fc36ba46 100644
--- a/textproc/hevea/pkg-message
+++ b/textproc/hevea/pkg-message
@@ -1,4 +1,6 @@
-==============================================================
+[
+{ type: install
+  message: <<EOM
 You may like to put the file hevea.sty in a place where latex
 can find it.  For example, if you are using teTeX from the
 ports, the following commands will do the job:
@@ -6,4 +8,6 @@ ports, the following commands will do the job:
 mkdir -p /usr/local/share/texmf/tex/latex/hevea
 cp /usr/local/lib/hevea/hevea.sty /usr/local/share/texmf/tex/latex/hevea
 texhash
-==============================================================
+EOM
+}
+]
diff --git a/textproc/htmlize.el/pkg-message b/textproc/htmlize.el/pkg-message
index b9a3c8065311..3b601dc133ef 100644
--- a/textproc/htmlize.el/pkg-message
+++ b/textproc/htmlize.el/pkg-message
@@ -1,4 +1,6 @@
-****************************************************************************
+[
+{ type: install
+  message: <<EOM
 To use htmlize mode, add to your ~/.emacs the following lines:
 
 ;; Enable syntax colouring
@@ -6,5 +8,6 @@ To use htmlize mode, add to your ~/.emacs the following lines:
 
 ;; General emacs to HTML converter
 (require 'htmlize)
-
-****************************************************************************
+EOM
+}
+]
diff --git a/textproc/ibus-typing-booster/pkg-message b/textproc/ibus-typing-booster/pkg-message
index d2cc34a145ba..25c4aebdacc3 100644
--- a/textproc/ibus-typing-booster/pkg-message
+++ b/textproc/ibus-typing-booster/pkg-message
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 It is recommanded to install a font with emoji, e.g. x11-fonts/twemoji-color-font-ttf .
 
 And do not forget to run `ibus restart' after an upgrade.
+EOM
+}
+]
diff --git a/textproc/ibus/pkg-message b/textproc/ibus/pkg-message
index f45ca826db7f..225bc3adb7e9 100644
--- a/textproc/ibus/pkg-message
+++ b/textproc/ibus/pkg-message
@@ -1,4 +1,6 @@
--------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ibus installation finished. To use ibus, please do the following:
 
 If you are using bash, please add following lines to your $HOME/.bashrc:
@@ -48,4 +50,6 @@ and QT4 input method module, textproc/ibus-qt.
 
 If ibus cannot start or the panel does not appear, please ensure
 that you are using up-to-date python.
--------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-european-latin/files/pkg-message.in b/textproc/kmfl-european-latin/files/pkg-message.in
index 3f3df9cf6359..638840f4edcb 100644
--- a/textproc/kmfl-european-latin/files/pkg-message.in
+++ b/textproc/kmfl-european-latin/files/pkg-message.in
@@ -1,8 +1,12 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Others" in your SCIM/IBus menu. If you don't see it,
   restart X.
 
   The documentation is installed into:
   %%DOCSDIR%%
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-sil-ezra/files/pkg-message.in b/textproc/kmfl-sil-ezra/files/pkg-message.in
index 2a0d872b6197..ce6be22cf8b6 100644
--- a/textproc/kmfl-sil-ezra/files/pkg-message.in
+++ b/textproc/kmfl-sil-ezra/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Hebrew" in your SCIM/IBus menu. If you don't see it,
   restart X.
@@ -8,4 +10,6 @@
   Please note that some documentation files are
   officially released in proprietary formats only and
   that they are installed as such.
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-sil-galatia/files/pkg-message.in b/textproc/kmfl-sil-galatia/files/pkg-message.in
index c762f5a60dc2..17d1c4206902 100644
--- a/textproc/kmfl-sil-galatia/files/pkg-message.in
+++ b/textproc/kmfl-sil-galatia/files/pkg-message.in
@@ -1,8 +1,12 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Greek" in your SCIM/IBus menu. If you don't see it,
   restart X.
 
   The documentation is installed into:
   %%DOCSDIR%%
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
index a6d28997190f..3d7a0c40be15 100644
--- a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
+++ b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
@@ -1,8 +1,12 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Others" in your SCIM/IBus menu. If you don't see it,
   restart X.
 
   The documentation is installed into:
   %%LOCALBASE%%/%%DOCSDIR%%
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in b/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in
index a6d28997190f..3d7a0c40be15 100644
--- a/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in
+++ b/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in
@@ -1,8 +1,12 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Others" in your SCIM/IBus menu. If you don't see it,
   restart X.
 
   The documentation is installed into:
   %%LOCALBASE%%/%%DOCSDIR%%
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-sil-yi/files/pkg-message.in b/textproc/kmfl-sil-yi/files/pkg-message.in
index b15ad97ea22d..595224dcc214 100644
--- a/textproc/kmfl-sil-yi/files/pkg-message.in
+++ b/textproc/kmfl-sil-yi/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Others" in your SCIM/IBus menu. If you don't see it,
   restart X.
@@ -7,4 +9,6 @@
   As a general rule, type the Pinyin romanization for
   that syllable, followed by a space. For punctuation,
   try usual punctuation keystrokes.
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmfl-varamozhi-malayalam/files/pkg-message.in b/textproc/kmfl-varamozhi-malayalam/files/pkg-message.in
index 967684f2bda8..6da8d82abd46 100644
--- a/textproc/kmfl-varamozhi-malayalam/files/pkg-message.in
+++ b/textproc/kmfl-varamozhi-malayalam/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   You should now have the new keyboard in the section
   "Malayalam" in your SCIM/IBus menu. If you don't see
   it, restart X.
@@ -7,4 +9,6 @@
   documentation. For the details on the Mozhi scheme,
   please see the Project's homepage, especially
   https://sites.google.com/site/cibu/mozhi.
----------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/kmflcomp/files/pkg-message.in b/textproc/kmflcomp/files/pkg-message.in
index 915a6f1c9358..0c816e965d17 100644
--- a/textproc/kmflcomp/files/pkg-message.in
+++ b/textproc/kmflcomp/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   Please note that kmflcomp only compiles keyboard sources written in
   Keyman keyboard language (.kmn) into .kmfl binaries. KMFL is source
   compatible with keyboards developed for Keyman. Binary keyboards
@@ -17,4 +18,6 @@
   You need textproc/scim-kmfl-imengine to use KMFL keyboards through
   SCIM, or textproc/ibus-kmfl to use them through IBus. The keyboard
   ports are textproc/kmfl-*.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/latex2html/files/pkg-message.in b/textproc/latex2html/files/pkg-message.in
index 4d679074b550..ead2466652f6 100644
--- a/textproc/latex2html/files/pkg-message.in
+++ b/textproc/latex2html/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 ****  Individual user configurations can be accomplished by placing a copy
       of %%DATADIR%%/dot.latex2html-init in the user's home
       directory and editing to preference.
+EOM
+}
+]
diff --git a/textproc/markdown-mode.el/pkg-message b/textproc/markdown-mode.el/pkg-message
index a8330d28466f..c8314e404226 100644
--- a/textproc/markdown-mode.el/pkg-message
+++ b/textproc/markdown-mode.el/pkg-message
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use markdown-mode in Emacs/XEmacs, add the following lines to
 your ~/.emacs replacing "text" with your preferred markdown extension.
 
@@ -8,5 +9,6 @@ your ~/.emacs replacing "text" with your preferred markdown extension.
 
 (setq auto-mode-alist
   (cons '("\\.text" . markdown-mode) auto-mode-alist))
-
-========================================================================
+EOM
+}
+]
diff --git a/textproc/mifluz/files/pkg-message.in b/textproc/mifluz/files/pkg-message.in
index f6e8ef618314..e1a4534d3169 100644
--- a/textproc/mifluz/files/pkg-message.in
+++ b/textproc/mifluz/files/pkg-message.in
@@ -1,9 +1,11 @@
-
-*************************************************************
+[
+{ type: install
+  message: <<EOM
 A sample configuration file has been written in
 %%PREFIX%%/etc/mifluz.conf.sample
 
 You will have to copy this file to %%PREFIX%%/etc/mifluz.conf
 and edit it before using mifluz.
-*************************************************************
-
+EOM
+}
+]
diff --git a/textproc/ml1/pkg-message b/textproc/ml1/pkg-message
index 19931dbebdaf..c25a2cc6c2ca 100644
--- a/textproc/ml1/pkg-message
+++ b/textproc/ml1/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Additional ML/I documentation (in HTML and PDF) can be found at:
 	http://www.ml1.org.uk
+EOM
+}
+]
diff --git a/textproc/py-gensim/pkg-message b/textproc/py-gensim/pkg-message
index 811be242c950..cdcbf37b7ff8 100644
--- a/textproc/py-gensim/pkg-message
+++ b/textproc/py-gensim/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 If you are using the Python v3.x version and a non-Unicode locale you'll get a runtime error when mkdocs is executed..
 
 In that case please set the locale to a Unicode locale first, e.g. en_US.UTF-8 or similar, before starting mkdocs.
+EOM
+}
+]
diff --git a/textproc/py-mkdocs/pkg-message b/textproc/py-mkdocs/pkg-message
index 811be242c950..cdcbf37b7ff8 100644
--- a/textproc/py-mkdocs/pkg-message
+++ b/textproc/py-mkdocs/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 If you are using the Python v3.x version and a non-Unicode locale you'll get a runtime error when mkdocs is executed..
 
 In that case please set the locale to a Unicode locale first, e.g. en_US.UTF-8 or similar, before starting mkdocs.
+EOM
+}
+]
diff --git a/textproc/py-tablib/files/pkg-message.in b/textproc/py-tablib/files/pkg-message.in
index 0b925f304740..1dfe710c2ebd 100644
--- a/textproc/py-tablib/files/pkg-message.in
+++ b/textproc/py-tablib/files/pkg-message.in
@@ -1,6 +1,8 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Install %%PYTHON_PKGNAMEPREFIX%%pandas (Ports directory: math/py-pandas) if you want to make use
 of the Pandas Dataframe structure.
-
-===============================================================================
+EOM
+}
+]
diff --git a/textproc/qstardict/pkg-message b/textproc/qstardict/pkg-message
index 01736059ac16..ab9660550deb 100644
--- a/textproc/qstardict/pkg-message
+++ b/textproc/qstardict/pkg-message
@@ -1,4 +1,6 @@
-=======================================================================
+[
+{ type: install
+  message: <<EOM
 QStarDict can support for StarDict dictionaries.
 You can install some dictionaries for StarDict(QStarDict):
 
@@ -7,4 +9,6 @@ You can install some dictionaries for StarDict(QStarDict):
  japanese/stardict2-dict-ja     Japanese - English
  textproc/stardict2-dictd_mova	Dictionaries from www.mova.org
  textproc/stardict2-quick	Dictionaries from Quick for StarDict
-=======================================================================
+EOM
+}
+]
diff --git a/textproc/resume/files/pkg-message.in b/textproc/resume/files/pkg-message.in
index c2b880350108..2a79ecaa4ffc 100644
--- a/textproc/resume/files/pkg-message.in
+++ b/textproc/resume/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 For the impatient: You can get a result just in two steps!
 
 1. Install textproc/libxslt.
@@ -8,5 +9,6 @@ For the impatient: You can get a result just in two steps!
 
     $ xsltproc %%PREFIX%%/share/xsl/resume/output/us-html.xsl \
                %%PREFIX%%/share/examples/resume/example1.xml
-
-************************************************************************
+EOM
+}
+]
diff --git a/textproc/ruby-rd-mode.el/pkg-message b/textproc/ruby-rd-mode.el/pkg-message
index 8ea99948d54a..f5066bce14e3 100644
--- a/textproc/ruby-rd-mode.el/pkg-message
+++ b/textproc/ruby-rd-mode.el/pkg-message
@@ -1,8 +1,12 @@
-====
+[
+{ type: install
+  message: <<EOM
 To use rd-mode in Emacs/XEmacs, add the following lines to
 your ~/.emacs:
 
 (autoload 'rd-mode "rd-mode"
   "major mode for ruby document formatter RD" t)
 (add-to-list 'auto-mode-alist '("\\.rd\\(\.en\\|\.ja\\)?$" . rd-mode))
-====
+EOM
+}
+]
diff --git a/textproc/ruby-rdtool/pkg-message b/textproc/ruby-rdtool/pkg-message
index 1157aa63fb73..81706fc987f6 100644
--- a/textproc/ruby-rdtool/pkg-message
+++ b/textproc/ruby-rdtool/pkg-message
@@ -1,4 +1,8 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 If you are an Emacs/XEmacs user, also install
 textproc/ruby-rd-mode.el that helps you edit RD files.
-************************************************************
+EOM
+}
+]
diff --git a/textproc/rubygem-rdtool/pkg-message b/textproc/rubygem-rdtool/pkg-message
index 1157aa63fb73..81706fc987f6 100644
--- a/textproc/rubygem-rdtool/pkg-message
+++ b/textproc/rubygem-rdtool/pkg-message
@@ -1,4 +1,8 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 If you are an Emacs/XEmacs user, also install
 textproc/ruby-rd-mode.el that helps you edit RD files.
-************************************************************
+EOM
+}
+]
diff --git a/textproc/scim-input-pad/pkg-message b/textproc/scim-input-pad/pkg-message
index e9200c8002e6..5d82e037d870 100644
--- a/textproc/scim-input-pad/pkg-message
+++ b/textproc/scim-input-pad/pkg-message
@@ -1,5 +1,9 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 1) Remember to set environment variable XMODIFIERS with scim
 2) use ``scim-input-pad'' command or right click on the SCIM
    and choose ``Input Pad'' to start scim-input-pad
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/scim-kmfl-imengine/files/pkg-message.in b/textproc/scim-kmfl-imengine/files/pkg-message.in
index 55f831120673..286d301556a6 100644
--- a/textproc/scim-kmfl-imengine/files/pkg-message.in
+++ b/textproc/scim-kmfl-imengine/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   SCIM-Setup IMEngine list should now have KMFL section.
 
   The documentation for KMN language and use of KMFL SCIM interface
@@ -9,4 +10,6 @@
 
   You need textproc/kmfl-* ports in order to use actual keyboards
   through SCIM.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/scim-table-imengine/pkg-message b/textproc/scim-table-imengine/pkg-message
index f436f16671d0..93892d6c0e57 100644
--- a/textproc/scim-table-imengine/pkg-message
+++ b/textproc/scim-table-imengine/pkg-message
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The installation of SCIM table-based im engine has finished. Please note this
 port is only an engine for table-based input methods and does not contain any
 actual input methods.
@@ -16,4 +18,6 @@ The following ports can utilize this table-based imengine:
 
 As a common rule, set XMODIFIERS to '@im=SCIM' and use `scim -d' to start the
 scim daemon.
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/scim/pkg-message b/textproc/scim/pkg-message
index c6b8acee3c74..5e92eba75f9d 100644
--- a/textproc/scim/pkg-message
+++ b/textproc/scim/pkg-message
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The installation of SCIM has finished. Please note this port is only a common
 framework for input methods and does not contain any actual input methods.
 
@@ -60,4 +62,6 @@ Additional SCIM-related projects
 
 As a common rule, set XMODIFIERS to '@im=SCIM' and use `scim -d' to start the
 scim daemon.
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/textproc/sdcv/files/pkg-message.in b/textproc/sdcv/files/pkg-message.in
index 5c0b9cda7659..a1936c9f82f5 100644
--- a/textproc/sdcv/files/pkg-message.in
+++ b/textproc/sdcv/files/pkg-message.in
@@ -1,4 +1,6 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 sdcv is now installed.
 you have to fetch the dictionaries to make it work correctly.
 
@@ -10,5 +12,6 @@ you have to fetch the dictionaries to make it work correctly.
 2. Please put your dictionary file at :
 
  	%%PREFIX%%/share/stardict/dic/
-
-**************************************************************************
+EOM
+}
+]
diff --git a/textproc/sgmlformat/pkg-message b/textproc/sgmlformat/pkg-message
index 4664334dd7d1..e7e674df4d76 100644
--- a/textproc/sgmlformat/pkg-message
+++ b/textproc/sgmlformat/pkg-message
@@ -1,4 +1,6 @@
-*****************************************************************
+[
+{ type: install
+  message: <<EOM
 To avoid any confusion with the versions of these tools that
 might already be installed in your system, after installing this
 package you may wish move or remove:
@@ -7,4 +9,6 @@ package you may wish move or remove:
 /usr/bin/sgmls
 /usr/bin/instant
 /usr/share/sgml/*  (all subdirectories)
-*****************************************************************
+EOM
+}
+]
diff --git a/textproc/stardict3/pkg-message b/textproc/stardict3/pkg-message
index 952e3c3cf695..2411d0735e3f 100644
--- a/textproc/stardict3/pkg-message
+++ b/textproc/stardict3/pkg-message
@@ -1,7 +1,11 @@
-=====================================================================
+[
+{ type: install
+  message: <<EOM
 A set of dictionary ports is available for StarDict:
  chinese/stardict-*
  japanese/stardict-dict-ja
  textproc/stardict-*
  russian/stardict-*
-=====================================================================
+EOM
+}
+]
diff --git a/textproc/tth/pkg-message b/textproc/tth/pkg-message
index 69cd9908a1e7..eed051d710b1 100644
--- a/textproc/tth/pkg-message
+++ b/textproc/tth/pkg-message
@@ -1,3 +1,7 @@
-=====================================================================
+[
+{ type: install
+  message: <<EOM
   Please read the license in %%PREFIX%%/share/doc/tth/license.txt.
-=====================================================================
+EOM
+}
+]
diff --git a/textproc/unoconv/files/pkg-message.in b/textproc/unoconv/files/pkg-message.in
index 35b29a6c1a47..0ae6c453c466 100644
--- a/textproc/unoconv/files/pkg-message.in
+++ b/textproc/unoconv/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Universal Office Converter (unoconv) has been installed.
 
 For Document conversions is needed that is LibreOffice or OpenOffice installed
@@ -7,5 +8,6 @@ For Document conversions is needed that is LibreOffice or OpenOffice installed
 editors/libreoffice
 
 editors/openoffice*
-
-===============================================================================
+EOM
+}
+]
diff --git a/textproc/wordnet/files/pkg-message.in b/textproc/wordnet/files/pkg-message.in
index 98b306160cce..6fb443dd8af5 100644
--- a/textproc/wordnet/files/pkg-message.in
+++ b/textproc/wordnet/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 	For the GUI word-browser ``wnb'' to function, Tk-%%TCL_VER%% must
 	be installed. This dependency is not automatic, because there
 	are plenty of uses for WordNet on servers without X11.
 
 	The command-line utility ``wn'', for example, requires only Tcl.
-
+EOM
+}
+]
diff --git a/textproc/wv/pkg-message b/textproc/wv/pkg-message
index 6d4e11a85780..821e347bd55d 100644
--- a/textproc/wv/pkg-message
+++ b/textproc/wv/pkg-message
@@ -1,8 +1,10 @@
-*******************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Some output formats (for example: DVI, PDF, and PS) require a LaTeX
 implementation, such as print/teTeX, to be installed. Text output
 will be of better quality if www/elinks, www/links, or www/lynx is
 installed.
-
-*******************************************************************
+EOM
+}
+]
diff --git a/textproc/xml-lite.el/pkg-message b/textproc/xml-lite.el/pkg-message
index 5e2c02ef3e8a..5bd6b971478a 100644
--- a/textproc/xml-lite.el/pkg-message
+++ b/textproc/xml-lite.el/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 To use xml-lite-mode, add to your ~/.emacs the following lines:
 
 (autoload 'xml-lite-mode "xml-lite" "XML-Lite mode" t)
 (add-to-list 'auto-mode-alist '("\\.xml\\'" . xml-lite-mode))
+EOM
+}
+]
diff --git a/textproc/xml2rfc/pkg-message b/textproc/xml2rfc/pkg-message
index 8540c5ee4d83..f6d6197ec1d2 100644
--- a/textproc/xml2rfc/pkg-message
+++ b/textproc/xml2rfc/pkg-message
@@ -1,3 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 	Have a look at http://xml.resource.org/ for how to get and
 	update bibliographic summaries of each RFC and Internet-Draft.
+EOM
+}
+]
diff --git a/textproc/xmlcatmgr/files/pkg-message.in b/textproc/xmlcatmgr/files/pkg-message.in
index 4e1913181848..926be8c6c6bc 100644
--- a/textproc/xmlcatmgr/files/pkg-message.in
+++ b/textproc/xmlcatmgr/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The following catalogs are installed:
 
  1) %%PREFIX%%/share/sgml/catalog
@@ -19,3 +22,6 @@ The following catalogs are installed:
 
    This catalog is for handling XML stuff installed under
    %%PREFIX%%/share/xml.  It is changed by ports/packages.
+EOM
+}
+]
diff --git a/textproc/xmlto/files/pkg-message.in b/textproc/xmlto/files/pkg-message.in
index 0969bf4dc1db..b9cf483046f0 100644
--- a/textproc/xmlto/files/pkg-message.in
+++ b/textproc/xmlto/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For benefits of conversions away from XHTML1 through XSL-FO,
 a stylesheet xhtml2fo.xsl has been installed
 into %%DATADIR%%. Example use:
@@ -7,3 +10,6 @@ into %%DATADIR%%. Example use:
 More style sheets for XHTML1 conversions can be found at
 <http://www.antennahouse.com/XSLsample/XSLsample.htm>
 under "Stylesheet for XHTML to XSL-FO transformation"
+EOM
+}
+]
diff --git a/textproc/xslide.el/pkg-message b/textproc/xslide.el/pkg-message
index eb57f2f00073..51146b672d8f 100644
--- a/textproc/xslide.el/pkg-message
+++ b/textproc/xslide.el/pkg-message
@@ -1,4 +1,6 @@
-****************************************************************************
+[
+{ type: install
+  message: <<EOM
 To use xsl-mode, add to your ~/.emacs the following lines:
 
 ;; XSL mode
@@ -17,4 +19,6 @@ To use xsl-mode, add to your ~/.emacs the following lines:
 
 ;; Uncomment if using abbreviations
 ;; (abbrev-mode t)
-****************************************************************************
+EOM
+}
+]
diff --git a/textproc/yaml-mode.el/pkg-message b/textproc/yaml-mode.el/pkg-message
index 11bd32399e87..330aa6a8e925 100644
--- a/textproc/yaml-mode.el/pkg-message
+++ b/textproc/yaml-mode.el/pkg-message
@@ -1,8 +1,11 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To use yaml-mode, you should add following lines to your .emacs file:
 
 (require 'yaml-mode)
 (add-to-list 'auto-mode-alist '("\\.yaml$" . yaml-mode))
 (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
-
-**********************************************************************
+EOM
+}
+]
diff --git a/ukrainian/emacs-koi8u/pkg-message b/ukrainian/emacs-koi8u/pkg-message
index cf4d5a552458..5e7ce5efb825 100644
--- a/ukrainian/emacs-koi8u/pkg-message
+++ b/ukrainian/emacs-koi8u/pkg-message
@@ -1,3 +1,7 @@
-*************************************************************
+[
+{ type: install
+  message: <<EOM
 Add (require 'ukr-koi8u) to you ~/.emacs or ~/.xemacs/init.el
-*************************************************************
+EOM
+}
+]
diff --git a/ukrainian/monacofonts/pkg-message b/ukrainian/monacofonts/pkg-message
index 70e2e8845af1..590941eac7e6 100644
--- a/ukrainian/monacofonts/pkg-message
+++ b/ukrainian/monacofonts/pkg-message
@@ -1,8 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 	For  your X-server  to use  the fonts,  you have  to add
 	the  ${LOCALBASE}/share/fonts/koi8-u-monaco (LOCALBASE  is,
 	usually, /usr/local)  to  the server's  font-path.  Use
 	``xset fp+'' ${LOCALBASE} to do this  for the current  X-session and
 	consult  your  X-server's  documentation  to  make  this
 	permanent.
-
+EOM
+}
+]