From 78d1aff1fc53a63e9c59c078ff2258a5dd29c9dd Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 13 Aug 2019 16:01:59 +0000
Subject: [PATCH] Convert to UCL & cleanup pkg-message (categories d)

---
 databases/adminer/files/pkg-message.in        |  6 +++
 databases/adodb/files/pkg-message.in          |  8 ++-
 databases/adodb5/files/pkg-message.in         |  6 +++
 databases/akonadi/pkg-message                 | 10 ++--
 databases/arangodb33/pkg-message              |  8 ++-
 .../files/pkg-message.in                      |  8 ++-
 databases/bbdb/pkg-message                    |  8 ++-
 databases/cassandra3/pkg-message              |  8 ++-
 databases/couchdb/files/pkg-message.in        |  6 +++
 databases/couchdb2/files/pkg-message.in       |  8 ++-
 .../firebird25-server/files/pkg-message.in    | 10 ++--
 databases/freetds-devel/files/pkg-message.in  |  6 +++
 databases/frontbase-jdbc/files/pkg-message.in |  8 ++-
 databases/galera/pkg-message                  | 10 ++--
 .../files/pkg-message.in                      | 11 ++--
 databases/gnats4/pkg-message                  | 10 ++--
 databases/grass7/pkg-message                  |  6 +++
 databases/hbase/files/pkg-message.in          | 12 +++--
 databases/iplike/files/pkg-message.in         | 16 ++++--
 databases/isql-viewer/pkg-message             |  8 ++-
 .../mariadb101-client/files/pkg-message.in    | 10 ++--
 .../mariadb101-server/files/pkg-message.in    | 10 ++--
 .../mariadb102-client/files/pkg-message.in    | 10 ++--
 .../mariadb102-server/files/pkg-message.in    | 29 +++++------
 .../mariadb103-client/files/pkg-message.in    | 10 ++--
 .../mariadb103-server/files/pkg-message.in    | 21 +++++---
 .../mariadb104-client/files/pkg-message.in    | 10 ++--
 .../mariadb104-server/files/pkg-message.in    | 21 +++++---
 .../mariadb55-client/files/pkg-message.in     | 10 ++--
 .../mariadb55-server/files/pkg-message.in     | 21 +++++---
 databases/mroonga/files/pkg-message.in        | 14 ++++--
 databases/mysql-udf/pkg-message               |  6 +++
 databases/mysql55-client/pkg-message          | 10 ++--
 databases/mysql55-server/pkg-message          | 10 ++--
 databases/mysql56-client/pkg-message          | 10 ++--
 databases/mysql56-server/pkg-message          | 23 +++++----
 databases/mysql57-client/pkg-message          | 10 ++--
 databases/mysql57-server/pkg-message          | 19 ++++---
 databases/mysql80-client/pkg-message          | 10 ++--
 databases/mysql80-server/pkg-message          | 19 ++++---
 databases/mysqlwsrep56-server/pkg-message     | 10 ++--
 databases/mysqlwsrep57-server/pkg-message     | 10 ++--
 databases/percona-pam-for-mysql/pkg-message   |  6 +++
 databases/percona55-client/pkg-message        | 11 ++--
 databases/percona55-server/pkg-message        | 10 ++--
 databases/percona56-client/pkg-message        | 11 ++--
 databases/percona56-server/pkg-message        | 10 ++--
 databases/percona57-pam-for-mysql/pkg-message |  6 +++
 databases/percona57-server/pkg-message        | 19 ++++---
 databases/pg_qualstats/pkg-message            |  6 +++
 databases/pg_stat_kcache/pkg-message          |  6 +++
 databases/pgbouncer/files/pkg-message.in      |  9 ++--
 databases/pgpool-II-35/pkg-message            |  6 +++
 databases/pgpool-II-36/pkg-message            |  6 +++
 databases/pgpool-II-37/pkg-message            |  6 +++
 databases/pgpool-II-40/pkg-message            |  6 +++
 databases/pgpool/pkg-message                  |  6 +++
 databases/pgroonga/files/pkg-message.in       | 27 +++++-----
 databases/pguri/pkg-message                   |  6 +++
 databases/phpliteadmin/files/pkg-message.in   |  7 ++-
 databases/phpmyadmin/files/pkg-message.in     |  7 ++-
 .../files/pkg-message.in                      | 11 ++--
 .../postgresql-jdbc/files/pkg-message.in      |  6 +++
 databases/postgresql-plv8js/pkg-message       |  6 +++
 databases/postgresql-relay/pkg-message        |  6 +++
 .../files/pkg-message-client.in               |  6 +++
 .../files/pkg-message-contrib.in              |  6 +++
 .../files/pkg-message-plperl.in               |  6 +++
 .../files/pkg-message-plpython.in             |  6 +++
 .../files/pkg-message-pltcl.in                |  6 +++
 .../files/pkg-message-server.in               |  7 ++-
 .../files/pkg-message-client.in               |  6 +++
 .../files/pkg-message-contrib.in              |  6 +++
 .../files/pkg-message-plperl.in               |  6 +++
 .../files/pkg-message-plpython.in             |  6 +++
 .../files/pkg-message-pltcl.in                |  6 +++
 .../files/pkg-message-server.in               |  7 ++-
 .../files/pkg-message-client.in               |  6 +++
 .../files/pkg-message-contrib.in              |  6 +++
 .../files/pkg-message-plperl.in               |  6 +++
 .../files/pkg-message-plpython.in             |  6 +++
 .../files/pkg-message-pltcl.in                |  6 +++
 .../files/pkg-message-server.in               |  7 ++-
 .../files/pkg-message-client.in               |  6 +++
 .../files/pkg-message-contrib.in              |  6 +++
 .../files/pkg-message-plperl.in               |  6 +++
 .../files/pkg-message-plpython.in             |  6 +++
 .../files/pkg-message-pltcl.in                |  6 +++
 .../files/pkg-message-server.in               |  7 ++-
 .../files/pkg-message-client.in               |  6 +++
 .../files/pkg-message-contrib.in              |  6 +++
 .../files/pkg-message-plperl.in               |  6 +++
 .../files/pkg-message-plpython.in             |  6 +++
 .../files/pkg-message-pltcl.in                |  6 +++
 .../files/pkg-message-server.in               |  7 ++-
 .../files/pkg-message-client.in               |  6 +++
 .../files/pkg-message-contrib.in              |  6 +++
 .../files/pkg-message-plperl.in               |  6 +++
 .../files/pkg-message-plpython.in             |  6 +++
 .../files/pkg-message-pltcl.in                |  6 +++
 .../files/pkg-message-server.in               |  7 ++-
 databases/powa-archivist/pkg-message          |  6 +++
 databases/puppetdb5/files/pkg-message.in      |  6 +++
 databases/puppetdb6/files/pkg-message.in      |  6 +++
 databases/py-htsql/pkg-message                | 16 +++---
 databases/qt5-sql/pkg-message                 | 10 ++--
 databases/redis-devel/files/pkg-message.in    |  9 ++--
 databases/redis/files/pkg-message.in          |  9 ++--
 databases/slony1v2/files/pkg-message.in       | 19 ++++---
 databases/soci/files/pkg-message.in           |  6 +++
 databases/sqldeveloper/pkg-message            |  9 ++--
 databases/sqlite-ext-miscfuncs/pkg-message    |  8 ++-
 databases/sqlite-ext-pcre/pkg-message         |  8 ++-
 databases/sqlite-ext-regexp/pkg-message       |  8 ++-
 databases/sqlite-ext-spellfix/pkg-message     |  8 ++-
 databases/squirrel-sql/pkg-message            |  6 +++
 databases/tarantool/files/pkg-message.in      | 10 ++--
 databases/timescaledb/files/pkg-message.in    |  6 +++
 databases/unixODBC/files/pkg-message.in       | 10 ++--
 databases/virtuoso/files/pkg-message.in       |  6 +++
 databases/wfb2sql/pkg-message                 |  9 ++--
 databases/zabbix22-libzbxpgsql/pkg-message    |  6 +++
 databases/zabbix3-libzbxpgsql/pkg-message     |  6 +++
 deskutils/anydesk/pkg-message                 |  6 +++
 deskutils/calibre/pkg-message                 | 10 ++--
 deskutils/conkyforecast/files/pkg-message.in  |  6 +++
 deskutils/egroupware/files/pkg-message.in     |  9 ++--
 deskutils/fasd/pkg-message                    |  6 +++
 .../pkg-message.slaves                        |  6 +++
 deskutils/goesimage/pkg-message               |  8 ++-
 deskutils/howm/pkg-message                    |  6 +++
 deskutils/jlj/files/pkg-message.in            | 10 ++--
 deskutils/kmail/pkg-message                   | 10 ++--
 deskutils/lumina-calculator/pkg-message       |  6 +++
 deskutils/moregroupware/pkg-message           |  7 ++-
 deskutils/myitcrm/files/pkg-message.in        | 10 ++--
 deskutils/parcellite/files/pkg-message.in     | 10 ++--
 deskutils/phpicalendar/files/pkg-message.in   |  6 +++
 deskutils/plans/files/pkg-message.in          |  8 ++-
 deskutils/py-autokey/pkg-message              |  9 ++--
 deskutils/py-khal/pkg-message                 | 10 ++--
 deskutils/py-khard/files/pkg-message.in       | 10 ++--
 deskutils/py-paperless/files/pkg-message.in   |  8 ++-
 deskutils/sugarcrm/files/pkg-message.in       | 10 ++--
 deskutils/taskd/pkg-message                   |  8 ++-
 deskutils/thinkingrock/files/pkg-message.in   | 10 ++--
 deskutils/tine20/files/pkg-message.in         |  7 ++-
 deskutils/xfce4-tumbler/files/pkg-message.in  |  6 +++
 devel/9base/pkg-message                       | 10 ++--
 devel/RStudio/pkg-message                     |  8 ++-
 devel/aegis/pkg-message                       | 10 ++--
 devel/allegro-devel/files/pkg-message.in      | 10 ++--
 .../files/pkg-message.in                      |  6 +++
 devel/apr1/pkg-message                        | 10 ++--
 devel/arduino/files/pkg-message.in            |  6 +++
 devel/aros-sdk/files/pkg-message.in           |  8 ++-
 devel/artifactory/files/pkg-message.in        | 16 +++---
 devel/awless/pkg-message                      | 10 ++--
 devel/boost-all/pkg-message.python            |  6 +++
 devel/boost-all/pkg-message.threads           |  6 +++
 devel/boost_build/files/pkg-message.in        |  6 +++
 devel/bugzilla44/files/pkg-message.in         | 15 ++++--
 devel/bugzilla50/files/pkg-message.in         | 15 ++++--
 devel/ccache/files/pkg-message.in             |  8 ++-
 devel/cdash/files/pkg-message.in              |  6 +++
 devel/cgit/files/pkg-message.in               |  8 ++-
 devel/chruby/files/pkg-message.in             | 10 ++--
 devel/cl-asdf/files/pkg-message.in            |  8 ++-
 devel/clojure-cider/pkg-message               |  7 ++-
 devel/colorgcc/files/pkg-message.in           |  8 ++-
 devel/cons/pkg-message                        |  6 +++
 devel/ctags/files/pkg-message.in              |  8 ++-
 devel/cutter/pkg-message                      |  8 ++-
 devel/cvsd/pkg-message                        |  8 ++-
 devel/cvsgraph/files/pkg-message.in           |  7 ++-
 devel/cvsmonitor/pkg-message                  |  8 ++-
 devel/cvstrac/pkg-message                     |  7 ++-
 devel/cvsweb/files/pkg-message.in             |  8 ++-
 devel/cvsweb3/files/pkg-message.in            |  8 ++-
 devel/cweb/pkg-message                        |  6 +++
 devel/distcc/files/pkg-message.in             |  6 +++
 devel/eiffelstudio/files/pkg-message.in       | 10 ++--
 devel/eric6/pkg-message                       |  6 +++
 devel/fam/files/pkg-message.in                | 10 ++--
 devel/fistgen/files/pkg-message.in            | 10 ++--
 devel/flyspray/files/pkg-message.in           | 10 ++--
 devel/gamin/pkg-message                       | 10 ++--
 devel/git-lfs/pkg-message                     |  6 +++
 devel/git-merge-changelog/pkg-message         |  9 ++--
 devel/git/files/pkg-message.in                | 15 +++---
 devel/git/pkg-message                         |  9 ++--
 devel/gitblit/files/pkg-message.in            | 10 ++--
 .../github-backup-utils/files/pkg-message.in  |  8 ++-
 devel/gitlab-runner/pkg-message               |  8 ++-
 devel/gitlist/files/pkg-message.in            |  6 +++
 devel/gitolite2/files/pkg-message.in          | 10 ++--
 devel/gitphp/files/pkg-message.in             |  8 ++-
 devel/gittrac/pkg-message                     |  7 ++-
 devel/gnustep/pkg-message                     |  6 +++
 devel/godot2-tools/pkg-message                |  8 ++-
 devel/gogland-eap/files/pkg-message.in        |  6 +++
 devel/gogs/files/pkg-message.in               |  8 ++-
 devel/hg-git/pkg-message                      | 10 ++--
 devel/ice/pkg-message                         |  6 +++
 devel/interactive_rebase_tool/pkg-message     |  6 +++
 devel/ioncube/files/pkg-message.in            |  6 +++
 devel/jenkins-lts/pkg-message                 | 10 ++--
 devel/jenkins/pkg-message                     | 10 ++--
 devel/jetbrains-clion/files/pkg-message.in    |  6 +++
 devel/jetbrains-goland/files/pkg-message.in   |  6 +++
 devel/jetbrains-phpstorm/files/pkg-message.in |  6 +++
 devel/jetbrains-webstorm/files/pkg-message.in |  6 +++
 devel/jline/files/pkg-message.in              |  8 ++-
 devel/kronosnet/pkg-message                   |  6 +++
 devel/libaravis/pkg-message                   |  6 +++
 devel/libburn/pkg-message                     |  6 +++
 devel/libdlmalloc/pkg-message                 |  6 +++
 devel/libgtop/files/pkg-message               | 10 ++--
 devel/libinotify/pkg-message                  | 10 ++--
 devel/liblognorm/files/pkg-message.in         | 15 +++---
 devel/libnxt/files/pkg-message.in             |  9 ++--
 devel/libopensync/pkg-message                 |  6 +++
 devel/libpasori/pkg-message                   |  8 ++-
 devel/libreadline-java/files/pkg-message.in   |  8 ++-
 devel/libsigsegv/pkg-message                  |  8 ++-
 devel/libvirt/files/pkg-message.in            |  7 ++-
 devel/linux-ltp/pkg-message                   |  7 ++-
 devel/magit/pkg-message                       |  9 ++--
 devel/mercurial/files/pkg-message.in          |  8 ++-
 devel/monotone/files/pkg-message.in           |  8 ++-
 devel/msp430-debug-stack/files/pkg-message.in | 10 ++--
 devel/nexus2-oss/files/pkg-message.in         |  8 ++-
 devel/oozie/files/pkg-message.in              |  7 ++-
 devel/opencl/pkg-message                      |  6 +++
 devel/openocd/pkg-message                     | 10 ++--
 devel/p5-Heap-Simple/pkg-message              | 11 ++--
 devel/p5-Moose/pkg-message                    |  6 +++
 devel/p5-ResourcePool/pkg-message             | 10 ++--
 devel/p5-SVN-Web/pkg-message                  |  6 +++
 devel/papi/pkg-message                        |  6 +++
 devel/pcsc-lite/files/pkg-message.in          | 10 ++--
 devel/pecl-xdebug/files/pkg-message.in        |  9 ++--
 devel/phabricator/files/pkg-message.in        |  6 +++
 devel/php-libawl/pkg-message                  | 11 ++--
 devel/phpbt/files/pkg-message.in              | 10 ++--
 devel/phpsh/pkg-message                       | 10 ++--
 devel/plasma/pkg-message                      | 11 ++--
 devel/pmdk/pkg-message                        |  6 +++
 devel/psvn/pkg-message                        |  6 +++
 devel/py-QtPy/pkg-message                     |  8 ++-
 devel/py-aspects/files/pkg-message.in         |  9 ++--
 devel/py-aspyct/pkg-message                   |  8 ++-
 devel/py-gitosis/pkg-message                  | 10 ++--
 devel/py-http-prompt/files/pkg-message.in     |  8 ++-
 devel/py-mercurialserver/files/pkg-message.in |  6 +++
 devel/py-os-brick/pkg-message                 |  6 +++
 devel/py-pip/pkg-message                      | 10 ++--
 devel/py-python-gitlab/files/pkg-message.in   |  6 +++
 devel/py-q/files/pkg-message.in               |  6 +++
 devel/py-setuptools/files/pkg-message.in      | 11 ++--
 devel/py-ua_parser/files/pkg-message.in       |  8 ++-
 devel/pycharm-ce/files/pkg-message.in         |  6 +++
 devel/pymacs/pkg-message                      |  6 +++
 devel/rbenv/pkg-message                       | 10 ++--
 devel/remotery/files/pkg-message.in           |  6 +++
 devel/rpm-spec-mode.el/pkg-message            | 11 ++--
 devel/rth/files/pkg-message.in                |  8 ++-
 devel/sdl12/pkg-message.linjoy                | 11 ++--
 devel/sdl12/pkg-message.vgl                   |  8 ++-
 devel/sonar-ant-task/files/pkg-message.in     | 10 ++--
 devel/sonar-scanner-cli/files/pkg-message.in  | 10 ++--
 devel/sonarqube/files/pkg-message.in          | 10 ++--
 devel/staf/pkg-message                        | 10 ++--
 devel/statcvs/files/pkg-message.in            |  8 ++-
 devel/statsvn/pkg-message                     |  6 +++
 devel/subversion-lts/files/pkg-message.in     |  6 +++
 devel/subversion/files/pkg-message.in         |  6 +++
 devel/svntrac/pkg-message                     |  7 ++-
 devel/tig/pkg-message-git                     |  6 +++
 devel/tigcc/files/pkg-message.in              |  8 ++-
 devel/tortoisehg/files/pkg-message.in         |  6 +++
 devel/trac-bitten/files/pkg-message.in        |  6 +++
 devel/truc/files/pkg-message.in               |  8 ++-
 devel/valgrind/pkg-message                    | 10 ++--
 devel/viewvc/files/pkg-message.in             | 10 ++--
 devel/visualparadigm/pkg-message              |  8 ++-
 devel/websvn/files/pkg-message.in             |  8 ++-
 devel/xc3sprog/pkg-message                    |  6 +++
 devel/youcompleteme/files/pkg-message.in      |  6 +++
 devel/zanata-platform/pkg-message             | 10 ++--
 devel/zeal/pkg-message                        |  6 +++
 dns/adsuck/files/pkg-message.in               | 10 ++--
 dns/bindgraph/pkg-message                     |  6 +++
 dns/checkdns/files/pkg-message.in             | 20 +++++---
 dns/cli53/pkg-message                         |  6 +++
 dns/credns/pkg-message                        | 22 ++++----
 dns/curvedns/files/pkg-message.in             | 10 ++--
 dns/ddclient/files/pkg-message.in             | 10 ++--
 dns/ddns/files/pkg-message.in                 |  8 ++-
 dns/dns2blackhole/pkg-message                 | 10 ++--
 dns/dnscheckengine/files/pkg-message.in       | 18 ++++---
 dns/dnscrypt-proxy2/files/pkg-message.in      |  8 ++-
 dns/dnsmasq-devel/files/pkg-message.in        | 16 +++---
 dns/dnsmasq/files/pkg-message.in              | 28 ++++++-----
 dns/dnsmax-perl/pkg-message                   | 10 ++--
 dns/dnsproxy/files/pkg-message.in             | 11 ++--
 dns/dsc/files/pkg-message.in                  | 10 ++--
 dns/dynip/pkg-message                         | 10 ++--
 dns/gdnsd3/pkg-message                        |  9 ++--
 dns/getdns/files/pkg-message.in               | 30 ++++++-----
 dns/kadnode/pkg-message                       |  6 +++
 dns/knot-resolver/files/pkg-message.in        | 10 ++--
 dns/knot2/files/pkg-message.in                | 11 ++--
 dns/mDNSResponder_nss/pkg-message             |  8 ++-
 dns/mdnsd/pkg-message                         |  6 +++
 dns/mydns-ng/files/pkg-message.in             |  9 ++--
 dns/mydns/files/pkg-message.in                |  8 ++-
 dns/noip/files/pkg-message.in                 |  8 ++-
 dns/nsd/pkg-message                           | 26 +++++-----
 dns/opendnssec2/files/pkg-message.in          | 50 ++++++++++---------
 dns/openresolv/files/pkg-message.in           | 11 ++--
 dns/powerdns-recursor/files/pkg-message.in    | 10 ++--
 dns/powerdns/files/pkg-message.in             | 16 ++++--
 dns/radns/files/pkg-message.in                | 10 ++--
 dns/rbldnsd/files/pkg-message.in              | 10 ++--
 dns/sleuth/pkg-message                        | 10 ++--
 dns/unbound/files/pkg-message.in              |  6 +++
 dns/void-zones-tools/files/pkg-message.in     |  6 +++
 328 files changed, 2142 insertions(+), 784 deletions(-)

diff --git a/databases/adminer/files/pkg-message.in b/databases/adminer/files/pkg-message.in
index 54edb9e7811a..64a90680749d 100644
--- a/databases/adminer/files/pkg-message.in
+++ b/databases/adminer/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 You should install the database extension(s) what you want to use:
 php%%PHPVER%%-mysqli, php%%PHPVER%%-mssql, php%%PHPVER%%-odbc, php%%PHPVER%%-pgsql or php%%PHPVER%%-pdo_sqlite.
+EOM
+}
+]
diff --git a/databases/adodb/files/pkg-message.in b/databases/adodb/files/pkg-message.in
index 53ffdc1bdb2a..8d80ec626abd 100644
--- a/databases/adodb/files/pkg-message.in
+++ b/databases/adodb/files/pkg-message.in
@@ -1,4 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 You can add the ADOdb path (%%DATADIR%%)
 to the "include_path=" directive in your php.ini
-
+EOM
+}
+]
diff --git a/databases/adodb5/files/pkg-message.in b/databases/adodb5/files/pkg-message.in
index 4ebad4cb7ed8..8cfd63cf0da3 100644
--- a/databases/adodb5/files/pkg-message.in
+++ b/databases/adodb5/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 This version supports only PHP version 5 and higher.
 
 You can add the ADOdb path (%%DATADIR%%)
 into the "include_path=" directive in your php.ini
+EOM
+}
+]
diff --git a/databases/akonadi/pkg-message b/databases/akonadi/pkg-message
index d95f817ff711..ba8994187d06 100644
--- a/databases/akonadi/pkg-message
+++ b/databases/akonadi/pkg-message
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 KDE Applications versions of Akonadi, KMail, and Kontact use large
 messages on the local machine. The default size on FreeBSD is too
 small, which causes local connection problems, and Akonadi-based
@@ -8,5 +9,6 @@ cannot be found). Increasing the buffer size is recommended:
 
 	sysctl net.local.stream.recvspace=65536
 	sysctl net.local.stream.sendspace=65536
-
-===============================================================================
+EOM
+}
+]
diff --git a/databases/arangodb33/pkg-message b/databases/arangodb33/pkg-message
index 42677f5015e5..0c88d9af080f 100644
--- a/databases/arangodb33/pkg-message
+++ b/databases/arangodb33/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed ArangoDB: a distributed NoSQL database.
 
 To enable the service at startup, you should execute the command:
@@ -20,4 +22,6 @@ data.
 
 ArangoDB uses the AQL language to query and modify data, as opposed to
 the SQL language used by relational databases.
-======================================================================
+EOM
+}
+]
diff --git a/databases/ateam_mysql_ldap_auth/files/pkg-message.in b/databases/ateam_mysql_ldap_auth/files/pkg-message.in
index fd841b038634..85ba9c30cac8 100644
--- a/databases/ateam_mysql_ldap_auth/files/pkg-message.in
+++ b/databases/ateam_mysql_ldap_auth/files/pkg-message.in
@@ -1,4 +1,8 @@
----------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Please see %%DOCSDIR%%/INSTALL
 for install notes.
----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/databases/bbdb/pkg-message b/databases/bbdb/pkg-message
index 2103b5af6d86..85cf3d7686ff 100644
--- a/databases/bbdb/pkg-message
+++ b/databases/bbdb/pkg-message
@@ -1,4 +1,6 @@
-########################################################################
+[
+{ type: install
+  message: <<EOM
 Add this line to your Emacs initialization.
 
 (require 'bbdb-loaddefs)
@@ -11,4 +13,6 @@ use, you may also want to add something similar to these lines.
 
 Refer to Emacs' help for these two functions, bbdb-initialize and
 bbdb-mua-auto-update-init, for details.
-########################################################################
+EOM
+}
+]
diff --git a/databases/cassandra3/pkg-message b/databases/cassandra3/pkg-message
index d5fb558f12bb..37224b063199 100644
--- a/databases/cassandra3/pkg-message
+++ b/databases/cassandra3/pkg-message
@@ -1,8 +1,12 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 Entries for this machine's hostname may need to be set in /etc/hosts
 if you get a "Local host name unknown" exception on startup
 (see https://issues.apache.org/jira/browse/CASSANDRA-2380):
 
 	::1		localhost localhost.your.domain your-host-name
 	127.0.0.1	localhost localhost.your.domain your-host-name
-======================================================================
+EOM
+}
+]
diff --git a/databases/couchdb/files/pkg-message.in b/databases/couchdb/files/pkg-message.in
index ae67d78d3778..9eda85a03a7c 100644
--- a/databases/couchdb/files/pkg-message.in
+++ b/databases/couchdb/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 ADMIN ACCOUNT
 By default no admin password or account is configured which leaves the DB
 server open.  Add accounts to the bottom of %%PREFIX%%/etc/couchdb/local.ini
 to secure your installation (by default CouchDB listens on localhost only).
+EOM
+}
+]
diff --git a/databases/couchdb2/files/pkg-message.in b/databases/couchdb2/files/pkg-message.in
index d6eb9a7ae846..910baa937bbb 100644
--- a/databases/couchdb2/files/pkg-message.in
+++ b/databases/couchdb2/files/pkg-message.in
@@ -1,4 +1,6 @@
-***********************************************************
+[
+{ type: install
+  message: <<EOM
 If this is the first time you are installing %%PORTNAME%%, you will need
 to add a default administrator, and initialise the database node.
 
@@ -30,4 +32,6 @@ Then use the admin interface at http://127.0.0.1:5984/_utils/# as usual.
 
 For more information see
 http://docs.couchdb.org/en/latest/install/setup.html
-***********************************************************
+EOM
+}
+]
diff --git a/databases/firebird25-server/files/pkg-message.in b/databases/firebird25-server/files/pkg-message.in
index df2a8148d658..bcd4ee49e315 100644
--- a/databases/firebird25-server/files/pkg-message.in
+++ b/databases/firebird25-server/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 Firebird was installed.
 
 1) Support for Super Server has been added
@@ -47,5 +48,6 @@ before doing anything serious with Firebird.
 	%%PREFIX%%/bin/gsplit	->	%%PREFIX%%/bin/fbsplit
 
 9) Enjoy it ;)
-
-################################################################################
+EOM
+}
+]
diff --git a/databases/freetds-devel/files/pkg-message.in b/databases/freetds-devel/files/pkg-message.in
index db88a3bd25cc..22f86baf7a67 100644
--- a/databases/freetds-devel/files/pkg-message.in
+++ b/databases/freetds-devel/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Sample configuration files have been installed in %%PREFIX%%/etc.
 You should edit them and remove the .dist-suffix from their names.
+EOM
+}
+]
diff --git a/databases/frontbase-jdbc/files/pkg-message.in b/databases/frontbase-jdbc/files/pkg-message.in
index 0b41043f102c..a24d14d9071c 100644
--- a/databases/frontbase-jdbc/files/pkg-message.in
+++ b/databases/frontbase-jdbc/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 FrontBase JDBC support installed!
 
 frontbasejdbc.jar resides in
 %%JAVAJARDIR%%/frontbasejdbc.jar
 Add this to your CLASSPATH!
-
+EOM
+}
+]
diff --git a/databases/galera/pkg-message b/databases/galera/pkg-message
index 35f9b6bdbe26..ee97d9728fc1 100644
--- a/databases/galera/pkg-message
+++ b/databases/galera/pkg-message
@@ -1,6 +1,8 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Find the Galera Cluster documentation at
 http://galeracluster.com/documentation-webpages/
-
-======================================================================
+EOM
+}
+]
diff --git a/databases/geoserver-mysql-plugin/files/pkg-message.in b/databases/geoserver-mysql-plugin/files/pkg-message.in
index 1aaf5d30f86d..a27deb946b56 100644
--- a/databases/geoserver-mysql-plugin/files/pkg-message.in
+++ b/databases/geoserver-mysql-plugin/files/pkg-message.in
@@ -1,9 +1,10 @@
-
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 A MySQL DataStore implementation was installed, please restart GeoServer.
 
 MySQL should now show up as an option in the GeoServer web admin tool at
 Config -> Data -> DataStores -> New.  Fill out the appropriate params.
-
-===============================================================================
+EOM
+}
+]
diff --git a/databases/gnats4/pkg-message b/databases/gnats4/pkg-message
index 9f809091308c..9bbfcee283f1 100644
--- a/databases/gnats4/pkg-message
+++ b/databases/gnats4/pkg-message
@@ -1,5 +1,6 @@
-************************************************************
-
+[
+{ type: install
+  message: <<EOM
 GNATS has been successfully installed.
 
 If you want to run the GNATS server, enter
@@ -20,5 +21,6 @@ Try `man gnats', `info gnats' and the online manual at
   http://www.gnu.org/software/gnats/gnats_toc.html
 
 for more information.
-
-************************************************************
+EOM
+}
+]
diff --git a/databases/grass7/pkg-message b/databases/grass7/pkg-message
index 32f05244ab9d..649ab0d86992 100644
--- a/databases/grass7/pkg-message
+++ b/databases/grass7/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run the wxpython based GUI:
 
     export GRASS_PYTHON=python2.7 (or your local python version)
@@ -14,3 +17,6 @@ to %%LOCALBASE%%/etc/libmap.d/gcc.conf. Use your local gcc version
 instead of gcc6.
 
 This is required for some modules using fortran.
+EOM
+}
+]
diff --git a/databases/hbase/files/pkg-message.in b/databases/hbase/files/pkg-message.in
index 42a4e12cfe12..2c9f8d38f1d0 100644
--- a/databases/hbase/files/pkg-message.in
+++ b/databases/hbase/files/pkg-message.in
@@ -1,4 +1,8 @@
-********************************************************************************
-*           HBase binaries are installed in %%PREFIX%%/hbase/bin/              *
-*           Consider adding this directory to your $PATH.                      *
-********************************************************************************
+[
+{ type: install
+  message: <<EOM
+HBase binaries are installed in %%PREFIX%%/hbase/bin/
+Consider adding this directory to your $PATH.
+EOM
+}
+]
diff --git a/databases/iplike/files/pkg-message.in b/databases/iplike/files/pkg-message.in
index d1fd47751ea6..57e9797b84d4 100644
--- a/databases/iplike/files/pkg-message.in
+++ b/databases/iplike/files/pkg-message.in
@@ -1,5 +1,11 @@
-| Don't forget to run %%PREFIX%%/sbin/install_iplike.sh to make the relevant
-| changes to your OpenNMS database.
-| To confirm the changes have been made run:
-| psql -U opennms -h localhost -c '\df+ iplike' | head
-| Check the Language column, It should say "c" and not "plpgsql"
+[
+{ type: install
+  message: <<EOM
+Don't forget to run %%PREFIX%%/sbin/install_iplike.sh to make the relevant
+changes to your OpenNMS database.
+To confirm the changes have been made run:
+psql -U opennms -h localhost -c '\df+ iplike' | head
+Check the Language column, It should say "c" and not "plpgsql"
+EOM
+}
+]
diff --git a/databases/isql-viewer/pkg-message b/databases/isql-viewer/pkg-message
index 8c6ec2e08f9e..99bcbf41246b 100644
--- a/databases/isql-viewer/pkg-message
+++ b/databases/isql-viewer/pkg-message
@@ -1,4 +1,6 @@
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 This port of iSQL-Viewer is configured to automatically detect and use
 the installed JDBC drivers for MySQL and PostgreSQL.
 
@@ -8,4 +10,6 @@ service basis in the tabbed dialog "Resources" which resides inside the
 
 However, please note that adding JAR files or directories in the preferences
 dialog doesn't have the desired effect in this version.
-=============================================================================
+EOM
+}
+]
diff --git a/databases/mariadb101-client/files/pkg-message.in b/databases/mariadb101-client/files/pkg-message.in
index 8bea32f83491..00ac47038607 100644
--- a/databases/mariadb101-client/files/pkg-message.in
+++ b/databases/mariadb101-client/files/pkg-message.in
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mariadb101-server/files/pkg-message.in b/databases/mariadb101-server/files/pkg-message.in
index b49d42074149..b9f6fea20baf 100644
--- a/databases/mariadb101-server/files/pkg-message.in
+++ b/databases/mariadb101-server/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
 the first time you start the MySQL server after an upgrade from an
 earlier version.
@@ -11,5 +12,6 @@ my.cnf. Please move existing my.cnf files from those paths to
 This port does NOT include the mytop perl script, this is included in
 the MariaDB tarball but the most recent version can be found in the
 databases/mytop port
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mariadb102-client/files/pkg-message.in b/databases/mariadb102-client/files/pkg-message.in
index 8bea32f83491..00ac47038607 100644
--- a/databases/mariadb102-client/files/pkg-message.in
+++ b/databases/mariadb102-client/files/pkg-message.in
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mariadb102-server/files/pkg-message.in b/databases/mariadb102-server/files/pkg-message.in
index e0b900e2bc63..3f08368641a8 100644
--- a/databases/mariadb102-server/files/pkg-message.in
+++ b/databases/mariadb102-server/files/pkg-message.in
@@ -1,15 +1,8 @@
-************************************************************************
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!                                                                    !!
-!! The default InnoDB storage engine is no longer XtraDB, check your  !!
-!! configuration and switch it to InnoDB                              !!
-!!                                                                    !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
+[
+{ type: install
+  message: <<EOM
+The default InnoDB storage engine is no longer XtraDB, check your
+configuration and switch it to InnoDB
 
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
@@ -18,5 +11,13 @@ my.cnf. Please move existing my.cnf files from those paths to
 This port does NOT include the mytop perl script, this is included in
 the MariaDB tarball but the most recent version can be found in the
 databases/mytop port
-
-************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+EOM
+}
+]
diff --git a/databases/mariadb103-client/files/pkg-message.in b/databases/mariadb103-client/files/pkg-message.in
index 8bea32f83491..00ac47038607 100644
--- a/databases/mariadb103-client/files/pkg-message.in
+++ b/databases/mariadb103-client/files/pkg-message.in
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mariadb103-server/files/pkg-message.in b/databases/mariadb103-server/files/pkg-message.in
index b49d42074149..7c02aa873dca 100644
--- a/databases/mariadb103-server/files/pkg-message.in
+++ b/databases/mariadb103-server/files/pkg-message.in
@@ -1,9 +1,6 @@
-************************************************************************
-
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
@@ -11,5 +8,13 @@ my.cnf. Please move existing my.cnf files from those paths to
 This port does NOT include the mytop perl script, this is included in
 the MariaDB tarball but the most recent version can be found in the
 databases/mytop port
-
-************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+EOM
+}
+]
diff --git a/databases/mariadb104-client/files/pkg-message.in b/databases/mariadb104-client/files/pkg-message.in
index 8bea32f83491..00ac47038607 100644
--- a/databases/mariadb104-client/files/pkg-message.in
+++ b/databases/mariadb104-client/files/pkg-message.in
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mariadb104-server/files/pkg-message.in b/databases/mariadb104-server/files/pkg-message.in
index b49d42074149..7c02aa873dca 100644
--- a/databases/mariadb104-server/files/pkg-message.in
+++ b/databases/mariadb104-server/files/pkg-message.in
@@ -1,9 +1,6 @@
-************************************************************************
-
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
@@ -11,5 +8,13 @@ my.cnf. Please move existing my.cnf files from those paths to
 This port does NOT include the mytop perl script, this is included in
 the MariaDB tarball but the most recent version can be found in the
 databases/mytop port
-
-************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+EOM
+}
+]
diff --git a/databases/mariadb55-client/files/pkg-message.in b/databases/mariadb55-client/files/pkg-message.in
index 8bea32f83491..00ac47038607 100644
--- a/databases/mariadb55-client/files/pkg-message.in
+++ b/databases/mariadb55-client/files/pkg-message.in
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mariadb55-server/files/pkg-message.in b/databases/mariadb55-server/files/pkg-message.in
index 060c6c66c17f..06766698c10a 100644
--- a/databases/mariadb55-server/files/pkg-message.in
+++ b/databases/mariadb55-server/files/pkg-message.in
@@ -1,11 +1,16 @@
-************************************************************************
-
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-
+[
+{ type: install
+  message: <<EOM
 MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+EOM
+}
+]
diff --git a/databases/mroonga/files/pkg-message.in b/databases/mroonga/files/pkg-message.in
index 0e033de52882..68b9c05f073a 100644
--- a/databases/mroonga/files/pkg-message.in
+++ b/databases/mroonga/files/pkg-message.in
@@ -1,5 +1,9 @@
-##########################################################
-# Run SQLs to register Mroonga engine to MySQL.          #
-#                                                        #
-# % mysql -u root < %%DATADIR%%/install.sql #
-##########################################################
+[
+{ type: install
+  message: <<EOM
+Run SQLs to register Mroonga engine to MySQL.
+
+% mysql -u root < %%DATADIR%%/install.sql
+EOM
+}
+]
diff --git a/databases/mysql-udf/pkg-message b/databases/mysql-udf/pkg-message
index f23e7492b792..157d9ddb2bc8 100644
--- a/databases/mysql-udf/pkg-message
+++ b/databases/mysql-udf/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To add the custom functions to your MySQL server use the following syntax:
 (you may install only the functions you need):
 
@@ -23,3 +26,6 @@ DROP FUNCTION median;
 
 For function descriptions, see the following webpage:
 http://mysql-udf.sourceforge.net/
+EOM
+}
+]
diff --git a/databases/mysql55-client/pkg-message b/databases/mysql55-client/pkg-message
index 4aaa841dd603..0d8d7d73c6c0 100644
--- a/databases/mysql55-client/pkg-message
+++ b/databases/mysql55-client/pkg-message
@@ -1,5 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 Please be aware the database client is vulnerable
 to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
 You may find more information at the following URL:
@@ -11,5 +12,6 @@ Although this database client is not listed as
 receiving a patch. Please take note of this when
 deploying this software.
 
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+EOM
+}
+]
diff --git a/databases/mysql55-server/pkg-message b/databases/mysql55-server/pkg-message
index 71d00aa80526..e619c93e68e7 100644
--- a/databases/mysql55-server/pkg-message
+++ b/databases/mysql55-server/pkg-message
@@ -1,6 +1,8 @@
-************************************************************************
-
+[
+{ type: upgrade
+  message: <<EOM
 Remember to run mysql_upgrade the first time you start the MySQL server
 after an upgrade from an earlier version.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mysql56-client/pkg-message b/databases/mysql56-client/pkg-message
index 879bb341f0b6..a71ac478bbf5 100644
--- a/databases/mysql56-client/pkg-message
+++ b/databases/mysql56-client/pkg-message
@@ -1,5 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 Please be aware the database client is vulnerable
 to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
 You may find more information at the following URL:
@@ -10,5 +11,6 @@ Although this database client is not listed as
 "affected", it is vulnerable and will not be
 receiving a patch. Please take note of this when
 deploying this software.
-
-* * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/databases/mysql56-server/pkg-message b/databases/mysql56-server/pkg-message
index e04486a57b57..51df5cd3b538 100644
--- a/databases/mysql56-server/pkg-message
+++ b/databases/mysql56-server/pkg-message
@@ -1,15 +1,16 @@
-*****************************************************************************
-
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-
-*****************************************************************************
-
-*****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please keep in mind that the default location for my.cnf will be changed
 from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near
 future.  If you do not want to move your my.cnf to the new location then
 you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
-
-*****************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+EOM
+}
+]
diff --git a/databases/mysql57-client/pkg-message b/databases/mysql57-client/pkg-message
index 0e53a2bace9c..2890251a7084 100644
--- a/databases/mysql57-client/pkg-message
+++ b/databases/mysql57-client/pkg-message
@@ -1,6 +1,8 @@
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 This is the mysql CLIENT without the server.
 for complete server and client, please install databases/mysql57-server
-
-* * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/databases/mysql57-server/pkg-message b/databases/mysql57-server/pkg-message
index 751330e3ab70..ab95d7af9de9 100644
--- a/databases/mysql57-server/pkg-message
+++ b/databases/mysql57-server/pkg-message
@@ -1,8 +1,6 @@
-*****************************************************************************
-
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-
+[
+{ type: install
+  message: <<EOM
 Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
 ie. when you want to use "mysql -u root -p" first you should see password
 in /root/.mysql_secret
@@ -10,5 +8,12 @@ in /root/.mysql_secret
 MySQL57 has a default %%ETCDIR%%/my.cnf,
 remember to replace it wit your own
 or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
-
-*****************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+EOM
+}
+]
diff --git a/databases/mysql80-client/pkg-message b/databases/mysql80-client/pkg-message
index 341ae825fe5b..dbbd72fe1c67 100644
--- a/databases/mysql80-client/pkg-message
+++ b/databases/mysql80-client/pkg-message
@@ -1,6 +1,8 @@
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 This is the mysql CLIENT without the server.
 for complete server and client, please install databases/mysql80-server
-
-* * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/databases/mysql80-server/pkg-message b/databases/mysql80-server/pkg-message
index 9f039ae99913..0b827d3032c9 100644
--- a/databases/mysql80-server/pkg-message
+++ b/databases/mysql80-server/pkg-message
@@ -1,13 +1,18 @@
-*****************************************************************************
-
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-
+[
+{ type: install
+  message: <<EOM
 There is no initial password for first time use of MySQL.
 Keep in mind to reset it to a secure password.
 
 MySQL80 has a default %%ETCDIR%%/my.cnf,
 remember to replace it with your own
 or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
-
-*****************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+EOM
+}
+]
diff --git a/databases/mysqlwsrep56-server/pkg-message b/databases/mysqlwsrep56-server/pkg-message
index 71d00aa80526..e619c93e68e7 100644
--- a/databases/mysqlwsrep56-server/pkg-message
+++ b/databases/mysqlwsrep56-server/pkg-message
@@ -1,6 +1,8 @@
-************************************************************************
-
+[
+{ type: upgrade
+  message: <<EOM
 Remember to run mysql_upgrade the first time you start the MySQL server
 after an upgrade from an earlier version.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/mysqlwsrep57-server/pkg-message b/databases/mysqlwsrep57-server/pkg-message
index 71d00aa80526..e619c93e68e7 100644
--- a/databases/mysqlwsrep57-server/pkg-message
+++ b/databases/mysqlwsrep57-server/pkg-message
@@ -1,6 +1,8 @@
-************************************************************************
-
+[
+{ type: upgrade
+  message: <<EOM
 Remember to run mysql_upgrade the first time you start the MySQL server
 after an upgrade from an earlier version.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/percona-pam-for-mysql/pkg-message b/databases/percona-pam-for-mysql/pkg-message
index 74250b42fd4c..6f658f86129e 100644
--- a/databases/percona-pam-for-mysql/pkg-message
+++ b/databases/percona-pam-for-mysql/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Documentation for using percona-pam-for-mysql authentication plugin can
 be found at:
 
@@ -5,3 +8,6 @@ https://www.percona.com/doc/percona-pam-for-mysql/index.html
 
 Please note that you need this plugin installed on both the client and
 server for authentication to be successful.
+EOM
+}
+]
diff --git a/databases/percona55-client/pkg-message b/databases/percona55-client/pkg-message
index 4aaa841dd603..a71ac478bbf5 100644
--- a/databases/percona55-client/pkg-message
+++ b/databases/percona55-client/pkg-message
@@ -1,5 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 Please be aware the database client is vulnerable
 to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
 You may find more information at the following URL:
@@ -10,6 +11,6 @@ Although this database client is not listed as
 "affected", it is vulnerable and will not be
 receiving a patch. Please take note of this when
 deploying this software.
-
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+EOM
+}
+]
diff --git a/databases/percona55-server/pkg-message b/databases/percona55-server/pkg-message
index 7e30302334e6..b3bae4aac6f7 100644
--- a/databases/percona55-server/pkg-message
+++ b/databases/percona55-server/pkg-message
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: upgrade
+  message: <<EOM
 Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
 the first time you start the MySQL server after an upgrade from an
 earlier version.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/percona56-client/pkg-message b/databases/percona56-client/pkg-message
index 4aaa841dd603..a71ac478bbf5 100644
--- a/databases/percona56-client/pkg-message
+++ b/databases/percona56-client/pkg-message
@@ -1,5 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 Please be aware the database client is vulnerable
 to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
 You may find more information at the following URL:
@@ -10,6 +11,6 @@ Although this database client is not listed as
 "affected", it is vulnerable and will not be
 receiving a patch. Please take note of this when
 deploying this software.
-
-* * * * * * * * * * * * * * * * * * * * * * * *
-
+EOM
+}
+]
diff --git a/databases/percona56-server/pkg-message b/databases/percona56-server/pkg-message
index 71d00aa80526..e619c93e68e7 100644
--- a/databases/percona56-server/pkg-message
+++ b/databases/percona56-server/pkg-message
@@ -1,6 +1,8 @@
-************************************************************************
-
+[
+{ type: upgrade
+  message: <<EOM
 Remember to run mysql_upgrade the first time you start the MySQL server
 after an upgrade from an earlier version.
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/percona57-pam-for-mysql/pkg-message b/databases/percona57-pam-for-mysql/pkg-message
index 6682ed7ddea3..4bade43b0850 100644
--- a/databases/percona57-pam-for-mysql/pkg-message
+++ b/databases/percona57-pam-for-mysql/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Documentation for using percona-pam-for-mysql authentication plugin can
 be found at:
 
@@ -8,3 +11,6 @@ server for authentication to be successful.
 
 This version of the plugin is compatible with the new auth plugin API
 introduced in MySQL 5.7.
+EOM
+}
+]
diff --git a/databases/percona57-server/pkg-message b/databases/percona57-server/pkg-message
index 899151c6d22b..c6e5d3df8100 100644
--- a/databases/percona57-server/pkg-message
+++ b/databases/percona57-server/pkg-message
@@ -1,10 +1,15 @@
-************************************************************************
-
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-
+[
+{ type: install
+  message: <<EOM
 Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
 ie. when you want to use "mysql -u root -p" first you should see password
 in /root/.mysql_secret
-
-************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+EOM
+}
+]
diff --git a/databases/pg_qualstats/pkg-message b/databases/pg_qualstats/pkg-message
index 996a846ea30c..61edc423458e 100644
--- a/databases/pg_qualstats/pkg-message
+++ b/databases/pg_qualstats/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate pg_qualstats on your PostgreSQL server, add 'pg_qualstats' to
 shared_preload_libraries in $PGDATA/postgresql.conf. For every database,
 run
@@ -5,3 +8,6 @@ run
 
 Using databases/powa-web and databases/powa-archivist together with
 pg_qualstats is warmly recommended.
+EOM
+}
+]
diff --git a/databases/pg_stat_kcache/pkg-message b/databases/pg_stat_kcache/pkg-message
index d3b1bd781bfc..20455d0a744a 100644
--- a/databases/pg_stat_kcache/pkg-message
+++ b/databases/pg_stat_kcache/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate pg_stat_kcache on your PostgreSQL server, add 'pg_stat_kcache' to
 shared_preload_libraries in $PGDATA/postgresql.conf. For every database,
 run
@@ -5,3 +8,6 @@ run
 
 Using databases/powa-web and databases/powa-archivist together with
 pg_stat_kcache is warmly recommended.
+EOM
+}
+]
diff --git a/databases/pgbouncer/files/pkg-message.in b/databases/pgbouncer/files/pkg-message.in
index 4d2facfe0ca9..14e7b184801a 100644
--- a/databases/pgbouncer/files/pkg-message.in
+++ b/databases/pgbouncer/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-===>  CONFIGURATION NOTE:
-
+[
+{ type: install
+  message: <<EOM
       To setup pgbouncer you need to edit the configuration file:
       %%PREFIX%%/etc/pgbouncer.ini
 
@@ -10,3 +10,6 @@
 
       To run pgbouncer from startup, add pgbouncer_enable="YES"
       in your /etc/rc.conf.
+EOM
+}
+]
diff --git a/databases/pgpool-II-35/pkg-message b/databases/pgpool-II-35/pkg-message
index b1a7385436a6..1df287cd433a 100644
--- a/databases/pgpool-II-35/pkg-message
+++ b/databases/pgpool-II-35/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to start pgpool you need some more configuration:
 
 # sysrc -f /etc/rc.conf pgpool_enable="YES"
@@ -7,3 +10,6 @@ Please consider the usage of another user. The user is
 required to have read/write access to /var/run/pgpool.
 
 Using the root user is - as always - an security issue.
+EOM
+}
+]
diff --git a/databases/pgpool-II-36/pkg-message b/databases/pgpool-II-36/pkg-message
index b1a7385436a6..1df287cd433a 100644
--- a/databases/pgpool-II-36/pkg-message
+++ b/databases/pgpool-II-36/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to start pgpool you need some more configuration:
 
 # sysrc -f /etc/rc.conf pgpool_enable="YES"
@@ -7,3 +10,6 @@ Please consider the usage of another user. The user is
 required to have read/write access to /var/run/pgpool.
 
 Using the root user is - as always - an security issue.
+EOM
+}
+]
diff --git a/databases/pgpool-II-37/pkg-message b/databases/pgpool-II-37/pkg-message
index b1a7385436a6..1df287cd433a 100644
--- a/databases/pgpool-II-37/pkg-message
+++ b/databases/pgpool-II-37/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to start pgpool you need some more configuration:
 
 # sysrc -f /etc/rc.conf pgpool_enable="YES"
@@ -7,3 +10,6 @@ Please consider the usage of another user. The user is
 required to have read/write access to /var/run/pgpool.
 
 Using the root user is - as always - an security issue.
+EOM
+}
+]
diff --git a/databases/pgpool-II-40/pkg-message b/databases/pgpool-II-40/pkg-message
index b1a7385436a6..1df287cd433a 100644
--- a/databases/pgpool-II-40/pkg-message
+++ b/databases/pgpool-II-40/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to start pgpool you need some more configuration:
 
 # sysrc -f /etc/rc.conf pgpool_enable="YES"
@@ -7,3 +10,6 @@ Please consider the usage of another user. The user is
 required to have read/write access to /var/run/pgpool.
 
 Using the root user is - as always - an security issue.
+EOM
+}
+]
diff --git a/databases/pgpool/pkg-message b/databases/pgpool/pkg-message
index b1a7385436a6..1df287cd433a 100644
--- a/databases/pgpool/pkg-message
+++ b/databases/pgpool/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to start pgpool you need some more configuration:
 
 # sysrc -f /etc/rc.conf pgpool_enable="YES"
@@ -7,3 +10,6 @@ Please consider the usage of another user. The user is
 required to have read/write access to /var/run/pgpool.
 
 Using the root user is - as always - an security issue.
+EOM
+}
+]
diff --git a/databases/pgroonga/files/pkg-message.in b/databases/pgroonga/files/pkg-message.in
index 21cfbd00cc5a..20b75bd3e814 100644
--- a/databases/pgroonga/files/pkg-message.in
+++ b/databases/pgroonga/files/pkg-message.in
@@ -1,12 +1,15 @@
-######################################################################################
-# Create a database:                                                                 #
-# ==================                                                                 #
-# % sudo -H -u postgres psql --command 'CREATE DATABASE pgroonga_test'               #
-# (Normally, you should create a user for pgroonga_test database and use the user.   #
-# See GRANT USAGE ON SCHEMA pgroonga for details.)                                   #
-#                                                                                    #
-# Connect to the created database and execute CREATE EXTENSION pgroonga:             #
-# ======================================================================             #
-# % sudo -H -u postgres psql -d pgroonga_test --command 'CREATE EXTENSION pgroonga;' #
-#                                                                                    #
-######################################################################################
+[
+{ type: install
+  message: <<EOM
+Create a database:
+==================
+% sudo -H -u postgres psql --command 'CREATE DATABASE pgroonga_test'
+(Normally, you should create a user for pgroonga_test database and use the user.
+See GRANT USAGE ON SCHEMA pgroonga for details.)
+
+Connect to the created database and execute CREATE EXTENSION pgroonga:
+======================================================================
+% sudo -H -u postgres psql -d pgroonga_test --command 'CREATE EXTENSION pgroonga;'
+EOM
+}
+]
diff --git a/databases/pguri/pkg-message b/databases/pguri/pkg-message
index a89fdfaadbd2..a3d20f1cd402 100644
--- a/databases/pguri/pkg-message
+++ b/databases/pguri/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 In order to use the extension within database execute the following command:
 
 CREATE EXTENSION uri;
+EOM
+}
+]
diff --git a/databases/phpliteadmin/files/pkg-message.in b/databases/phpliteadmin/files/pkg-message.in
index a69b5cee05e4..67acd5fcf2d3 100644
--- a/databases/phpliteadmin/files/pkg-message.in
+++ b/databases/phpliteadmin/files/pkg-message.in
@@ -1,7 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 phpliteadmin has been installed into:
 
     %%WWWDIR%%
 
 Please copy phpliteadmin.config.sample.php to phpliteadmin.config.php and
  edit as you needs.
+EOM
+}
+]
diff --git a/databases/phpmyadmin/files/pkg-message.in b/databases/phpmyadmin/files/pkg-message.in
index 19bf0c1070e5..c59745d76ae7 100644
--- a/databases/phpmyadmin/files/pkg-message.in
+++ b/databases/phpmyadmin/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 %%PKGNAME%% has been installed into:
 
     %%WWWDIR%%
@@ -41,3 +43,6 @@ advises that any instance be protected with an additional protection layer,
 e.g. a different access control mechanism implemented by the web server
 as shown in the example.  Do consider enabling phpMyAdmin only when it
 is in use.
+EOM
+}
+]
diff --git a/databases/postgresql-cstore_fdw/files/pkg-message.in b/databases/postgresql-cstore_fdw/files/pkg-message.in
index 6fd10b2d6f1e..34d6ed637142 100644
--- a/databases/postgresql-cstore_fdw/files/pkg-message.in
+++ b/databases/postgresql-cstore_fdw/files/pkg-message.in
@@ -1,5 +1,7 @@
-****************************************************************************
-
+[
+{ type: upgrade
+  maximum_version: 1.6
+  message: <<EOM
 If you are upgrading cstore_fdw from a version prior to 1.6, you need 
 to execute the following steps:
 
@@ -10,5 +12,6 @@ to execute the following steps:
 Please, visit the following URL for more information:
 
 https://github.com/citusdata/cstore_fdw/blob/master/README.md
-
-***************************************************************************
+EOM
+}
+]
diff --git a/databases/postgresql-jdbc/files/pkg-message.in b/databases/postgresql-jdbc/files/pkg-message.in
index a0c1be4aae2f..89d8d0fdfcc8 100644
--- a/databases/postgresql-jdbc/files/pkg-message.in
+++ b/databases/postgresql-jdbc/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 PostgreSQL JDBC support installed!
 
 postgresql.jar resides in
 %%JAVAJARDIR%%/postgresql.jar
 Add this to your CLASSPATH!
+EOM
+}
+]
diff --git a/databases/postgresql-plv8js/pkg-message b/databases/postgresql-plv8js/pkg-message
index b47ee85e962a..4a8c17a481fa 100644
--- a/databases/postgresql-plv8js/pkg-message
+++ b/databases/postgresql-plv8js/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Use the following sql script to create PL/v8js
 
 	psql -c 'CREATE EXTENSION plv8'
 	psql -c 'CREATE EXTENSION plls'
 	psql -c 'CREATE EXTENSION plcoffee'
+EOM
+}
+]
diff --git a/databases/postgresql-relay/pkg-message b/databases/postgresql-relay/pkg-message
index 2423b1cfbb65..95b574e6a0ee 100644
--- a/databases/postgresql-relay/pkg-message
+++ b/databases/postgresql-relay/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Databases/postgresql-relay now supports rc.subr.
 Please add 'postgresqlrelay_enable="YES"' to your /etc/rc.conf
 to make it start autoamtically at startup.
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-client.in b/databases/postgresql10-server/files/pkg-message-client.in
index 0255f5ea747c..404124204b7d 100644
--- a/databases/postgresql10-server/files/pkg-message-client.in
+++ b/databases/postgresql10-server/files/pkg-message-client.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
@@ -30,3 +33,6 @@ postgresql-contrib
   things.
 
 etc...
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-contrib.in b/databases/postgresql10-server/files/pkg-message-contrib.in
index 2b29ffd33041..2d9f3d86e71c 100644
--- a/databases/postgresql10-server/files/pkg-message-contrib.in
+++ b/databases/postgresql10-server/files/pkg-message-contrib.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL contrib utilities have been installed. Please see
 %%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-plperl.in b/databases/postgresql10-server/files/pkg-message-plperl.in
index 5d0c83920563..dbda7daff5c2 100644
--- a/databases/postgresql10-server/files/pkg-message-plperl.in
+++ b/databases/postgresql10-server/files/pkg-message-plperl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Perl has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Perl as trusted or untrusted, by using either
 "createlang plperl" or "createlang plperlu".
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-plpython.in b/databases/postgresql10-server/files/pkg-message-plpython.in
index c413582b6295..3bd80d73d177 100644
--- a/databases/postgresql10-server/files/pkg-message-plpython.in
+++ b/databases/postgresql10-server/files/pkg-message-plpython.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Python has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Python by using "createlang plpythonu" (it
 exists as an untrusted language only).
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-pltcl.in b/databases/postgresql10-server/files/pkg-message-pltcl.in
index 0902b858de0b..c1776f7d6fb3 100644
--- a/databases/postgresql10-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql10-server/files/pkg-message-pltcl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Tcl has been  installed. Check the createlang(l) manpage for more
 info. You can install pltcl as trusted or untrusted, by using either
 "createlang pltcl" or "createlang pltclu".
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-server.in b/databases/postgresql10-server/files/pkg-message-server.in
index 8df5b8198903..84a13f7cb47c 100644
--- a/databases/postgresql10-server/files/pkg-message-server.in
+++ b/databases/postgresql10-server/files/pkg-message-server.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For procedural languages and postgresql functions, please note that
 you might have to update them when updating the server.
 
@@ -61,4 +64,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
 
 To run PostgreSQL at startup, add
 'postgresql_enable="YES"' to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-client.in b/databases/postgresql11-server/files/pkg-message-client.in
index 0255f5ea747c..404124204b7d 100644
--- a/databases/postgresql11-server/files/pkg-message-client.in
+++ b/databases/postgresql11-server/files/pkg-message-client.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
@@ -30,3 +33,6 @@ postgresql-contrib
   things.
 
 etc...
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-contrib.in b/databases/postgresql11-server/files/pkg-message-contrib.in
index 2b29ffd33041..2d9f3d86e71c 100644
--- a/databases/postgresql11-server/files/pkg-message-contrib.in
+++ b/databases/postgresql11-server/files/pkg-message-contrib.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL contrib utilities have been installed. Please see
 %%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-plperl.in b/databases/postgresql11-server/files/pkg-message-plperl.in
index 5d0c83920563..dbda7daff5c2 100644
--- a/databases/postgresql11-server/files/pkg-message-plperl.in
+++ b/databases/postgresql11-server/files/pkg-message-plperl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Perl has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Perl as trusted or untrusted, by using either
 "createlang plperl" or "createlang plperlu".
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-plpython.in b/databases/postgresql11-server/files/pkg-message-plpython.in
index c413582b6295..3bd80d73d177 100644
--- a/databases/postgresql11-server/files/pkg-message-plpython.in
+++ b/databases/postgresql11-server/files/pkg-message-plpython.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Python has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Python by using "createlang plpythonu" (it
 exists as an untrusted language only).
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-pltcl.in b/databases/postgresql11-server/files/pkg-message-pltcl.in
index 0902b858de0b..c1776f7d6fb3 100644
--- a/databases/postgresql11-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql11-server/files/pkg-message-pltcl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Tcl has been  installed. Check the createlang(l) manpage for more
 info. You can install pltcl as trusted or untrusted, by using either
 "createlang pltcl" or "createlang pltclu".
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-server.in b/databases/postgresql11-server/files/pkg-message-server.in
index 8df5b8198903..84a13f7cb47c 100644
--- a/databases/postgresql11-server/files/pkg-message-server.in
+++ b/databases/postgresql11-server/files/pkg-message-server.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For procedural languages and postgresql functions, please note that
 you might have to update them when updating the server.
 
@@ -61,4 +64,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
 
 To run PostgreSQL at startup, add
 'postgresql_enable="YES"' to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/databases/postgresql12-server/files/pkg-message-client.in b/databases/postgresql12-server/files/pkg-message-client.in
index 0255f5ea747c..404124204b7d 100644
--- a/databases/postgresql12-server/files/pkg-message-client.in
+++ b/databases/postgresql12-server/files/pkg-message-client.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
@@ -30,3 +33,6 @@ postgresql-contrib
   things.
 
 etc...
+EOM
+}
+]
diff --git a/databases/postgresql12-server/files/pkg-message-contrib.in b/databases/postgresql12-server/files/pkg-message-contrib.in
index 2b29ffd33041..2d9f3d86e71c 100644
--- a/databases/postgresql12-server/files/pkg-message-contrib.in
+++ b/databases/postgresql12-server/files/pkg-message-contrib.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL contrib utilities have been installed. Please see
 %%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
+EOM
+}
+]
diff --git a/databases/postgresql12-server/files/pkg-message-plperl.in b/databases/postgresql12-server/files/pkg-message-plperl.in
index 5d0c83920563..dbda7daff5c2 100644
--- a/databases/postgresql12-server/files/pkg-message-plperl.in
+++ b/databases/postgresql12-server/files/pkg-message-plperl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Perl has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Perl as trusted or untrusted, by using either
 "createlang plperl" or "createlang plperlu".
+EOM
+}
+]
diff --git a/databases/postgresql12-server/files/pkg-message-plpython.in b/databases/postgresql12-server/files/pkg-message-plpython.in
index c413582b6295..3bd80d73d177 100644
--- a/databases/postgresql12-server/files/pkg-message-plpython.in
+++ b/databases/postgresql12-server/files/pkg-message-plpython.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Python has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Python by using "createlang plpythonu" (it
 exists as an untrusted language only).
+EOM
+}
+]
diff --git a/databases/postgresql12-server/files/pkg-message-pltcl.in b/databases/postgresql12-server/files/pkg-message-pltcl.in
index 0902b858de0b..c1776f7d6fb3 100644
--- a/databases/postgresql12-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql12-server/files/pkg-message-pltcl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Tcl has been  installed. Check the createlang(l) manpage for more
 info. You can install pltcl as trusted or untrusted, by using either
 "createlang pltcl" or "createlang pltclu".
+EOM
+}
+]
diff --git a/databases/postgresql12-server/files/pkg-message-server.in b/databases/postgresql12-server/files/pkg-message-server.in
index 8df5b8198903..84a13f7cb47c 100644
--- a/databases/postgresql12-server/files/pkg-message-server.in
+++ b/databases/postgresql12-server/files/pkg-message-server.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For procedural languages and postgresql functions, please note that
 you might have to update them when updating the server.
 
@@ -61,4 +64,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
 
 To run PostgreSQL at startup, add
 'postgresql_enable="YES"' to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/databases/postgresql94-server/files/pkg-message-client.in b/databases/postgresql94-server/files/pkg-message-client.in
index 764697bf3582..8cc91d484fcb 100644
--- a/databases/postgresql94-server/files/pkg-message-client.in
+++ b/databases/postgresql94-server/files/pkg-message-client.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
@@ -30,3 +33,6 @@ postgresql-contrib
   things.
 
 etc...
+EOM
+}
+]
diff --git a/databases/postgresql94-server/files/pkg-message-contrib.in b/databases/postgresql94-server/files/pkg-message-contrib.in
index 2b29ffd33041..2d9f3d86e71c 100644
--- a/databases/postgresql94-server/files/pkg-message-contrib.in
+++ b/databases/postgresql94-server/files/pkg-message-contrib.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL contrib utilities have been installed. Please see
 %%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
+EOM
+}
+]
diff --git a/databases/postgresql94-server/files/pkg-message-plperl.in b/databases/postgresql94-server/files/pkg-message-plperl.in
index 5d0c83920563..dbda7daff5c2 100644
--- a/databases/postgresql94-server/files/pkg-message-plperl.in
+++ b/databases/postgresql94-server/files/pkg-message-plperl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Perl has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Perl as trusted or untrusted, by using either
 "createlang plperl" or "createlang plperlu".
+EOM
+}
+]
diff --git a/databases/postgresql94-server/files/pkg-message-plpython.in b/databases/postgresql94-server/files/pkg-message-plpython.in
index c413582b6295..3bd80d73d177 100644
--- a/databases/postgresql94-server/files/pkg-message-plpython.in
+++ b/databases/postgresql94-server/files/pkg-message-plpython.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Python has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Python by using "createlang plpythonu" (it
 exists as an untrusted language only).
+EOM
+}
+]
diff --git a/databases/postgresql94-server/files/pkg-message-pltcl.in b/databases/postgresql94-server/files/pkg-message-pltcl.in
index 0902b858de0b..c1776f7d6fb3 100644
--- a/databases/postgresql94-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql94-server/files/pkg-message-pltcl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Tcl has been  installed. Check the createlang(l) manpage for more
 info. You can install pltcl as trusted or untrusted, by using either
 "createlang pltcl" or "createlang pltclu".
+EOM
+}
+]
diff --git a/databases/postgresql94-server/files/pkg-message-server.in b/databases/postgresql94-server/files/pkg-message-server.in
index 8df5b8198903..84a13f7cb47c 100644
--- a/databases/postgresql94-server/files/pkg-message-server.in
+++ b/databases/postgresql94-server/files/pkg-message-server.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For procedural languages and postgresql functions, please note that
 you might have to update them when updating the server.
 
@@ -61,4 +64,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
 
 To run PostgreSQL at startup, add
 'postgresql_enable="YES"' to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/databases/postgresql95-server/files/pkg-message-client.in b/databases/postgresql95-server/files/pkg-message-client.in
index 764697bf3582..8cc91d484fcb 100644
--- a/databases/postgresql95-server/files/pkg-message-client.in
+++ b/databases/postgresql95-server/files/pkg-message-client.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
@@ -30,3 +33,6 @@ postgresql-contrib
   things.
 
 etc...
+EOM
+}
+]
diff --git a/databases/postgresql95-server/files/pkg-message-contrib.in b/databases/postgresql95-server/files/pkg-message-contrib.in
index 2b29ffd33041..2d9f3d86e71c 100644
--- a/databases/postgresql95-server/files/pkg-message-contrib.in
+++ b/databases/postgresql95-server/files/pkg-message-contrib.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL contrib utilities have been installed. Please see
 %%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
+EOM
+}
+]
diff --git a/databases/postgresql95-server/files/pkg-message-plperl.in b/databases/postgresql95-server/files/pkg-message-plperl.in
index 5d0c83920563..dbda7daff5c2 100644
--- a/databases/postgresql95-server/files/pkg-message-plperl.in
+++ b/databases/postgresql95-server/files/pkg-message-plperl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Perl has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Perl as trusted or untrusted, by using either
 "createlang plperl" or "createlang plperlu".
+EOM
+}
+]
diff --git a/databases/postgresql95-server/files/pkg-message-plpython.in b/databases/postgresql95-server/files/pkg-message-plpython.in
index c413582b6295..3bd80d73d177 100644
--- a/databases/postgresql95-server/files/pkg-message-plpython.in
+++ b/databases/postgresql95-server/files/pkg-message-plpython.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Python has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Python by using "createlang plpythonu" (it
 exists as an untrusted language only).
+EOM
+}
+]
diff --git a/databases/postgresql95-server/files/pkg-message-pltcl.in b/databases/postgresql95-server/files/pkg-message-pltcl.in
index 0902b858de0b..c1776f7d6fb3 100644
--- a/databases/postgresql95-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql95-server/files/pkg-message-pltcl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Tcl has been  installed. Check the createlang(l) manpage for more
 info. You can install pltcl as trusted or untrusted, by using either
 "createlang pltcl" or "createlang pltclu".
+EOM
+}
+]
diff --git a/databases/postgresql95-server/files/pkg-message-server.in b/databases/postgresql95-server/files/pkg-message-server.in
index 8df5b8198903..84a13f7cb47c 100644
--- a/databases/postgresql95-server/files/pkg-message-server.in
+++ b/databases/postgresql95-server/files/pkg-message-server.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For procedural languages and postgresql functions, please note that
 you might have to update them when updating the server.
 
@@ -61,4 +64,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
 
 To run PostgreSQL at startup, add
 'postgresql_enable="YES"' to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/databases/postgresql96-server/files/pkg-message-client.in b/databases/postgresql96-server/files/pkg-message-client.in
index 0255f5ea747c..404124204b7d 100644
--- a/databases/postgresql96-server/files/pkg-message-client.in
+++ b/databases/postgresql96-server/files/pkg-message-client.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL port has a collection of "side orders":
 
 postgresql-docs
@@ -30,3 +33,6 @@ postgresql-contrib
   things.
 
 etc...
+EOM
+}
+]
diff --git a/databases/postgresql96-server/files/pkg-message-contrib.in b/databases/postgresql96-server/files/pkg-message-contrib.in
index 2b29ffd33041..2d9f3d86e71c 100644
--- a/databases/postgresql96-server/files/pkg-message-contrib.in
+++ b/databases/postgresql96-server/files/pkg-message-contrib.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 The PostgreSQL contrib utilities have been installed. Please see
 %%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
+EOM
+}
+]
diff --git a/databases/postgresql96-server/files/pkg-message-plperl.in b/databases/postgresql96-server/files/pkg-message-plperl.in
index 5d0c83920563..dbda7daff5c2 100644
--- a/databases/postgresql96-server/files/pkg-message-plperl.in
+++ b/databases/postgresql96-server/files/pkg-message-plperl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Perl has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Perl as trusted or untrusted, by using either
 "createlang plperl" or "createlang plperlu".
+EOM
+}
+]
diff --git a/databases/postgresql96-server/files/pkg-message-plpython.in b/databases/postgresql96-server/files/pkg-message-plpython.in
index c413582b6295..3bd80d73d177 100644
--- a/databases/postgresql96-server/files/pkg-message-plpython.in
+++ b/databases/postgresql96-server/files/pkg-message-plpython.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Python has been installed. Check the createlang(l) manpage for more
 info. You can install PL/Python by using "createlang plpythonu" (it
 exists as an untrusted language only).
+EOM
+}
+]
diff --git a/databases/postgresql96-server/files/pkg-message-pltcl.in b/databases/postgresql96-server/files/pkg-message-pltcl.in
index 0902b858de0b..c1776f7d6fb3 100644
--- a/databases/postgresql96-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql96-server/files/pkg-message-pltcl.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PL/Tcl has been  installed. Check the createlang(l) manpage for more
 info. You can install pltcl as trusted or untrusted, by using either
 "createlang pltcl" or "createlang pltclu".
+EOM
+}
+]
diff --git a/databases/postgresql96-server/files/pkg-message-server.in b/databases/postgresql96-server/files/pkg-message-server.in
index 8df5b8198903..84a13f7cb47c 100644
--- a/databases/postgresql96-server/files/pkg-message-server.in
+++ b/databases/postgresql96-server/files/pkg-message-server.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For procedural languages and postgresql functions, please note that
 you might have to update them when updating the server.
 
@@ -61,4 +64,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
 
 To run PostgreSQL at startup, add
 'postgresql_enable="YES"' to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/databases/powa-archivist/pkg-message b/databases/powa-archivist/pkg-message
index 8eb99a9263d9..389be1e4b42b 100644
--- a/databases/powa-archivist/pkg-message
+++ b/databases/powa-archivist/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate powa-archvist on your PostgreSQL server, add 'powa' to the list of
 shared_preload_libraries in $PGDATA/postgresql.conf:
 
@@ -22,3 +25,6 @@ Optionally, but warmly recommended, is the use of databases/pg_qualstats and
 databases/pg_stat_kcache together with powa.
 
 Use the databases/powa-web port to visualize the data.
+EOM
+}
+]
diff --git a/databases/puppetdb5/files/pkg-message.in b/databases/puppetdb5/files/pkg-message.in
index 4e13534c21f6..fba773047854 100644
--- a/databases/puppetdb5/files/pkg-message.in
+++ b/databases/puppetdb5/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 If this is a new installation, please run the follow to setup your SSL/puppetdb
 server:
 
 %%PREFIX%%/bin/puppetdb ssl-setup
 
 Please also remember to add puppetdb_enable="YES" into your rc.conf.
+EOM
+}
+]
diff --git a/databases/puppetdb6/files/pkg-message.in b/databases/puppetdb6/files/pkg-message.in
index 4e13534c21f6..fba773047854 100644
--- a/databases/puppetdb6/files/pkg-message.in
+++ b/databases/puppetdb6/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 If this is a new installation, please run the follow to setup your SSL/puppetdb
 server:
 
 %%PREFIX%%/bin/puppetdb ssl-setup
 
 Please also remember to add puppetdb_enable="YES" into your rc.conf.
+EOM
+}
+]
diff --git a/databases/py-htsql/pkg-message b/databases/py-htsql/pkg-message
index a7920343f120..8367f06290fd 100644
--- a/databases/py-htsql/pkg-message
+++ b/databases/py-htsql/pkg-message
@@ -1,6 +1,10 @@
-**********************************************************************
-* Additional backends to HTSQL are available in the following ports: *
-*                                                                    *
-* PostgreSQL:	databases/py-htsql-pgsql                             *
-* MySQL:	databases/py-htsql-mysql                             *
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
+Additional backends to HTSQL are available in the following ports:
+
+PostgreSQL:	databases/py-htsql-pgsql
+MySQL:	databases/py-htsql-mysql
+EOM
+}
+]
diff --git a/databases/qt5-sql/pkg-message b/databases/qt5-sql/pkg-message
index f9d42cacdadf..cee398c2b5bf 100644
--- a/databases/qt5-sql/pkg-message
+++ b/databases/qt5-sql/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 To enable Qt database support, install the database plugin ports. The
 following plugin ports are available:
  - databases/qt5-sqldrivers-ibase	InterBase/Firebird
@@ -9,5 +10,6 @@ following plugin ports are available:
  - databases/qt5-sqldrivers-sqlite2	SQLite 2
  - databases/qt5-sqldrivers-sqlite3	SQLite 3
  - databases/qt5-sqldrivers-tds		FreeTDS
-
-======================================================================
+EOM
+}
+]
diff --git a/databases/redis-devel/files/pkg-message.in b/databases/redis-devel/files/pkg-message.in
index fd3763137ea3..85a89529262a 100644
--- a/databases/redis-devel/files/pkg-message.in
+++ b/databases/redis-devel/files/pkg-message.in
@@ -1,8 +1,11 @@
-
-===>  CONFIGURATION NOTE:
-
+[
+{ type: install
+  message: <<EOM
       To setup "%%PORTNAME%%" you need to edit the configuration file:
       %%PREFIX%%/etc/%%PORTNAME%%.conf
 
       To run redis from startup, add %%PORTNAME%%_enable="YES"
       in your /etc/rc.conf.
+EOM
+}
+]
diff --git a/databases/redis/files/pkg-message.in b/databases/redis/files/pkg-message.in
index fd3763137ea3..85a89529262a 100644
--- a/databases/redis/files/pkg-message.in
+++ b/databases/redis/files/pkg-message.in
@@ -1,8 +1,11 @@
-
-===>  CONFIGURATION NOTE:
-
+[
+{ type: install
+  message: <<EOM
       To setup "%%PORTNAME%%" you need to edit the configuration file:
       %%PREFIX%%/etc/%%PORTNAME%%.conf
 
       To run redis from startup, add %%PORTNAME%%_enable="YES"
       in your /etc/rc.conf.
+EOM
+}
+]
diff --git a/databases/slony1v2/files/pkg-message.in b/databases/slony1v2/files/pkg-message.in
index 1cf868e2de69..83bce1b71a05 100644
--- a/databases/slony1v2/files/pkg-message.in
+++ b/databases/slony1v2/files/pkg-message.in
@@ -1,13 +1,11 @@
-*******************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please read the docs on configuring and running slony-1.
 
 Unless you did not specify the DOCS options, they are in the
 %%LOCALBASE%%/share/doc/slony1v2 directory.
 
-If you are upgrading from a prior version of slony, please read the UPGRADING
-file in the above docs directory.
-
 The script %%LOCALBASE%%/sbin/slon-mkservice can be used to create a control
 directory to run and monitor the slon daemon under svscan from daemontools.
 If you use this, be sure not to set slon_enable="YES" in /etc/rc.conf.
@@ -21,5 +19,12 @@ is documented in %%LOCALBASE%%/share/doc/slony1/adminguide/runtime-config.html
 %%PERLTOOLS%%
 %%PERLTOOLS%%To use the perl slony configuration and monitoring tools, you must
 %%PERLTOOLS%%create %%LOCALBASE%%/etc/slon_tools.conf based on the sample file.
-
-*******************************************************************************
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+If you are upgrading from a prior version of slony, please read the UPGRADING
+file in the above docs directory.
+EOM
+}
+]
diff --git a/databases/soci/files/pkg-message.in b/databases/soci/files/pkg-message.in
index cafb32e07b1b..362009f7d3a9 100644
--- a/databases/soci/files/pkg-message.in
+++ b/databases/soci/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 If you use dynamically loaded backends, you have to set the environment variable
 SOCI_BACKENDS_PATH to %%PREFIX%%/lib
+EOM
+}
+]
diff --git a/databases/sqldeveloper/pkg-message b/databases/sqldeveloper/pkg-message
index d4392b8c9aad..06a98b902840 100644
--- a/databases/sqldeveloper/pkg-message
+++ b/databases/sqldeveloper/pkg-message
@@ -1,4 +1,6 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 Note for Oracle users:
 
     In order to connect in a simple way to an Oracle database, it is needed to
@@ -18,5 +20,6 @@ Note for MySQL users:
     menu, select Database -> Third Party JDBC Drivers and add the proper jar.
     Do not install 5.1 version of mysql jdbc connector; see
     https://docs.oracle.com/en/database/oracle/sql-developer/18.4/rptig/installing-sql-developer.html#GUID-3F68CF20-D03D-431C-A9A2-0EB971F06448
-
-************************************************************************
+EOM
+}
+]
diff --git a/databases/sqlite-ext-miscfuncs/pkg-message b/databases/sqlite-ext-miscfuncs/pkg-message
index d55184d7fb78..0e6ce5c16b35 100644
--- a/databases/sqlite-ext-miscfuncs/pkg-message
+++ b/databases/sqlite-ext-miscfuncs/pkg-message
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 Loading extensions is by default prohibited as a security measure;
 see "Security Considerations" in
 http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions.
@@ -8,4 +10,6 @@ use these functions from the program, you must write your own program
 using the sqlite3 API, and call sqlite3_enable_load_extension as
 described above, or else rebuilt the sqlite3 program to allow
 loadable extensions.
-*********************************************************************
+EOM
+}
+]
diff --git a/databases/sqlite-ext-pcre/pkg-message b/databases/sqlite-ext-pcre/pkg-message
index 70906d9f80bf..44f348bf951a 100644
--- a/databases/sqlite-ext-pcre/pkg-message
+++ b/databases/sqlite-ext-pcre/pkg-message
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 Loading extensions is by default prohibited as a security measure;
 see "Security Considerations" in
 http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions.
@@ -8,4 +10,6 @@ use these functions from the program, you must write your own program
 using the sqlite3 API, and call sqlite3_enable_load_extension as
 described above, or else rebuild the sqlite3 program to allow
 loadable extensions.
-*********************************************************************
+EOM
+}
+]
diff --git a/databases/sqlite-ext-regexp/pkg-message b/databases/sqlite-ext-regexp/pkg-message
index d55184d7fb78..0e6ce5c16b35 100644
--- a/databases/sqlite-ext-regexp/pkg-message
+++ b/databases/sqlite-ext-regexp/pkg-message
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 Loading extensions is by default prohibited as a security measure;
 see "Security Considerations" in
 http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions.
@@ -8,4 +10,6 @@ use these functions from the program, you must write your own program
 using the sqlite3 API, and call sqlite3_enable_load_extension as
 described above, or else rebuilt the sqlite3 program to allow
 loadable extensions.
-*********************************************************************
+EOM
+}
+]
diff --git a/databases/sqlite-ext-spellfix/pkg-message b/databases/sqlite-ext-spellfix/pkg-message
index d55184d7fb78..0e6ce5c16b35 100644
--- a/databases/sqlite-ext-spellfix/pkg-message
+++ b/databases/sqlite-ext-spellfix/pkg-message
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 Loading extensions is by default prohibited as a security measure;
 see "Security Considerations" in
 http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions.
@@ -8,4 +10,6 @@ use these functions from the program, you must write your own program
 using the sqlite3 API, and call sqlite3_enable_load_extension as
 described above, or else rebuilt the sqlite3 program to allow
 loadable extensions.
-*********************************************************************
+EOM
+}
+]
diff --git a/databases/squirrel-sql/pkg-message b/databases/squirrel-sql/pkg-message
index ea58a13edc4f..73b32c099fc4 100644
--- a/databases/squirrel-sql/pkg-message
+++ b/databases/squirrel-sql/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To connect to your favorite database you can install one of the following JDBC
 drivers.
 
@@ -5,3 +8,6 @@ drivers.
 * databases/postgresql-jdbc
 
 After that you have to configure the driver via the GUI (see Help).
+EOM
+}
+]
diff --git a/databases/tarantool/files/pkg-message.in b/databases/tarantool/files/pkg-message.in
index fbbe7f26f2f1..7f0d47f82080 100644
--- a/databases/tarantool/files/pkg-message.in
+++ b/databases/tarantool/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
   After install, you'll need:
 
   Configuration at /etc/rc.conf:
@@ -8,5 +9,6 @@
       tarantool_enable="yes"
   * Path to storage link files of instances:
       tarantool_instances="%%ETCDIR%%/instances.enabled"
-
-========================================================================
+EOM
+}
+]
diff --git a/databases/timescaledb/files/pkg-message.in b/databases/timescaledb/files/pkg-message.in
index 83487f864cf5..2ba063100afb 100644
--- a/databases/timescaledb/files/pkg-message.in
+++ b/databases/timescaledb/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To activate timescaledb on your PostgreSQL server, add 'timescaledb' to
 shared_preload_libraries in $PGDATA/postgresql.conf. For every database,
 run
@@ -5,3 +8,6 @@ run
 
 If you are upgrading, restart PostgreSQL server and run
 	ALTER EXTENSION timescaledb UPDATE TO '%%PORTVERSION%%';
+EOM
+}
+]
diff --git a/databases/unixODBC/files/pkg-message.in b/databases/unixODBC/files/pkg-message.in
index 50adf58715cd..b03a6525fae1 100644
--- a/databases/unixODBC/files/pkg-message.in
+++ b/databases/unixODBC/files/pkg-message.in
@@ -1,9 +1,11 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 If installing for MySQL, then copy the example configuration file to your home
 directory as ".odbc.ini", and modify to define specific MySQL database(s). The
 file is located at "%%EXAMPLESDIR%%/MySQL/iodbc.ini".
 
 This is required to use MySQL databases from OpenOffice.org, for example.
-
-==============================================================================
+EOM
+}
+]
diff --git a/databases/virtuoso/files/pkg-message.in b/databases/virtuoso/files/pkg-message.in
index f2b743fa8497..f076a546df30 100644
--- a/databases/virtuoso/files/pkg-message.in
+++ b/databases/virtuoso/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Please copy and edit the sample configuration file before enabling the server:
 
 cp %%PREFIX%%/lib/virtuoso/db/virtuoso.ini.sample %%PREFIX%%/lib/virtuoso/db/virtuoso.ini
+EOM
+}
+]
diff --git a/databases/wfb2sql/pkg-message b/databases/wfb2sql/pkg-message
index fd985a5128df..73d8f9b4fdd2 100644
--- a/databases/wfb2sql/pkg-message
+++ b/databases/wfb2sql/pkg-message
@@ -1,6 +1,6 @@
-
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Before being able to run wfb2sql, you need to obtain a copy of the
 CIA's World Fact Book.  A copy of the WFB can be found here:
 
@@ -32,3 +32,6 @@ NOTE: wfb2sql inserts data into the wfb schema!
         ^$$$B  $$$$\     $$$$$$$$$$$$   d$$R"
           "*$bd$$$$      '*$$$$$$$$$$$o+#"
                """"          """""""
+EOM
+}
+]
diff --git a/databases/zabbix22-libzbxpgsql/pkg-message b/databases/zabbix22-libzbxpgsql/pkg-message
index 23d85feb7007..0837bde77f1b 100644
--- a/databases/zabbix22-libzbxpgsql/pkg-message
+++ b/databases/zabbix22-libzbxpgsql/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 In order to enable the module, add libzbxpgsql.so to the LoadModule=
 line in zabbix_agentd.conf and restart the agent with
 service zabbix_agentd restart
+EOM
+}
+]
diff --git a/databases/zabbix3-libzbxpgsql/pkg-message b/databases/zabbix3-libzbxpgsql/pkg-message
index 23d85feb7007..0837bde77f1b 100644
--- a/databases/zabbix3-libzbxpgsql/pkg-message
+++ b/databases/zabbix3-libzbxpgsql/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 In order to enable the module, add libzbxpgsql.so to the LoadModule=
 line in zabbix_agentd.conf and restart the agent with
 service zabbix_agentd restart
+EOM
+}
+]
diff --git a/deskutils/anydesk/pkg-message b/deskutils/anydesk/pkg-message
index 65c0f8cee6f6..95b76bc7856c 100644
--- a/deskutils/anydesk/pkg-message
+++ b/deskutils/anydesk/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 1. Minimum OS version.
 ======================
 Anydesk is a binary package for FreeBSD.
@@ -15,3 +18,6 @@ Since Version 2.9.1 the following prerequisites have to be met:
 	manually: # mount -t procfs proc /proc
 2. You need a loaded mqueuefs module:
 	manual load: kldload mqueuefs (as root!)
+EOM
+}
+]
diff --git a/deskutils/calibre/pkg-message b/deskutils/calibre/pkg-message
index a64913ec3d90..21b246783e62 100644
--- a/deskutils/calibre/pkg-message
+++ b/deskutils/calibre/pkg-message
@@ -1,5 +1,6 @@
----
-
+[
+{ type: install
+  message: <<EOM
 NOTE: Calibre requires Hal to be running for access to devices.  The user who
 is running Calibre also needs to be able to mount devices.  For non-root users,
 this means modifying %%PREFIX%%/etc/PolicyKit/PolicyKit.conf and adding the
@@ -65,5 +66,6 @@ headers of the startup script.
 The command line options are documented here:
 
 https://manual.calibre-ebook.com/generated/en/calibre-server.html
-
----
+EOM
+}
+]
diff --git a/deskutils/conkyforecast/files/pkg-message.in b/deskutils/conkyforecast/files/pkg-message.in
index bf2f51aa1820..df9ccfaef803 100644
--- a/deskutils/conkyforecast/files/pkg-message.in
+++ b/deskutils/conkyforecast/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
 
@@ -16,3 +19,6 @@ To copy and edit the config, using the command line, run:
 
 	cp %%DATADIR%%/conkyForecast.config ~/.conkyForecast.config
 
+EOM
+}
+]
diff --git a/deskutils/egroupware/files/pkg-message.in b/deskutils/egroupware/files/pkg-message.in
index 287ebd64ceda..336aad9f9014 100644
--- a/deskutils/egroupware/files/pkg-message.in
+++ b/deskutils/egroupware/files/pkg-message.in
@@ -1,4 +1,6 @@
-==============================================================
+[
+{ type: install
+  message: <<EOM
 POST-INSTALL CONFIGURATION FOR eGroupware
 
 
@@ -41,5 +43,6 @@ and backup's full path with:
 For more information, see the INSTALL DOCUMENTATION:
 
 http://www.egroupware.org/index.php?page_name=wiki&lang=&wikipage=ManualSetup
-
-======================================================
+EOM
+}
+]
diff --git a/deskutils/fasd/pkg-message b/deskutils/fasd/pkg-message
index 669444a0a64a..32367c98a636 100644
--- a/deskutils/fasd/pkg-message
+++ b/deskutils/fasd/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To get fasd working in a shell, some initialization code must be run. Put the
 line below in your shell rc.
 
@@ -5,3 +8,6 @@ eval "$(fasd --init auto)"
 
 This will setup a command hook that executes on every command and advanced tab
 completion for zsh and bash.
+EOM
+}
+]
diff --git a/deskutils/gnome-shell-extra-extensions/pkg-message.slaves b/deskutils/gnome-shell-extra-extensions/pkg-message.slaves
index 8bb1f09d2355..a916f92324e8 100644
--- a/deskutils/gnome-shell-extra-extensions/pkg-message.slaves
+++ b/deskutils/gnome-shell-extra-extensions/pkg-message.slaves
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The gnome-shell extensions won't be usable until the gnome-shell
 gets restarted. To do so, running the shell, press ALT+F2 and
 type 'r'. That will restart the shell.
@@ -7,3 +10,6 @@ have to open a new gnome-tweak-tool instance. The new extensions
 should appear in the extensions section.
 
 Use the extension at your own risk.
+EOM
+}
+]
diff --git a/deskutils/goesimage/pkg-message b/deskutils/goesimage/pkg-message
index 2256d44d844a..921612c41196 100644
--- a/deskutils/goesimage/pkg-message
+++ b/deskutils/goesimage/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed goesimage, the program that downloads images from the
 NOAA Geostationary Operational Environment Satellite and makes them
 your wallpaper.
@@ -19,4 +21,6 @@ $ goesimage-disable
 
 You can also download and update the wallpaper any time:
 $ goesimage-run-now
-======================================================================
+EOM
+}
+]
diff --git a/deskutils/howm/pkg-message b/deskutils/howm/pkg-message
index de99a549c530..9f39dee983ee 100644
--- a/deskutils/howm/pkg-message
+++ b/deskutils/howm/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 To use this port, write below to your ~/.emacs:
 
   ;(setq howm-menu-lang 'ja)
   (global-set-key "\C-c,," 'howm-menu)
   (autoload 'howm-menu "howm-mode" "Hitori Otegaru Wiki Modoki" t)
+EOM
+}
+]
diff --git a/deskutils/jlj/files/pkg-message.in b/deskutils/jlj/files/pkg-message.in
index 438e42207b48..18f07a1f6eb4 100644
--- a/deskutils/jlj/files/pkg-message.in
+++ b/deskutils/jlj/files/pkg-message.in
@@ -1,7 +1,9 @@
----------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 Be sure to copy %%PREFIX%%/share/examples/jlj/dot.livejournal.rc to
 ~/.livejournal.rc before running jlj.  More details can be found
 in %%PREFIX%%/share/doc/jlj/README.
-
----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/deskutils/kmail/pkg-message b/deskutils/kmail/pkg-message
index d95f817ff711..ba8994187d06 100644
--- a/deskutils/kmail/pkg-message
+++ b/deskutils/kmail/pkg-message
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 KDE Applications versions of Akonadi, KMail, and Kontact use large
 messages on the local machine. The default size on FreeBSD is too
 small, which causes local connection problems, and Akonadi-based
@@ -8,5 +9,6 @@ cannot be found). Increasing the buffer size is recommended:
 
 	sysctl net.local.stream.recvspace=65536
 	sysctl net.local.stream.sendspace=65536
-
-===============================================================================
+EOM
+}
+]
diff --git a/deskutils/lumina-calculator/pkg-message b/deskutils/lumina-calculator/pkg-message
index c3742ad9e57c..df59b385e306 100644
--- a/deskutils/lumina-calculator/pkg-message
+++ b/deskutils/lumina-calculator/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The Lumina Desktop Environment has been installed!
 
 An entry for for launching Lumina from a graphical login manager has already been added to the system, but if you with to start Lumina manually, you will need to do one of the following:
@@ -5,3 +8,6 @@ An entry for for launching Lumina from a graphical login manager has already bee
 2) Put the line "exec start-lumina-desktop" at the end of your user's "~/.xinitrc" file before running startx with any special X11 flags
 
 Also note that the system-wide default settings for Lumina are contained in ${PREFIX}/etc/luminaDesktop.conf[.dist]. While it is possible to customize the desktop to the user's liking after logging in, you may want to adjust the default settings as necessary if there are multiple user accounts on this system.
+EOM
+}
+]
diff --git a/deskutils/moregroupware/pkg-message b/deskutils/moregroupware/pkg-message
index 16b9777ccd16..501bff705a62 100644
--- a/deskutils/moregroupware/pkg-message
+++ b/deskutils/moregroupware/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 You are suggested to set the following on php.ini:
 
 	include_path should include "."
@@ -12,3 +14,6 @@ calendar2, it has a somewhat unclear future.
 
 The admin3 is not finished yet, don't use it, or READ THE DOCS
 if you really want to try it!
+EOM
+}
+]
diff --git a/deskutils/myitcrm/files/pkg-message.in b/deskutils/myitcrm/files/pkg-message.in
index 72bc8b5fc7d0..2d68eb8cffca 100644
--- a/deskutils/myitcrm/files/pkg-message.in
+++ b/deskutils/myitcrm/files/pkg-message.in
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-Post installation instructions:
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 MyITCRM is now installed in documentroot: %%WWWDIR%%.
 
 1) Create user, MySQL database and set privileges:
@@ -29,4 +29,6 @@ Recommended php.ini settings:
 - memory_limit=32M
 - register_globals=off
 - safe_mode=off
-============================================================================
+EOM
+}
+]
diff --git a/deskutils/parcellite/files/pkg-message.in b/deskutils/parcellite/files/pkg-message.in
index 873f4ffb203e..c4e634d2750d 100644
--- a/deskutils/parcellite/files/pkg-message.in
+++ b/deskutils/parcellite/files/pkg-message.in
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
 Parcellite has been installed.
 
 This program will attempt to obtain some system information by accessing files
@@ -17,5 +18,6 @@ mount /proc
 
 kldload linprocfs
 mount /compat/linux/proc
-
-################################################################################
+EOM
+}
+]
diff --git a/deskutils/phpicalendar/files/pkg-message.in b/deskutils/phpicalendar/files/pkg-message.in
index d117d88d7c4a..edf56e516cf3 100644
--- a/deskutils/phpicalendar/files/pkg-message.in
+++ b/deskutils/phpicalendar/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 PHPiCalendar post-install instructions
 --------------------------------------
 Edit %%WWWDIR%%/config.inc.php first to suit your needs.
+EOM
+}
+]
diff --git a/deskutils/plans/files/pkg-message.in b/deskutils/plans/files/pkg-message.in
index 4b6b5e5b27a4..c69805ffc8c6 100644
--- a/deskutils/plans/files/pkg-message.in
+++ b/deskutils/plans/files/pkg-message.in
@@ -1,6 +1,10 @@
-===========================================================
+[
+{ type: install
+  message: <<EOM
 Plans is now installed at %%WWWDIR%%
 You'll need to configure your server to accept CGI scripts
 in the directory. Plans can be configured by editing
 %%WWWDIR%%/plans_config.pl
-===========================================================
+EOM
+}
+]
diff --git a/deskutils/py-autokey/pkg-message b/deskutils/py-autokey/pkg-message
index a5ef61a93d6f..47547e674995 100644
--- a/deskutils/py-autokey/pkg-message
+++ b/deskutils/py-autokey/pkg-message
@@ -1,5 +1,8 @@
-*Important*
-
+[
+{ type: install
+  message: <<EOM
 This is an X11 application, and as such will not function 100% on 
 distributions that default to using Wayland instead of Xorg.
-
+EOM
+}
+]
diff --git a/deskutils/py-khal/pkg-message b/deskutils/py-khal/pkg-message
index 328ae88c6109..d6b2951cd2f0 100644
--- a/deskutils/py-khal/pkg-message
+++ b/deskutils/py-khal/pkg-message
@@ -1,5 +1,7 @@
-######################################################################
-
+[
+{ type: install
+  message: <<EOM
 Khal needs LANG to be set to a UTF-8 locale (e.g. en_US.UTF-8) to run.
-
-######################################################################
+EOM
+}
+]
diff --git a/deskutils/py-khard/files/pkg-message.in b/deskutils/py-khard/files/pkg-message.in
index b417376b79f3..50487d89b4a1 100644
--- a/deskutils/py-khard/files/pkg-message.in
+++ b/deskutils/py-khard/files/pkg-message.in
@@ -1,7 +1,9 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Copy the example configuration from
 %%PREFIX%%/share/examples/khard/khard.conf.example to
 $XDG_CONFIG_HOME/khard/khard.conf
-
-======================================================================
+EOM
+}
+]
diff --git a/deskutils/py-paperless/files/pkg-message.in b/deskutils/py-paperless/files/pkg-message.in
index 4a75bbeeb74d..216c54db405c 100644
--- a/deskutils/py-paperless/files/pkg-message.in
+++ b/deskutils/py-paperless/files/pkg-message.in
@@ -1,3 +1,7 @@
-=========================================================================
+[
+{ type: install
+  message: <<EOM
   Please see `man paperless' for details on how to configure paperless.
-=========================================================================
+EOM
+}
+]
diff --git a/deskutils/sugarcrm/files/pkg-message.in b/deskutils/sugarcrm/files/pkg-message.in
index d2785cffe224..a3f9fc9b2c23 100644
--- a/deskutils/sugarcrm/files/pkg-message.in
+++ b/deskutils/sugarcrm/files/pkg-message.in
@@ -1,5 +1,6 @@
-##
-
+[
+{ type: install
+  message: <<EOM
 Notes:
 
 1.  Sugar Community Edition requires that you increase the default PHP
@@ -37,5 +38,6 @@ Alias /sugarcrm %%WWWDIR%%
     http://www.sugarforge.org/content/documentation/
 
 5.  Enjoy!
-
-##
+EOM
+}
+]
diff --git a/deskutils/taskd/pkg-message b/deskutils/taskd/pkg-message
index b011b012a60c..5d02b80058b3 100644
--- a/deskutils/taskd/pkg-message
+++ b/deskutils/taskd/pkg-message
@@ -1,4 +1,6 @@
-=======================================================================
+[
+{ type: install
+  message: <<EOM
 taskd requires user directed configuration prior to use.
 
 See taskwarrior.org/docs/taskserver/configure.html for configuration
@@ -19,4 +21,6 @@ To add users see: taskwarrior.org/docs/taskserver/user.html
 
 To configure taskwarrior to use your taskd server see:
 taskwarrior.org/docs/taskserver/taskwarrior.html
-=======================================================================
+EOM
+}
+]
diff --git a/deskutils/thinkingrock/files/pkg-message.in b/deskutils/thinkingrock/files/pkg-message.in
index c95dce9e514d..d2ff1d868fcf 100644
--- a/deskutils/thinkingrock/files/pkg-message.in
+++ b/deskutils/thinkingrock/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************
-
+[
+{ type: install
+  message: <<EOM
  Please note that Thinkingrock will not work with diablo-jdk16
  or diablo-jre16. Set the JAVA_HOME variable to a different
  Java installation:
@@ -11,5 +12,6 @@
  e.g. sh:
  $ export JAVA_HOME=/usr/local/diablo-jre1.5.0
  $ thinkingrock
-
-*****************************************************************
+EOM
+}
+]
diff --git a/deskutils/tine20/files/pkg-message.in b/deskutils/tine20/files/pkg-message.in
index bc158f5a314a..39978aca8f5b 100644
--- a/deskutils/tine20/files/pkg-message.in
+++ b/deskutils/tine20/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Preparing the database
 ---------------------------------------------
 
@@ -61,3 +63,6 @@ https://wiki.tine20.org/Admins/Synchronisation
 More information on how to setup CalDAV can be found here:
 
 https://wiki.tine20.org/Admins/Thunderbird-Synchronisation
+EOM
+}
+]
diff --git a/deskutils/xfce4-tumbler/files/pkg-message.in b/deskutils/xfce4-tumbler/files/pkg-message.in
index 0921aaa232a5..af2d17109c15 100644
--- a/deskutils/xfce4-tumbler/files/pkg-message.in
+++ b/deskutils/xfce4-tumbler/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To override the default configuration, you must copy the rc-file:
 
 	mkdir ~/.config/tumbler
@@ -6,3 +9,6 @@ To override the default configuration, you must copy the rc-file:
 The COVER plugin requires manual configuration.
 
 For more information see http://docs.xfce.org/xfce/thunar/tumbler
+EOM
+}
+]
diff --git a/devel/9base/pkg-message b/devel/9base/pkg-message
index 8901b6b9ed4c..57fe5f850b0d 100644
--- a/devel/9base/pkg-message
+++ b/devel/9base/pkg-message
@@ -1,7 +1,9 @@
-======================================================
-
+[
+{ type: install
+  message: <<EOM
 Some of 9base tools require fdescfs to be mounted.
 Please refer manpages fdescfs(5) and fstab(5) to 
 mount it.
-
-======================================================
+EOM
+}
+]
diff --git a/devel/RStudio/pkg-message b/devel/RStudio/pkg-message
index 44ee4e7227d4..8f10ba49c238 100644
--- a/devel/RStudio/pkg-message
+++ b/devel/RStudio/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed RStudio: Integrated development environment (IDE) for R.
 
 Please note that RStudio requires /proc to be mounted.
@@ -8,4 +10,6 @@ proc /proc procfs rw 0 0
 
 and then run this command as root:
 # mount /proc
-======================================================================
+EOM
+}
+]
diff --git a/devel/aegis/pkg-message b/devel/aegis/pkg-message
index dfb2ddb25657..c2ad6f9d1cef 100644
--- a/devel/aegis/pkg-message
+++ b/devel/aegis/pkg-message
@@ -1,7 +1,9 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Aegis has been installed.
 
 If you want more development tools, check "devel/cook" and "devel/fhist".
-
-==============================================================================
+EOM
+}
+]
diff --git a/devel/allegro-devel/files/pkg-message.in b/devel/allegro-devel/files/pkg-message.in
index f812756c3c2f..305dcbc3c352 100644
--- a/devel/allegro-devel/files/pkg-message.in
+++ b/devel/allegro-devel/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Allegro-devel has been installed.
 
 Allegro-devel have two Demos (Games)
@@ -21,5 +22,6 @@ Or can use desktop files
     %%LOCALBASE%%/share/applications/speed.desktop
 
 Have fun!
-
-===============================================================================
+EOM
+}
+]
diff --git a/devel/android-tools-fastboot/files/pkg-message.in b/devel/android-tools-fastboot/files/pkg-message.in
index 32713248181a..685189b9b7d0 100644
--- a/devel/android-tools-fastboot/files/pkg-message.in
+++ b/devel/android-tools-fastboot/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The port installed fastboot(1) under %%PREFIX%%/bin. However, there's
 a different fastboot(8) under /sbin. To avoid accidentally invoking
 the wrong command make sure either to
@@ -5,3 +8,6 @@ the wrong command make sure either to
 - adjust PATH environment variable to have fastboot(1) found first
 - create a shell alias with absolute path to fastboot(1)
 - create a symlink with different name in PATH e.g., under ~/bin
+EOM
+}
+]
diff --git a/devel/apr1/pkg-message b/devel/apr1/pkg-message
index 88852a246a54..ccf5adca9f44 100644
--- a/devel/apr1/pkg-message
+++ b/devel/apr1/pkg-message
@@ -1,7 +1,9 @@
-/!\ ================================================================== /!\
-
+[
+{ type: install
+  message: <<EOM
 The Apache Portable Runtime project removed support for FreeTDS with
 version 1.6. Users requiring MS-SQL connectivity must migrate
 configurations to use the added ODBC driver and FreeTDS' ODBC features.
-
-/!\ ================================================================== /!\
+EOM
+}
+]
diff --git a/devel/arduino/files/pkg-message.in b/devel/arduino/files/pkg-message.in
index 9f49a76704e1..f000e18213fd 100644
--- a/devel/arduino/files/pkg-message.in
+++ b/devel/arduino/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Notes on using the Arduino IDE:
 
 To allow serial port locking, add your user to the dialer group:
@@ -16,3 +19,6 @@ visible if you started the IDE from a console):
 
 To start the IDE:
     %%PREFIX%%/bin/arduino
+EOM
+}
+]
diff --git a/devel/aros-sdk/files/pkg-message.in b/devel/aros-sdk/files/pkg-message.in
index c8c2a7ae32d7..fd0937e8c218 100644
--- a/devel/aros-sdk/files/pkg-message.in
+++ b/devel/aros-sdk/files/pkg-message.in
@@ -1,4 +1,8 @@
-        ATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 Remember to add %%AROS_SDK_PATH%%/bin to your PATH environment
 variable before using the AROS SDK.
+EOM
+}
+]
diff --git a/devel/artifactory/files/pkg-message.in b/devel/artifactory/files/pkg-message.in
index 580ed8136012..e8e08adac583 100644
--- a/devel/artifactory/files/pkg-message.in
+++ b/devel/artifactory/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=== INSTALLATION ===
-
+[
+{ type: install
+  message: <<EOM
 Artifactory is now installed in %%APP_HOME%%
 
 You may want to activate it in /etc/rc.conf:
@@ -23,9 +23,10 @@ Please don't forget to review and edit the files in the
 Full documentation may be found at:
 
 https://www.jfrog.com/confluence/display/RTF/Welcome+to+Artifactory
-
-=== DEINSTALLATION ==
-
+EOM
+}
+{ type: remove
+  message: <<EOM
 If, when, Artifactory is removed, and you no longer require the
 runtime database and configuration files, you can delete the
 following directory:
@@ -37,3 +38,6 @@ the database files that Artifactory requires if you do decide to
 re-install it again.
 
 Enjoy!
+EOM
+}
+]
diff --git a/devel/awless/pkg-message b/devel/awless/pkg-message
index df5d5bc95dbb..5001bc97a719 100644
--- a/devel/awless/pkg-message
+++ b/devel/awless/pkg-message
@@ -1,9 +1,11 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Setup your AWS account by exporting AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
 environment variables.
 
 If you have previously used aws CLI or aws-shell, your credentials will be
 automatically loaded by awless from the ~/.aws/credentials folder.
-
-===============================================================================
+EOM
+}
+]
diff --git a/devel/boost-all/pkg-message.python b/devel/boost-all/pkg-message.python
index 8e065b92275c..cb5195b507fc 100644
--- a/devel/boost-all/pkg-message.python
+++ b/devel/boost-all/pkg-message.python
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You have built the Boost.Python library. You have to add the following
 options when building your own code:
 
@@ -6,3 +9,6 @@ Compiler options:
 
 Linker options:
    -L%%PYTHON_LIBDIR%% -L%%LOCALBASE%%/lib -lboost_python -l%%PYTHON_VERSION%%
+EOM
+}
+]
diff --git a/devel/boost-all/pkg-message.threads b/devel/boost-all/pkg-message.threads
index a25279cd13f8..1c58b99b3e5f 100644
--- a/devel/boost-all/pkg-message.threads
+++ b/devel/boost-all/pkg-message.threads
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 You have built the Boost library with thread support.
 
 Don't forget to add -pthread to your linker options when
 linking your code.
+EOM
+}
+]
diff --git a/devel/boost_build/files/pkg-message.in b/devel/boost_build/files/pkg-message.in
index 06d36cb6c029..771ec3e0b3af 100644
--- a/devel/boost_build/files/pkg-message.in
+++ b/devel/boost_build/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use boost_build, it is necessary to set BOOST_ROOT in
 your environment:
 
@@ -13,3 +16,6 @@ To override this on a system-wide basis, edit this file:
 For an example of a per-user settings file which may be
 copied to your home directory, see:
 	 %%DATADIR%%/user-config.jam
+EOM
+}
+]
diff --git a/devel/bugzilla44/files/pkg-message.in b/devel/bugzilla44/files/pkg-message.in
index b20cd0a62d0f..f50cf9315147 100644
--- a/devel/bugzilla44/files/pkg-message.in
+++ b/devel/bugzilla44/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
   Bugzilla has now been installed.  To quick setup you have to:
 
   1. Create database user who has rights on bugs database manipulation
@@ -21,8 +23,10 @@
   For more complete database setup and post-installation instructions
   and security tips/notes please read "Bugzilla Guide" in
   %%DOCSDIR%%/en/html/ (chapter 2: "Installing Bugzilla")
-==========================================================================
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 For upgrades:
   0. Back up your data.
 
@@ -34,5 +38,6 @@ For upgrades:
 
   3. Restart your Web server, especially if you're using mod_perl: this
      will save you from a number of troubles.
-
-==========================================================================
+EOM
+}
+]
diff --git a/devel/bugzilla50/files/pkg-message.in b/devel/bugzilla50/files/pkg-message.in
index b20cd0a62d0f..961d97fe86a7 100644
--- a/devel/bugzilla50/files/pkg-message.in
+++ b/devel/bugzilla50/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
   Bugzilla has now been installed.  To quick setup you have to:
 
   1. Create database user who has rights on bugs database manipulation
@@ -21,8 +23,10 @@
   For more complete database setup and post-installation instructions
   and security tips/notes please read "Bugzilla Guide" in
   %%DOCSDIR%%/en/html/ (chapter 2: "Installing Bugzilla")
-==========================================================================
-
+EOM
+}
+{ type: install
+  message: <<EOM
 For upgrades:
   0. Back up your data.
 
@@ -34,5 +38,6 @@ For upgrades:
 
   3. Restart your Web server, especially if you're using mod_perl: this
      will save you from a number of troubles.
-
-==========================================================================
+EOM
+}
+]
diff --git a/devel/ccache/files/pkg-message.in b/devel/ccache/files/pkg-message.in
index 0ff1244719ea..088912983fd3 100644
--- a/devel/ccache/files/pkg-message.in
+++ b/devel/ccache/files/pkg-message.in
@@ -1,5 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 NOTE:
 Please read %%DOCSDIR%%/%%HOWTO%% for
 information on using ccache with FreeBSD ports and src.
-
+EOM
+}
+]
diff --git a/devel/cdash/files/pkg-message.in b/devel/cdash/files/pkg-message.in
index e89931442175..f9a8aabc2eac 100644
--- a/devel/cdash/files/pkg-message.in
+++ b/devel/cdash/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Your CDash configuration file is located at
 %%PREFIX%%/www/CDash/cdash/config.local.php.
 
@@ -6,3 +9,6 @@ grant him privileges over a database named 'cdash'.
 
 A sample CDash project is available for download at
 http://www.cdash.org/download/CDashTest.zip.
+EOM
+}
+]
diff --git a/devel/cgit/files/pkg-message.in b/devel/cgit/files/pkg-message.in
index 4d50bfb98aff..01906397b809 100644
--- a/devel/cgit/files/pkg-message.in
+++ b/devel/cgit/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 cgit has been successfully installed.
 
 To enable cgit in Apache, use something like the following:
@@ -11,4 +13,6 @@ To enable cgit in Apache, use something like the following:
 
 Documentation and sample configuration can be found
 in %%DOCSDIR%%/cgitrc.5.txt.
----------------------------------------------------
+EOM
+}
+]
diff --git a/devel/chruby/files/pkg-message.in b/devel/chruby/files/pkg-message.in
index 4038d9dc905b..71806c181149 100644
--- a/devel/chruby/files/pkg-message.in
+++ b/devel/chruby/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Add the following to the /etc/profile.d/chruby.sh, ~/.bash_profile or
 ~/.zprofile file:
 
@@ -23,5 +24,6 @@ rbfu: RUBIES=('~/.rbfu/rubies/*)
 To enable auto-switching of Rubies specified by .ruby-version files:
 
 source %%PREFIX%%/share/chruby/auto.sh
-
-======================================================================
+EOM
+}
+]
diff --git a/devel/cl-asdf/files/pkg-message.in b/devel/cl-asdf/files/pkg-message.in
index 0fcc61506e7b..722037f98717 100644
--- a/devel/cl-asdf/files/pkg-message.in
+++ b/devel/cl-asdf/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To use asdf and depending ports, you will have to configure your
 Lisp systems so they know where to find asdf itself and the system
 definition files.
@@ -9,4 +11,6 @@ A default configuration is installed in
 
 Review this file for further information, or simply load it from your
 Lisp initialization file.
-==========================================================================
+EOM
+}
+]
diff --git a/devel/clojure-cider/pkg-message b/devel/clojure-cider/pkg-message
index e9a70dc341e7..5610617ff7dd 100644
--- a/devel/clojure-cider/pkg-message
+++ b/devel/clojure-cider/pkg-message
@@ -1,7 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 Starting with CIDER 0.7, the installation of cider-nrepl is manual.
 Please install devel/leiningen and add the following to
 ~/.lein/profiles.clj:
 
 { :user
  { :plugins [[cider/cider-nrepl "0.7.0-SNAPSHOT"]] }
+EOM
+}
+]
diff --git a/devel/colorgcc/files/pkg-message.in b/devel/colorgcc/files/pkg-message.in
index bde9042c061e..7ccebf763403 100644
--- a/devel/colorgcc/files/pkg-message.in
+++ b/devel/colorgcc/files/pkg-message.in
@@ -1,7 +1,11 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 colorgcc is installed.
 
 For a quick start:
     - cp ${EXAMPLESDIR}/colorgccrc ${HOME}/.colorgcc
     - export CC=${PREFIX}/bin/colorgcc
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/cons/pkg-message b/devel/cons/pkg-message
index 88d9768ad4f3..ba1237501f8f 100644
--- a/devel/cons/pkg-message
+++ b/devel/cons/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Copyright (C) 1996-2000 Free Software Foundation, Inc.
 
 Cons is free software; you can redistribute it and/or modify
@@ -14,3 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
+EOM
+}
+]
diff --git a/devel/ctags/files/pkg-message.in b/devel/ctags/files/pkg-message.in
index ac1d45ff28a8..f102c9c1ac98 100644
--- a/devel/ctags/files/pkg-message.in
+++ b/devel/ctags/files/pkg-message.in
@@ -1,3 +1,7 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 The executable for Exuberant CTAGS is installed as %%PREFIX%%/bin/exctags
-**************************************************************************
+EOM
+}
+]
diff --git a/devel/cutter/pkg-message b/devel/cutter/pkg-message
index aa335f9e26b8..f6a51b296790 100644
--- a/devel/cutter/pkg-message
+++ b/devel/cutter/pkg-message
@@ -1,7 +1,11 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 Please note that code-coverage is not fully supported on FreeBSD and
 cutter will crash when used to generate a report.  The problem has been
 reported upstream and no fix is available ATM. However, a workaround has
 been found: adding the '--keep-opening-modules' argument to cutter's
 command-line circumvents the problem.
-************************************************************************
+EOM
+}
+]
diff --git a/devel/cvsd/pkg-message b/devel/cvsd/pkg-message
index eef59c5deb84..636c785fdde6 100644
--- a/devel/cvsd/pkg-message
+++ b/devel/cvsd/pkg-message
@@ -1,4 +1,8 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 You should set up user and group ids for cvsd, create a
 chrooted filesystem and create repositories.
-************************************************************
+EOM
+}
+]
diff --git a/devel/cvsgraph/files/pkg-message.in b/devel/cvsgraph/files/pkg-message.in
index 44cef12d96db..ec2a3e64c255 100644
--- a/devel/cvsgraph/files/pkg-message.in
+++ b/devel/cvsgraph/files/pkg-message.in
@@ -1,3 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 You must copy %%PREFIX%%/etc/cvsgraph.conf.sample to
 %%PREFIX%%/etc/cvsgraph.conf in order to use cvsgraph.
-
+EOM
+}
+]
diff --git a/devel/cvsmonitor/pkg-message b/devel/cvsmonitor/pkg-message
index 29ca68af9d37..66e7d4aef8b6 100644
--- a/devel/cvsmonitor/pkg-message
+++ b/devel/cvsmonitor/pkg-message
@@ -1,7 +1,11 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 The rest of installation must be completed manually.
 Type in your browser URL like
 	http://localhost/cgi-bin/cvsmonitor/setup.pl
 
 and follow instructions.
-************************************************************
+EOM
+}
+]
diff --git a/devel/cvstrac/pkg-message b/devel/cvstrac/pkg-message
index a273a0878c11..22de4968205b 100644
--- a/devel/cvstrac/pkg-message
+++ b/devel/cvstrac/pkg-message
@@ -1,5 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 Please follow the detailed installation instructions in the CVSTrac
 Wiki at http://www.cvstrac.org/cvstrac/wiki?p=CvstracInstallation
 for information on how to get CVSTrac up and running in your preferred
 configuration.
+EOM
+}
+]
diff --git a/devel/cvsweb/files/pkg-message.in b/devel/cvsweb/files/pkg-message.in
index 942d80831845..02fab79c6380 100644
--- a/devel/cvsweb/files/pkg-message.in
+++ b/devel/cvsweb/files/pkg-message.in
@@ -1,4 +1,6 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Quickstart:
 	cd %%PREFIX%%/etc/cvsweb
 	cp cvsweb.conf.dist cvsweb.conf
@@ -12,4 +14,6 @@ browse, edit cvsweb.conf* as you like.
 
   For further information, please look into the directory
 `%%DOCSDIR%%'.
-************************************************************
+EOM
+}
+]
diff --git a/devel/cvsweb3/files/pkg-message.in b/devel/cvsweb3/files/pkg-message.in
index 942d80831845..02fab79c6380 100644
--- a/devel/cvsweb3/files/pkg-message.in
+++ b/devel/cvsweb3/files/pkg-message.in
@@ -1,4 +1,6 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Quickstart:
 	cd %%PREFIX%%/etc/cvsweb
 	cp cvsweb.conf.dist cvsweb.conf
@@ -12,4 +14,6 @@ browse, edit cvsweb.conf* as you like.
 
   For further information, please look into the directory
 `%%DOCSDIR%%'.
-************************************************************
+EOM
+}
+]
diff --git a/devel/cweb/pkg-message b/devel/cweb/pkg-message
index 988901ea802c..94bed76a4a41 100644
--- a/devel/cweb/pkg-message
+++ b/devel/cweb/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 You'll want to install some TeX package along with this.
 I recommend getting teTeX if you're not short on disk space.
+EOM
+}
+]
diff --git a/devel/distcc/files/pkg-message.in b/devel/distcc/files/pkg-message.in
index 808b7c530d6f..9c54309b3956 100644
--- a/devel/distcc/files/pkg-message.in
+++ b/devel/distcc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 WARNING: distcc[d] performs NO AUTHENTICATION at all and should
 ONLY be used in trusted networks!
 
@@ -24,3 +27,6 @@ instead override the value of distccd_flags in /etc/rc.conf.
 
 Note that remote daemons currently won't work if they cannot
 resolve the reverse DNS of the master machine
+EOM
+}
+]
diff --git a/devel/eiffelstudio/files/pkg-message.in b/devel/eiffelstudio/files/pkg-message.in
index 62158cecddc6..062f96bf7c6d 100644
--- a/devel/eiffelstudio/files/pkg-message.in
+++ b/devel/eiffelstudio/files/pkg-message.in
@@ -1,9 +1,11 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 EiffelStudio has been installed.
 
 Everything was installed under "%%DATADIR%%".
 
 A wrapper script was also installed as "eiffelstudio".
-
-==============================================================================
+EOM
+}
+]
diff --git a/devel/eric6/pkg-message b/devel/eric6/pkg-message
index 74c13e9d6b14..9cf10be76e1d 100644
--- a/devel/eric6/pkg-message
+++ b/devel/eric6/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 eric6 has the following localized language packages:
     de-eric6
     es-eric6
     ru-eric6
+EOM
+}
+]
diff --git a/devel/fam/files/pkg-message.in b/devel/fam/files/pkg-message.in
index 5c0c32f5887e..e18a45794f89 100644
--- a/devel/fam/files/pkg-message.in
+++ b/devel/fam/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 1. In order to run this port, please add the following line to /etc/rpc if
 it is not already there:
 
@@ -27,5 +28,6 @@ Add portmap_enable="YES" and either reboot or run /usr/sbin/portmap.
 
 For 5.x and later:
 Add rpcbind_enable="YES" and either reboot or run /etc/rc.d/rpcbind start.
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/fistgen/files/pkg-message.in b/devel/fistgen/files/pkg-message.in
index 1292a48ef4d4..8d8dfaef5d64 100644
--- a/devel/fistgen/files/pkg-message.in
+++ b/devel/fistgen/files/pkg-message.in
@@ -1,5 +1,6 @@
-============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Templates were installed in %%DATADIR%%.
 Examples were installed in %%EXAMPLESDIR%%.
 
@@ -17,5 +18,6 @@ Then you can chdir to out/OS-VER/FSNAME and type 'make'.
 
 See %%DOCSDIR%%/README, %%DOCSDIR%%/INSTALL
 and http://www.filesystems.org for further instructions.
-
-============================================================================
+EOM
+}
+]
diff --git a/devel/flyspray/files/pkg-message.in b/devel/flyspray/files/pkg-message.in
index 16fa40397b21..d814150ab343 100644
--- a/devel/flyspray/files/pkg-message.in
+++ b/devel/flyspray/files/pkg-message.in
@@ -1,7 +1,9 @@
-##
-
+[
+{ type: install
+  message: <<EOM
 Please read the installation instructions in:
 
 	%%DOCSDIR%%/README.FreeBSD
-
-##
+EOM
+}
+]
diff --git a/devel/gamin/pkg-message b/devel/gamin/pkg-message
index 32525db575bf..d4c44bba2485 100644
--- a/devel/gamin/pkg-message
+++ b/devel/gamin/pkg-message
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Gamin will only provide realtime notification of changes for at most n files,
 where n is the minimum value between (kern.maxfiles * 0.7) and
 (kern.maxfilesperproc - 200). Beyond that limit, files will be polled.
@@ -17,5 +18,6 @@ in one of the gaminrc files:
 # reduce polling frequency to once per 10 seconds
 # for UFS file systems in order to lower CPU load
 fsset ufs poll 10
-
-===============================================================================
+EOM
+}
+]
diff --git a/devel/git-lfs/pkg-message b/devel/git-lfs/pkg-message
index e667e2877fe4..dfeb1778fc63 100644
--- a/devel/git-lfs/pkg-message
+++ b/devel/git-lfs/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To get started with Git LFS, the following commands can be used:
 
   1. Setup Git LFS on your system. You only have to do this once per
@@ -20,3 +23,6 @@ To get started with Git LFS, the following commands can be used:
      $ git add file.iso
      $ git commit -m "Add disk image"
      $ git push
+EOM
+}
+]
diff --git a/devel/git-merge-changelog/pkg-message b/devel/git-merge-changelog/pkg-message
index 24f30a6e287e..0c131b0a1837 100644
--- a/devel/git-merge-changelog/pkg-message
+++ b/devel/git-merge-changelog/pkg-message
@@ -1,4 +1,6 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 Usage of git-merge-changelog:
 
 - Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
@@ -12,5 +14,6 @@ Usage of git-merge-changelog:
   '.gitattributes' with this line:
 
 	ChangeLog	merge=merge-changelog
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/git/files/pkg-message.in b/devel/git/files/pkg-message.in
index 58161b5fb898..8b0c589f29e1 100644
--- a/devel/git/files/pkg-message.in
+++ b/devel/git/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-------------------------------------------------------------------------
-*************************** GITWEB *************************************
+[
+{ type: install
+  message: <<EOM
 If you installed the GITWEB option please follow these instructions:
 
 In the directory %%EXAMPLESDIR%%/gitweb you can find all files to
@@ -12,13 +12,12 @@ All you have to do to make gitweb work is:
 2) Set the GITWEB_CONFIG variable in your webserver's config to
    %%ETCDIR%%/gitweb.conf. This variable is passed to gitweb.cgi.
 3) Restart server.
-*************************** GITWEB *************************************
 
-*************************** CONTRIB ************************************
+
 If you installed the CONTRIB option please note that the scripts are
 installed in %%PREFIX%%/share/git-core/contrib. Some of them require
 other ports to be installed (perl, python, etc), which you may need to
 install manually.
-*************************** CONTRIB ************************************
-------------------------------------------------------------------------
-
+EOM
+}
+]
diff --git a/devel/git/pkg-message b/devel/git/pkg-message
index bfe04b2ce36b..eca9e829fc55 100644
--- a/devel/git/pkg-message
+++ b/devel/git/pkg-message
@@ -1,4 +1,6 @@
--------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 git is installed.
 
 You might wish to configure git for your user (author) name and email.
@@ -8,5 +10,6 @@ applied) please consult the core.pager option in the git-config(1) manual, and
 your preferred pager's manual for color output options.
 
 bash completion script was renamed to git-completion.bash to keep original name
-
--------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/gitblit/files/pkg-message.in b/devel/gitblit/files/pkg-message.in
index bb224b44852b..7086afcbf6f9 100644
--- a/devel/gitblit/files/pkg-message.in
+++ b/devel/gitblit/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 	By default, Gitblit stores all data (users, settings,
 	repositories, etc) in ${contextFolder}/WEB-INF/data.
 	Specifying an alternate "baseFolder" allows for simple
@@ -20,5 +21,6 @@
 
 	More informations:
 	http://gitblit.com/setup_war.html
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/github-backup-utils/files/pkg-message.in b/devel/github-backup-utils/files/pkg-message.in
index c573599d967c..74fc911ab738 100644
--- a/devel/github-backup-utils/files/pkg-message.in
+++ b/devel/github-backup-utils/files/pkg-message.in
@@ -1,3 +1,7 @@
-=====================================================================
+[
+{ type: install
+  message: <<EOM
 Review and update %%PREFIX%%/etc/github.backup.config for your needs.
-=====================================================================
+EOM
+}
+]
diff --git a/devel/gitlab-runner/pkg-message b/devel/gitlab-runner/pkg-message
index aafc321ef1af..1ce33d9a600b 100644
--- a/devel/gitlab-runner/pkg-message
+++ b/devel/gitlab-runner/pkg-message
@@ -1,4 +1,6 @@
-==============================================================================
+[
+{ type: install
+  message: <<EOM
 To enable gitlab-runner:
 
   sysrc gitlab_runner_enable=yes
@@ -14,4 +16,6 @@ To register with GitLab:
 To list status of GitLab:
 
   service gitlab_runner list
-==============================================================================
+EOM
+}
+]
diff --git a/devel/gitlist/files/pkg-message.in b/devel/gitlist/files/pkg-message.in
index bbfddfbb97f9..a921ff5b0e35 100644
--- a/devel/gitlist/files/pkg-message.in
+++ b/devel/gitlist/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 The port will install an htdocs dir %%WWWDIR%%.
 Copy %%WWWDIR%%/config.ini-example
 to %%WWWDIR%%/config.ini and
 edit it to make it use your git repositories.
 Then configure your webserver to use the htdocs directory.
+EOM
+}
+]
diff --git a/devel/gitolite2/files/pkg-message.in b/devel/gitolite2/files/pkg-message.in
index e385c83b2712..cc3f30a15b84 100644
--- a/devel/gitolite2/files/pkg-message.in
+++ b/devel/gitolite2/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Final gitolite installation instructions:
 
 Any ssh user can be a gitolite provider. Simply run the following command as
@@ -14,5 +15,6 @@ The admin ssh key allows full access to the gitolite-admin repository where
 additional users and repositories can be configured.
 
 By default, the git user is created for use by gitolite.
-
-==============================================================================
+EOM
+}
+]
diff --git a/devel/gitphp/files/pkg-message.in b/devel/gitphp/files/pkg-message.in
index 17146e4bd901..eff9c2bedcb7 100644
--- a/devel/gitphp/files/pkg-message.in
+++ b/devel/gitphp/files/pkg-message.in
@@ -1,4 +1,6 @@
-*****************************************************************
+[
+{ type: install
+  message: <<EOM
 You will also need to configure Apache.  Consider adding the following to
 your httpd.conf:
 
@@ -13,4 +15,6 @@ Then restart Apache: 'apachectl graceful'
 
 Then visit 'http://localhost/gitphp/' in a web-browser and follow the
 configuration instructions.
-*****************************************************************
+EOM
+}
+]
diff --git a/devel/gittrac/pkg-message b/devel/gittrac/pkg-message
index ef086b2c917c..50118157bbb1 100644
--- a/devel/gittrac/pkg-message
+++ b/devel/gittrac/pkg-message
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 Please follow the detailed installation instructions in the CVSTrac
 Wiki at http://www.cvstrac.org/cvstrac/wiki?p=GitTrac for information
 on how to get GitTrac up and running in your preferred configuration.
+EOM
+}
+]
diff --git a/devel/gnustep/pkg-message b/devel/gnustep/pkg-message
index e3c7e7785bfd..66260dbd285c 100644
--- a/devel/gnustep/pkg-message
+++ b/devel/gnustep/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use GNUstep you need to source the envoroment in your shell:
 
 for sh/bash:
@@ -7,3 +10,6 @@ for csh:
 source /usr/local/GNUstep/System/Library/Makefiles/GNUstep.csh
 
 then start your applications with "openapp <name>".
+EOM
+}
+]
diff --git a/devel/godot2-tools/pkg-message b/devel/godot2-tools/pkg-message
index c49ffaf7bf31..7c267f80109a 100644
--- a/devel/godot2-tools/pkg-message
+++ b/devel/godot2-tools/pkg-message
@@ -1,7 +1,11 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 This is the old v2 of godot and is only for compatability
 to be able to work on older projects.
 
 If you are planning any development in godot
 please install the newer v3 version in devel/godot-tools
-============================================================
+EOM
+}
+]
diff --git a/devel/gogland-eap/files/pkg-message.in b/devel/gogland-eap/files/pkg-message.in
index 8333c38cb0ac..1e6f444bc43f 100644
--- a/devel/gogland-eap/files/pkg-message.in
+++ b/devel/gogland-eap/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 There is experimental native (faster) file watching support which is
 disabled by default.  Currently there are problems with watching large
 trees.  To enable edit %%DATADIR%%/bin/idea.properties and append
@@ -6,3 +9,6 @@ trees.  To enable edit %%DATADIR%%/bin/idea.properties and append
       idea.filewatcher.executable.path=%%IDEA_HOME%%/bin/fsnotifier
 
 Only enable fsnotifier if your projects have < 600 files.
+EOM
+}
+]
diff --git a/devel/gogs/files/pkg-message.in b/devel/gogs/files/pkg-message.in
index 74418c6bd9c2..22a6dfd3d9d1 100644
--- a/devel/gogs/files/pkg-message.in
+++ b/devel/gogs/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed %%PORTNAME%%: Go Git Service.
 
 It is recommended to run %%PORTNAME%% as a service:
@@ -20,4 +22,6 @@ You can only edit it when %%PORTNAME%% isn't running.
 sysrc sshd_enable="YES"
 and sshd is configured to listen on the same port that is configured
 in %%PORTNAME%%.
-======================================================================
+EOM
+}
+]
diff --git a/devel/hg-git/pkg-message b/devel/hg-git/pkg-message
index 8b74b540e087..f1b389b94d5f 100644
--- a/devel/hg-git/pkg-message
+++ b/devel/hg-git/pkg-message
@@ -1,5 +1,6 @@
-====
-
+[
+{ type: install
+  message: <<EOM
 To enable the Hg-Git extension it has to be added in either
 
 '$PREFIX/etc/mercurial/hgrc' (per-system),
@@ -10,5 +11,6 @@ Mercurial configuration file:
 
 [extensions]
 hggit =
-
-====
+EOM
+}
+]
diff --git a/devel/ice/pkg-message b/devel/ice/pkg-message
index 3466b4653e8b..76d28647fd19 100644
--- a/devel/ice/pkg-message
+++ b/devel/ice/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The default on-the-wire encoding for Ice changed in version 3.5 and IPv6
 is now enabled by default. ABI versions are not compatible.
 
@@ -12,3 +15,6 @@ For on-the-wire background compatibility add
 	Ice.Default.EncodingVersion=1.0
 
 to your Ice application configuration.
+EOM
+}
+]
diff --git a/devel/interactive_rebase_tool/pkg-message b/devel/interactive_rebase_tool/pkg-message
index 2a8020d429cb..422df334a910 100644
--- a/devel/interactive_rebase_tool/pkg-message
+++ b/devel/interactive_rebase_tool/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 To configure Git to use interactive-rebase-tool for interactive
 rebasing by default, run:
 
 git config --global sequence.editor interactive-rebase-tool
+EOM
+}
+]
diff --git a/devel/ioncube/files/pkg-message.in b/devel/ioncube/files/pkg-message.in
index d431bfd1ba4c..a02d70c90b8d 100644
--- a/devel/ioncube/files/pkg-message.in
+++ b/devel/ioncube/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You have installed the ionCube loader package.
 
 The following lines have been added to %%PREFIX%%/etc/php/ext-05-ioncube.ini so
@@ -6,3 +9,6 @@ that the extension has been automatically activated.
 [Zend]
 zend_extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader.so
 zend_extension_ts=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader_ts.so
+EOM
+}
+]
diff --git a/devel/jenkins-lts/pkg-message b/devel/jenkins-lts/pkg-message
index 3c598e9faf06..47ecbe73eefd 100644
--- a/devel/jenkins-lts/pkg-message
+++ b/devel/jenkins-lts/pkg-message
@@ -1,10 +1,12 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please login to the Jenkins web interface and secure with a password,
 when installing for the first time.
 
 More information:
 https://wiki.jenkins-ci.org/display/JENKINS/Quick+and+Simple+Security
 https://wiki.jenkins-ci.org/display/JENKINS/Standard+Security+Setup
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/jenkins/pkg-message b/devel/jenkins/pkg-message
index 3c598e9faf06..47ecbe73eefd 100644
--- a/devel/jenkins/pkg-message
+++ b/devel/jenkins/pkg-message
@@ -1,10 +1,12 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please login to the Jenkins web interface and secure with a password,
 when installing for the first time.
 
 More information:
 https://wiki.jenkins-ci.org/display/JENKINS/Quick+and+Simple+Security
 https://wiki.jenkins-ci.org/display/JENKINS/Standard+Security+Setup
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/jetbrains-clion/files/pkg-message.in b/devel/jetbrains-clion/files/pkg-message.in
index b351c8f258e8..00e6bc5fc93a 100644
--- a/devel/jetbrains-clion/files/pkg-message.in
+++ b/devel/jetbrains-clion/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/devel/jetbrains-goland/files/pkg-message.in b/devel/jetbrains-goland/files/pkg-message.in
index b351c8f258e8..00e6bc5fc93a 100644
--- a/devel/jetbrains-goland/files/pkg-message.in
+++ b/devel/jetbrains-goland/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/devel/jetbrains-phpstorm/files/pkg-message.in b/devel/jetbrains-phpstorm/files/pkg-message.in
index b351c8f258e8..00e6bc5fc93a 100644
--- a/devel/jetbrains-phpstorm/files/pkg-message.in
+++ b/devel/jetbrains-phpstorm/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/devel/jetbrains-webstorm/files/pkg-message.in b/devel/jetbrains-webstorm/files/pkg-message.in
index b351c8f258e8..00e6bc5fc93a 100644
--- a/devel/jetbrains-webstorm/files/pkg-message.in
+++ b/devel/jetbrains-webstorm/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/devel/jline/files/pkg-message.in b/devel/jline/files/pkg-message.in
index f18bb7aa2243..16cfea791269 100644
--- a/devel/jline/files/pkg-message.in
+++ b/devel/jline/files/pkg-message.in
@@ -1,5 +1,9 @@
----------------------------------------
+[
+{ type: install
+  message: <<EOM
 To use JLine add the file
 %%JAVAJARDIR%%/jline.jar
 to your classpath!
----------------------------------------
+EOM
+}
+]
diff --git a/devel/kronosnet/pkg-message b/devel/kronosnet/pkg-message
index 4f22785ea3d9..4d3b8a9b5af7 100644
--- a/devel/kronosnet/pkg-message
+++ b/devel/kronosnet/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For correct operation, maximum socket buffer size must be tuned
 by performing the following command as root :
 
@@ -7,3 +10,6 @@ To preserve this setting across reboots, append the following
 to /etc/sysctl.conf :
 
 kern.ipc.maxsockbuf=18874368
+EOM
+}
+]
diff --git a/devel/libaravis/pkg-message b/devel/libaravis/pkg-message
index 134431da116f..9e6cb319dbf5 100644
--- a/devel/libaravis/pkg-message
+++ b/devel/libaravis/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Aravis require broadcast to find devices.
 
 Dont forget run:
@@ -8,3 +11,6 @@ static_routes="bcast:lan0"
 route_bcast="255.255.255.255 -iface lan0"
 
 where lan0 - network interface name.
+EOM
+}
+]
diff --git a/devel/libburn/pkg-message b/devel/libburn/pkg-message
index d573126b96a3..c366fecbdb86 100644
--- a/devel/libburn/pkg-message
+++ b/devel/libburn/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You will need to enable CAM support in the kernel.  Your kernel
 configuation should include:
     for SCSI CD/DVD devices:
@@ -14,3 +17,6 @@ In /etc/devfs.rules, add the following:
 	add path 'cd*' mode 0666
 	add path 'pass*' mode 0666
 	add path 'xpt*' mode 0666
+EOM
+}
+]
diff --git a/devel/libdlmalloc/pkg-message b/devel/libdlmalloc/pkg-message
index 5fef536e12d7..af62d92f7eb7 100644
--- a/devel/libdlmalloc/pkg-message
+++ b/devel/libdlmalloc/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Please see http://g.oswego.edu/dl/html/malloc.html or the distribution file
 (malloc-<ver>.c) for documenation on the use of Doug Lea's malloc library.
+EOM
+}
+]
diff --git a/devel/libgtop/files/pkg-message b/devel/libgtop/files/pkg-message
index dacaf62a9c39..0c0d2efec8a9 100644
--- a/devel/libgtop/files/pkg-message
+++ b/devel/libgtop/files/pkg-message
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 In order to use the File System read/write monitor, you must chmod
 /dev/devstat so that all users can open it read-only.  For example:
 
@@ -9,5 +10,6 @@ In order for this to persist across reboots, add the following to
 /etc/devfs.conf:
 
 perm	devstat	0444
-
-===============================================================================
+EOM
+}
+]
diff --git a/devel/libinotify/pkg-message b/devel/libinotify/pkg-message
index 50a688d8621f..e2862709c827 100644
--- a/devel/libinotify/pkg-message
+++ b/devel/libinotify/pkg-message
@@ -1,5 +1,6 @@
-============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Libinotify functionality on FreeBSD is missing support for
 
   - detecting a file being moved into or out of a directory within the
@@ -32,8 +33,9 @@ notifications are available from:
 
 https://github.com/libinotify-kqueue/libinotify-kqueue/tree/master/patches
 
-=============================================================================
 You might want to consider increasing the kern.maxfiles tunable if you plan
 to use this library for applications that need to monitor activity of a lot
 of files.
-=============================================================================
+EOM
+}
+]
diff --git a/devel/liblognorm/files/pkg-message.in b/devel/liblognorm/files/pkg-message.in
index 3f92c6d0fa75..d7322863a023 100644
--- a/devel/liblognorm/files/pkg-message.in
+++ b/devel/liblognorm/files/pkg-message.in
@@ -1,7 +1,7 @@
-***********************************************************************
-
-WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING
-
+[
+{ type: upgrade
+  maximum_versio: 0.3.8
+  message: <<EOM
 The previous version of liblognorm (0.3.7) used the libee CEE support
 library in its API.
 
@@ -13,7 +13,6 @@ no way to avoid that, obviously...).
 The current library is the result of that effort. Application developers
 are encouraged to switch to this version, as it provides the benefit of
 a simpler API. PREVIOUS VERSIONS ARE INCOMPATIBLE WITH THIS ONE
-
-WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING
-
-***********************************************************************
+EOM
+}
+]
diff --git a/devel/libnxt/files/pkg-message.in b/devel/libnxt/files/pkg-message.in
index b5a3721e16fc..2f07ea4fa093 100644
--- a/devel/libnxt/files/pkg-message.in
+++ b/devel/libnxt/files/pkg-message.in
@@ -1,7 +1,10 @@
-
--------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Using libnxt in your programs will require the following compile options:
 
 	-I%%PREFIX%%/include/libnxt
 	-L%%PREFIX%%/lib -lnxt
--------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/libopensync/pkg-message b/devel/libopensync/pkg-message
index 734892f05e6d..6f6dafc19bec 100644
--- a/devel/libopensync/pkg-message
+++ b/devel/libopensync/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Think about using a multisync-gui, start by trying to sync your various devices
 and applications one by one with a directory; then try to assemble the devices
 in the way you want.
@@ -6,3 +9,6 @@ Do not disable the syncing of data, as it disables syncing everything.
 
 See http://www.opensync.org/wiki/DeviceCompatibilityList for a list of
 compatible devices.
+EOM
+}
+]
diff --git a/devel/libpasori/pkg-message b/devel/libpasori/pkg-message
index 14de2c8bebd7..46c74fbdd614 100644
--- a/devel/libpasori/pkg-message
+++ b/devel/libpasori/pkg-message
@@ -1,3 +1,7 @@
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
 Place your FeliCa card on PaSoRi before executing commands.
-******************************************************************************
+EOM
+}
+]
diff --git a/devel/libreadline-java/files/pkg-message.in b/devel/libreadline-java/files/pkg-message.in
index 4c02f1058fae..52a0cdc4ce53 100644
--- a/devel/libreadline-java/files/pkg-message.in
+++ b/devel/libreadline-java/files/pkg-message.in
@@ -1,5 +1,9 @@
---------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To use readline-java add the file
 %%JAVAJARDIR%%/libreadline-java.jar
 to your classpath!
---------------------------------------------------
+EOM
+}
+]
diff --git a/devel/libsigsegv/pkg-message b/devel/libsigsegv/pkg-message
index 048af0dadff5..2a9094bbc92c 100644
--- a/devel/libsigsegv/pkg-message
+++ b/devel/libsigsegv/pkg-message
@@ -1,4 +1,8 @@
-====
+[
+{ type: install
+  message: <<EOM
 Note that the stackoverflow handling functions of this library need
 procfs mounted on /proc.
-====
+EOM
+}
+]
diff --git a/devel/libvirt/files/pkg-message.in b/devel/libvirt/files/pkg-message.in
index 4c40cb26220c..22c44f7ed7a3 100644
--- a/devel/libvirt/files/pkg-message.in
+++ b/devel/libvirt/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 To enable libvirtd please add libvirtd_enable="YES" to
 /etc/rc.conf.
 
@@ -25,3 +27,6 @@ to take effect.
 %%BHYVE%%   or:
 %%BHYVE%% http://libvirt.org/drvbhyve.html
 %%BHYVE%%
+EOM
+}
+]
diff --git a/devel/linux-ltp/pkg-message b/devel/linux-ltp/pkg-message
index f37e8dd185b0..d00c33993032 100644
--- a/devel/linux-ltp/pkg-message
+++ b/devel/linux-ltp/pkg-message
@@ -1,7 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 To run the LTP test suite, execute, as root:
 
     kldload linux linux64
     mount -t linsysfs linsysfs /compat/linux/sys
     mount -t linprocfs linprocfs /compat/linux/proc
     chroot /compat/linux /opt/ltp/runltp -Q
-
+EOM
+}
+]
diff --git a/devel/magit/pkg-message b/devel/magit/pkg-message
index f4a23d6a21b1..c9bce0ac8361 100644
--- a/devel/magit/pkg-message
+++ b/devel/magit/pkg-message
@@ -1,6 +1,9 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To use Magit, you should add following line to your .emacs file:
 
 (require 'magit)
-
-**********************************************************************
+EOM
+}
+]
diff --git a/devel/mercurial/files/pkg-message.in b/devel/mercurial/files/pkg-message.in
index 1c3fb24eb795..6c3fa727042f 100644
--- a/devel/mercurial/files/pkg-message.in
+++ b/devel/mercurial/files/pkg-message.in
@@ -1,7 +1,11 @@
-====
+[
+{ type: install
+  message: <<EOM
 Note that we now install a few more files in %%PREFIX%%/share/mercurial:
 - shell completion scripts (bash, tcsh and zsh)
 - FastCGI / WSGI scripts for web access to repositories
   see http://www.mercurial-scm.org/wiki/PublishingRepositories
 - various documentation files
-====
+EOM
+}
+]
diff --git a/devel/monotone/files/pkg-message.in b/devel/monotone/files/pkg-message.in
index 9de90e2a8e0c..7d168f8fff83 100644
--- a/devel/monotone/files/pkg-message.in
+++ b/devel/monotone/files/pkg-message.in
@@ -1,4 +1,8 @@
-*****************************************************************************
+[
+{ type: install
+  message: <<EOM
 You have installed the monotone package. For users who are upgrating monotone,
 please read %%DOCSDIR%%/UPGRADE for upgrade instructions.
-*****************************************************************************
+EOM
+}
+]
diff --git a/devel/msp430-debug-stack/files/pkg-message.in b/devel/msp430-debug-stack/files/pkg-message.in
index af7ea92a598e..c7698518c5da 100644
--- a/devel/msp430-debug-stack/files/pkg-message.in
+++ b/devel/msp430-debug-stack/files/pkg-message.in
@@ -1,8 +1,10 @@
--------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 	When plugging in FET debuggers a symlink will be created from
 	the corresponding cuaU device to mspfetXX with XX being the
 	product number (see mspfet.conf).
         Only a single instance of each FET product is supported.
-
--------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/nexus2-oss/files/pkg-message.in b/devel/nexus2-oss/files/pkg-message.in
index 3ef7c7c7d7ef..60dd2b310d1d 100644
--- a/devel/nexus2-oss/files/pkg-message.in
+++ b/devel/nexus2-oss/files/pkg-message.in
@@ -1,4 +1,6 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 Nexus Repository Manager OSS %%VERSION%% has been successfully installed!
 
 To enable Nexus, add the following line to /etc/rc.conf[.local]:
@@ -28,4 +30,6 @@ Documentation
 =============
 Further documentation can be found in the official Nexus Book at:
   https://books.sonatype.com/nexus-book/%%BOOKVERSION%%/reference/index.html
-========================================================================
+EOM
+}
+]
diff --git a/devel/oozie/files/pkg-message.in b/devel/oozie/files/pkg-message.in
index 7ef1a7a2d9f0..912b6912c9e7 100644
--- a/devel/oozie/files/pkg-message.in
+++ b/devel/oozie/files/pkg-message.in
@@ -1,3 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 Oozie was installed into %%PREFIX%%/oozie directory.  Consider adding
 %%PREFIX%%/oozie/bin to your $PATH.
+EOM
+}
+]
diff --git a/devel/opencl/pkg-message b/devel/opencl/pkg-message
index fc2135da3e2b..f9028c1e973f 100644
--- a/devel/opencl/pkg-message
+++ b/devel/opencl/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 OpenCL is the first open, royalty-free standard for cross-platform,
 parallel programming of modern processors.
+EOM
+}
+]
diff --git a/devel/openocd/pkg-message b/devel/openocd/pkg-message
index b2883a39ea2c..1f20e5f3fb7e 100644
--- a/devel/openocd/pkg-message
+++ b/devel/openocd/pkg-message
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 OpenOCD is now installed, this software can damage your hardware, enjoy!
 
 User's guide is at:
@@ -20,5 +21,6 @@ FreeBSD USB NOTE:
 
  ***/etc/rc.conf:
 	devfs_system_ruleset="localrules"
-
-===============================================================================
+EOM
+}
+]
diff --git a/devel/p5-Heap-Simple/pkg-message b/devel/p5-Heap-Simple/pkg-message
index 1d35356dd29a..762be4fcadf5 100644
--- a/devel/p5-Heap-Simple/pkg-message
+++ b/devel/p5-Heap-Simple/pkg-message
@@ -1,11 +1,12 @@
-
-******************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 This module is useless by itself!  It requires one or both of:
 
 - devel/p5-Heap-Simple-Perl (a pure perl implementation of the interface)
 - devel/p5-Heap-Simple-XS (an XS implementation of the interface.)
 
 Please take the time to install one or both of these now.
-
-******************************************************************************
+EOM
+}
+]
diff --git a/devel/p5-Moose/pkg-message b/devel/p5-Moose/pkg-message
index 61b0b7812ccf..3cf52b6a75c3 100644
--- a/devel/p5-Moose/pkg-message
+++ b/devel/p5-Moose/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Note that this release of p5-Moose is incompatible with
 older versions of the following modules:
 
@@ -29,3 +32,6 @@ older versions of the following modules:
        Pod::Elemental                  <= 0.093280
 
 They will need to be updated.
+EOM
+}
+]
diff --git a/devel/p5-ResourcePool/pkg-message b/devel/p5-ResourcePool/pkg-message
index c885f969ed79..3ae5a5eb8508 100644
--- a/devel/p5-ResourcePool/pkg-message
+++ b/devel/p5-ResourcePool/pkg-message
@@ -1,8 +1,10 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 From this version 1.0000 on, the p5-ResourcePool package will not contain
 resource bindings anymore. The previously included bindings for
 DBI and Net::LDAP are available in the databases/p5-ResourcePool-Resource-DBI
 and net/p5-ResourcePool-Resource-Net-LDAP ports.
-
-==============================================================================
+EOM
+}
+]
diff --git a/devel/p5-SVN-Web/pkg-message b/devel/p5-SVN-Web/pkg-message
index ecf1d5114471..442b8a75b147 100644
--- a/devel/p5-SVN-Web/pkg-message
+++ b/devel/p5-SVN-Web/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 After install, use svnweb-install to configure SVN::Web.
 Use perldoc SVN::Web for more information.
+EOM
+}
+]
diff --git a/devel/papi/pkg-message b/devel/papi/pkg-message
index 441d4f2d21fa..f7cba7768dad 100644
--- a/devel/papi/pkg-message
+++ b/devel/papi/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to get PAPI working on this machine you must setup a kernel with
 
  * options HWPMC_HOOKS
@@ -9,3 +12,6 @@ Or load hwpmc module manually:
 
 Additionally, for i386 systems you need:
  * device apic
+EOM
+}
+]
diff --git a/devel/pcsc-lite/files/pkg-message.in b/devel/pcsc-lite/files/pkg-message.in
index 23858dce17ca..c67dca1a8fd6 100644
--- a/devel/pcsc-lite/files/pkg-message.in
+++ b/devel/pcsc-lite/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 PC/SC-Lite has been installed.
 
 You need to install a driver for your smartcard reader e.g.,
@@ -22,5 +23,6 @@ detach 100 {
         device-name "ugen[0-9]+";
         action "%%PREFIX%%/sbin/pcscd -H";
 };
-
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/pecl-xdebug/files/pkg-message.in b/devel/pecl-xdebug/files/pkg-message.in
index 40b8ca11dcb6..52bfa3315ea8 100644
--- a/devel/pecl-xdebug/files/pkg-message.in
+++ b/devel/pecl-xdebug/files/pkg-message.in
@@ -1,4 +1,6 @@
-*****************************************************************************
+[
+{ type: install
+  message: <<EOM
 The php debugger 'xdebug' has been installed successful.
 Add a line containing
 
@@ -17,5 +19,6 @@ Add following section to enable profiling:
 
 xdebug.profiler_enable = 1
 xdebug.profiler_output_dir = /tmp/profiler
-
-*****************************************************************************
+EOM
+}
+]
diff --git a/devel/phabricator/files/pkg-message.in b/devel/phabricator/files/pkg-message.in
index 5c0291d96ac6..2130c4cd6b90 100644
--- a/devel/phabricator/files/pkg-message.in
+++ b/devel/phabricator/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run the phabricator daemons from startup, add phd_enable="YES"
 to /etc/rc.conf. You can control the daemons using
 
@@ -70,3 +73,6 @@ Match User git
  PermitTunnel no
  X11Forwarding no
 ========================================================================
+EOM
+}
+]
diff --git a/devel/php-libawl/pkg-message b/devel/php-libawl/pkg-message
index 071f37bbdc6e..0b7764385fc4 100644
--- a/devel/php-libawl/pkg-message
+++ b/devel/php-libawl/pkg-message
@@ -1,7 +1,8 @@
-
-#########################################################
-
+[
+{ type: install
+  message: <<EOM
      you can customize the installation directory"
      by setting LIBAWLDIR in /etc/make.conf"
-
-#########################################################
+EOM
+}
+]
diff --git a/devel/phpbt/files/pkg-message.in b/devel/phpbt/files/pkg-message.in
index 6a0047aa6437..021e4c221fe5 100644
--- a/devel/phpbt/files/pkg-message.in
+++ b/devel/phpbt/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 FreeBSD phpBugTracker installation instructions:
 
 Optional: Install JpGraph (http://www.aditus.nu/jpgraph/) if you
@@ -18,5 +19,6 @@ wish to use it.
 * Note: You must have magic_quotes_gpc set to On either in php.ini
 or in .htaccess (see http://www.php.net/manual/en/configuration.php
 for more info).
-
-==========================================================================
+EOM
+}
+]
diff --git a/devel/phpsh/pkg-message b/devel/phpsh/pkg-message
index 5c04a41266ee..0c8f7ec5db97 100644
--- a/devel/phpsh/pkg-message
+++ b/devel/phpsh/pkg-message
@@ -1,5 +1,7 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 GEBEN functionality included in phpsh is not tested yet. Patches are welcome.
-
-==============================================================================
+EOM
+}
+]
diff --git a/devel/plasma/pkg-message b/devel/plasma/pkg-message
index 7a228357c758..e43151934914 100644
--- a/devel/plasma/pkg-message
+++ b/devel/plasma/pkg-message
@@ -1,11 +1,12 @@
-
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use the visual mode (command 'v' in the interactive mode) the terminal must
 support 256 colors. 
 
 For xterm this can be enabled by
 
 export TERM=xterm-256color
-
-==============================================================================
+EOM
+}
+]
diff --git a/devel/pmdk/pkg-message b/devel/pmdk/pkg-message
index 3926b82bbe9a..bf36b8906bf7 100644
--- a/devel/pmdk/pkg-message
+++ b/devel/pmdk/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 pmdk requires procfs(5). Add this line to your fstab(5):
 proc /proc procfs rw 0 0
+EOM
+}
+]
diff --git a/devel/psvn/pkg-message b/devel/psvn/pkg-message
index 4a4a93efa6e2..648032ace712 100644
--- a/devel/psvn/pkg-message
+++ b/devel/psvn/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 To use psvn, add the following line to your ~/.emacs:
 
 (require 'psvn)
 
 Start the svn interface with `M-x svn-status'.
+EOM
+}
+]
diff --git a/devel/py-QtPy/pkg-message b/devel/py-QtPy/pkg-message
index 099d4512ca23..d16c88179e80 100644
--- a/devel/py-QtPy/pkg-message
+++ b/devel/py-QtPy/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed py-QtPy: the abstraction layer on top of Qt bindings.
 
 One of PyQt5, PyQt4, PySide2 or PySide bindings is required to be
@@ -7,4 +9,6 @@ bindings, PyQt5 will be chosen first when available.
 
 The QT_API environment variable can be used to force a particular
 binding.
-======================================================================
+EOM
+}
+]
diff --git a/devel/py-aspects/files/pkg-message.in b/devel/py-aspects/files/pkg-message.in
index 9401bd2ac97e..8403bb520de3 100644
--- a/devel/py-aspects/files/pkg-message.in
+++ b/devel/py-aspects/files/pkg-message.in
@@ -1,8 +1,11 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 aspects is installed.
 
 For a quick start:
     - examples files are in PREFIX/share/examples/py-aspects/
     - import aspects for using the module
-
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/py-aspyct/pkg-message b/devel/py-aspyct/pkg-message
index 565a968ab91b..17da669de0ca 100644
--- a/devel/py-aspyct/pkg-message
+++ b/devel/py-aspyct/pkg-message
@@ -1,7 +1,11 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 py-aspyct is installed.
 
 For a quick start:
     - import Aspyct for using this module
     - read http://www.aspyct.org/doku.php?id=aspyct-doc
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/py-gitosis/pkg-message b/devel/py-gitosis/pkg-message
index e4f9c6c70439..dfda4ca95343 100644
--- a/devel/py-gitosis/pkg-message
+++ b/devel/py-gitosis/pkg-message
@@ -1,5 +1,7 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 For more information, see https://github.com/tv42/gitosis/blob/master/README.rst
-
-================================================================================
+EOM
+}
+]
diff --git a/devel/py-http-prompt/files/pkg-message.in b/devel/py-http-prompt/files/pkg-message.in
index 405aee9b8ba3..713a9c278233 100644
--- a/devel/py-http-prompt/files/pkg-message.in
+++ b/devel/py-http-prompt/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 For the output colors work properly you need to use LESS as your 
 default pager instead of MORE.
 
@@ -7,4 +9,6 @@ $ export PAGER=less
 
 csh:
 $ setenv PAGER less
-======================================================================
+EOM
+}
+]
diff --git a/devel/py-mercurialserver/files/pkg-message.in b/devel/py-mercurialserver/files/pkg-message.in
index d656c5ed7789..15567970bb85 100644
--- a/devel/py-mercurialserver/files/pkg-message.in
+++ b/devel/py-mercurialserver/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 NOTE: %%PORTNAME%% has been patched to use %%PREFIX%%/etc/%%PORTNAME%%
       instead of /etc/mercurial-server
 
 Now you need to create %%HGUSER%% home (if nessacery) and run
       %%PREFIX%%/etc/hginit as %%HGUSER%% user from home directory
+EOM
+}
+]
diff --git a/devel/py-os-brick/pkg-message b/devel/py-os-brick/pkg-message
index a99ff34ba30a..7567fb2b4a44 100644
--- a/devel/py-os-brick/pkg-message
+++ b/devel/py-os-brick/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Please note that this is a development version.
 Only initial NFS support was added.
 
 Enable NFS client in rc.conf
 # sysrc nfs_client_enable="YES"
+EOM
+}
+]
diff --git a/devel/py-pip/pkg-message b/devel/py-pip/pkg-message
index 736e6cae94cc..e32ef95062a6 100644
--- a/devel/py-pip/pkg-message
+++ b/devel/py-pip/pkg-message
@@ -1,5 +1,6 @@
-============================== !!!! WARNING !!!! ==========================
-
+[
+{ type: install
+  message: <<EOM
 pip MUST ONLY be used:
 
  * With the --user flag, OR
@@ -10,5 +11,6 @@ system-wide Python environment (LOCALBASE/lib/pythonX.Y/site-packages) and
 cause errors.
 
 Avoid using pip as root unless you know what you're doing.
-
-============================== !!!! WARNING !!!! ==========================
+EOM
+}
+]
diff --git a/devel/py-python-gitlab/files/pkg-message.in b/devel/py-python-gitlab/files/pkg-message.in
index fdcffd877a91..e5af3454a473 100644
--- a/devel/py-python-gitlab/files/pkg-message.in
+++ b/devel/py-python-gitlab/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Add %%PREFIX%%/etc/python-gitlab.cfg or ~/.python-gitlab.cfg
 
 See https://github.com/python-gitlab/python-gitlab/blob/master/docs/cli.rst
 for CLI configutation details
+EOM
+}
+]
diff --git a/devel/py-q/files/pkg-message.in b/devel/py-q/files/pkg-message.in
index e476bf9063f0..91a9bb0f476e 100644
--- a/devel/py-q/files/pkg-message.in
+++ b/devel/py-q/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Instructions for using devel/py-q can be found in the supplied docs:
 
   %%DOCSDIR%%/README.md
 
 Or video http://pyvideo.org/video/1858/sunday-evening-lightning-talks#t=25m15
+EOM
+}
+]
diff --git a/devel/py-setuptools/files/pkg-message.in b/devel/py-setuptools/files/pkg-message.in
index 1797c069d7a7..2c33be99f2e5 100644
--- a/devel/py-setuptools/files/pkg-message.in
+++ b/devel/py-setuptools/files/pkg-message.in
@@ -1,7 +1,8 @@
-
-*******************************************************************
-
+[
+{ type: install
+  message: <<EOM
   Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed
   since Python %%PYTHON_VER%% is not the default Python version.
-
-*******************************************************************
+EOM
+}
+]
diff --git a/devel/py-ua_parser/files/pkg-message.in b/devel/py-ua_parser/files/pkg-message.in
index 8cba99da9104..868e4623d511 100644
--- a/devel/py-ua_parser/files/pkg-message.in
+++ b/devel/py-ua_parser/files/pkg-message.in
@@ -1,5 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 To allow user_agent_parser python module to find regexes.yaml file,
 define UA_PARSER_YAML environment variable to point to
 %%LOCALBASE%%/share/ua_parser/regexes.yaml
-
+EOM
+}
+]
diff --git a/devel/pycharm-ce/files/pkg-message.in b/devel/pycharm-ce/files/pkg-message.in
index 8333c38cb0ac..1e6f444bc43f 100644
--- a/devel/pycharm-ce/files/pkg-message.in
+++ b/devel/pycharm-ce/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 There is experimental native (faster) file watching support which is
 disabled by default.  Currently there are problems with watching large
 trees.  To enable edit %%DATADIR%%/bin/idea.properties and append
@@ -6,3 +9,6 @@ trees.  To enable edit %%DATADIR%%/bin/idea.properties and append
       idea.filewatcher.executable.path=%%IDEA_HOME%%/bin/fsnotifier
 
 Only enable fsnotifier if your projects have < 600 files.
+EOM
+}
+]
diff --git a/devel/pymacs/pkg-message b/devel/pymacs/pkg-message
index 5b0e82acb11f..a557a3b65c72 100644
--- a/devel/pymacs/pkg-message
+++ b/devel/pymacs/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Add the following to your emacs initialization file to enable pymacs:
 
 (autoload 'pymacs-apply "pymacs")
@@ -9,3 +12,6 @@ Add the following to your emacs initialization file to enable pymacs:
 
 See http://pymacs.progiciels-bpi.ca/pymacs.html for
 documentation on using pymacs.
+EOM
+}
+]
diff --git a/devel/rbenv/pkg-message b/devel/rbenv/pkg-message
index 4112951fe96e..65e46ae7e834 100644
--- a/devel/rbenv/pkg-message
+++ b/devel/rbenv/pkg-message
@@ -1,8 +1,10 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Load rbenv automatically by appending
 the following to ~/.bash_profile:
 
    eval "$(rbenv init -)"
-
-**********************************************************************
+EOM
+}
+]
diff --git a/devel/remotery/files/pkg-message.in b/devel/remotery/files/pkg-message.in
index 7ab50e97cd31..5d41df17a719 100644
--- a/devel/remotery/files/pkg-message.in
+++ b/devel/remotery/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Compiling the sample program
 ============================
 
@@ -11,3 +14,6 @@ Using the Remote Web Viewer
 ===========================
 
 Open %%DATADIR%%/index.html in a web browser.
+EOM
+}
+]
diff --git a/devel/rpm-spec-mode.el/pkg-message b/devel/rpm-spec-mode.el/pkg-message
index 27f2e4d5bc3b..1639b9de0073 100644
--- a/devel/rpm-spec-mode.el/pkg-message
+++ b/devel/rpm-spec-mode.el/pkg-message
@@ -1,11 +1,12 @@
-
-===================================================================
-
+[
+{ type: install
+  message: <<EOM
 Put this in your .emacs file to enable autoloading of rpm-spec-mode,
 and auto-recognition of ".spec" files:
 
  (autoload 'rpm-spec-mode "rpm-spec-mode.el" "RPM spec mode." t)
  (setq auto-mode-alist (append '(("\\.spec" . rpm-spec-mode))
                                auto-mode-alist))
-
-===================================================================
+EOM
+}
+]
diff --git a/devel/rth/files/pkg-message.in b/devel/rth/files/pkg-message.in
index a71ee56b0cbd..19076f0226e2 100644
--- a/devel/rth/files/pkg-message.in
+++ b/devel/rth/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 %%PKGNAME%% has been installed into:
 
     %%PREFIX%%/www/rth
@@ -31,4 +33,6 @@ that you add something like the following to httpd.conf:
             DirectoryIndex home_page.php
         </IfModule>
     </Directory>
-
+EOM
+}
+]
diff --git a/devel/sdl12/pkg-message.linjoy b/devel/sdl12/pkg-message.linjoy
index bde6eeadc96f..7f2847357bc8 100644
--- a/devel/sdl12/pkg-message.linjoy
+++ b/devel/sdl12/pkg-message.linjoy
@@ -1,7 +1,8 @@
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+[
+{ type: install
+  message: <<EOM
 Do not forget install webcamd with joystick support and run it,
 /dev/input/js* or /dev/input/event* device is required.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/devel/sdl12/pkg-message.vgl b/devel/sdl12/pkg-message.vgl
index 4d26f0bb3931..a816310a8b6c 100644
--- a/devel/sdl12/pkg-message.vgl
+++ b/devel/sdl12/pkg-message.vgl
@@ -1,8 +1,12 @@
-------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
  Your SDL library has been built with libvgl support, which means that you
  can run almost any SDL application straight on your console (VESA 2.0
  compatible videocard is required).
 
  To do this you have to load the vesa kernel module or enable it in your
  kernel, and set environment variable "SDL_VIDEODRIVER=vgl".
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/devel/sonar-ant-task/files/pkg-message.in b/devel/sonar-ant-task/files/pkg-message.in
index 1cf90c3484b7..b2ac40506d93 100644
--- a/devel/sonar-ant-task/files/pkg-message.in
+++ b/devel/sonar-ant-task/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
   To integrate SonarQube with SonarQube Scanner for Ant (default
   settings):
   - define a new sonar Ant target in your Ant build script
@@ -9,5 +10,6 @@
 
   More information:
   http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Ant
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/sonar-scanner-cli/files/pkg-message.in b/devel/sonar-scanner-cli/files/pkg-message.in
index 527524e0a8d7..3f44cd796b52 100644
--- a/devel/sonar-scanner-cli/files/pkg-message.in
+++ b/devel/sonar-scanner-cli/files/pkg-message.in
@@ -1,10 +1,12 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
   Before start the SonarQube Scanner (default settings):
   - create a new SONAR_RUNNER_HOME environment variable set to
     "/usr/local/sonar-scanner-cli"
 
   More information:
   http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/sonarqube/files/pkg-message.in b/devel/sonarqube/files/pkg-message.in
index fff031ae5dfe..2d93cc3d72c8 100644
--- a/devel/sonarqube/files/pkg-message.in
+++ b/devel/sonarqube/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 	Before start the SonarQube, prepare the Database and
 	the Web Server, when installing for the first time.
 
@@ -11,5 +12,6 @@
 
 	To run the SonarQube from startup, add sonarqube_enable="YES"
 	in your /etc/rc.conf
-
-************************************************************************
+EOM
+}
+]
diff --git a/devel/staf/pkg-message b/devel/staf/pkg-message
index dfd48bd227a4..29416bde882f 100644
--- a/devel/staf/pkg-message
+++ b/devel/staf/pkg-message
@@ -1,5 +1,6 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 STAFProc requires machine's hostname to be resolvable.
 
 If you haven't already, please add the following to /etc/hosts:
@@ -11,5 +12,6 @@ To verify do the following:
 
 	ping6 $(hostname)
 	ping  $(hostname)
-
-=====================================================================
+EOM
+}
+]
diff --git a/devel/statcvs/files/pkg-message.in b/devel/statcvs/files/pkg-message.in
index 43f552be1ca5..f1cd154c8f6f 100644
--- a/devel/statcvs/files/pkg-message.in
+++ b/devel/statcvs/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You have just installed StatCVS, a CVS repository activity report
 generator.
 
@@ -8,4 +10,6 @@ java -jar %%DATADIR%%/statcvs.jar
 
 Full usage instructions and command options are found at:
 http://statcvs.sourceforge.net/manual.html
-======================================================================
+EOM
+}
+]
diff --git a/devel/statsvn/pkg-message b/devel/statsvn/pkg-message
index ed9c12687ecb..d9e11c69fa3c 100644
--- a/devel/statsvn/pkg-message
+++ b/devel/statsvn/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Manual: https://wiki.statsvn.org/User%20Manual.ashx
+EOM
+}
+]
diff --git a/devel/subversion-lts/files/pkg-message.in b/devel/subversion-lts/files/pkg-message.in
index 4f8ad51be2da..fb11b255c24b 100644
--- a/devel/subversion-lts/files/pkg-message.in
+++ b/devel/subversion-lts/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 The subversion dav modules are no longer activated in httpd.conf!
 There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
+EOM
+}
+]
diff --git a/devel/subversion/files/pkg-message.in b/devel/subversion/files/pkg-message.in
index 4f8ad51be2da..fb11b255c24b 100644
--- a/devel/subversion/files/pkg-message.in
+++ b/devel/subversion/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 The subversion dav modules are no longer activated in httpd.conf!
 There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
+EOM
+}
+]
diff --git a/devel/svntrac/pkg-message b/devel/svntrac/pkg-message
index ae2b3a8fcd7d..0dabc2b4ca2f 100644
--- a/devel/svntrac/pkg-message
+++ b/devel/svntrac/pkg-message
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 Please follow the detailed installation instructions in the CVSTrac
 Wiki at http://www.cvstrac.org/cvstrac/wiki?p=SvnTrac for information
 on how to get SvnTrac up and running in your preferred configuration.
+EOM
+}
+]
diff --git a/devel/tig/pkg-message-git b/devel/tig/pkg-message-git
index 95c3f57cc011..9cf7166699dd 100644
--- a/devel/tig/pkg-message-git
+++ b/devel/tig/pkg-message-git
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Required to (post-)install devel/git* port as runtime dependency.
+EOM
+}
+]
diff --git a/devel/tigcc/files/pkg-message.in b/devel/tigcc/files/pkg-message.in
index 3479359790f9..cd2a20c9fadf 100644
--- a/devel/tigcc/files/pkg-message.in
+++ b/devel/tigcc/files/pkg-message.in
@@ -1,5 +1,6 @@
-	ATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 TIGCC is now installed but in order for it
 to work you need to define some stuff.
 
@@ -14,3 +15,6 @@ setenv TIGCC	%%PREFIX%%/tigcc
 setenv PATH	$PATH:$TIGCC/bin
 
 into the .cshrc file in your home directory.
+EOM
+}
+]
diff --git a/devel/tortoisehg/files/pkg-message.in b/devel/tortoisehg/files/pkg-message.in
index 75b6ebe825ae..feb98d8f5ebb 100644
--- a/devel/tortoisehg/files/pkg-message.in
+++ b/devel/tortoisehg/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 It is recommended to %include TortoiseHG's mergetools.rc into your ~/.hgrc file,
 especially if you use textproc/kdiff3 as your merge tool:
 
 %include %%PREFIX%%/share/tortoisehg/mergetools.rc
+EOM
+}
+]
diff --git a/devel/trac-bitten/files/pkg-message.in b/devel/trac-bitten/files/pkg-message.in
index 4505d999f444..41063aee5d5f 100644
--- a/devel/trac-bitten/files/pkg-message.in
+++ b/devel/trac-bitten/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 If your system is the build master, i.e. it is the system that runs
 the Trac instance and integrates with the SCM, you need to configure
 Trac to load the Bitten plugin and give permissions to the build
@@ -10,3 +13,6 @@ username and password appropriately for the build slaves.
 
 For more detailed instructions please have a look at the documentation
 at http://bitten.edgewall.org/wiki/Documentation/install.html
+EOM
+}
+]
diff --git a/devel/truc/files/pkg-message.in b/devel/truc/files/pkg-message.in
index c6ee25682f6b..a1a087b677d8 100644
--- a/devel/truc/files/pkg-message.in
+++ b/devel/truc/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 %%PKGNAME%% has been installed into:
 
     %%PREFIX%%/www/truc
@@ -30,4 +32,6 @@ that you add something like the following to httpd.conf:
 Point your browser to http://localhost/truc/, follow the
 instructions to create a config file and save it into
 truc's root directory.
-
+EOM
+}
+]
diff --git a/devel/valgrind/pkg-message b/devel/valgrind/pkg-message
index a95f7b8a04b6..999db08e752f 100644
--- a/devel/valgrind/pkg-message
+++ b/devel/valgrind/pkg-message
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 	Known problems:
 	1) DRD/Helgrind tool gives excessive false-positivies for the
 	   internals of pthreads library.  This is now under
@@ -9,5 +10,6 @@
 	If you'll encounter any problems when using Valgrind do not
 	hesitate to contact the maintainer with the description of
 	these problems.
-
-==========================================================================
+EOM
+}
+]
diff --git a/devel/viewvc/files/pkg-message.in b/devel/viewvc/files/pkg-message.in
index ea4dc8da3006..9c76cbf6c44a 100644
--- a/devel/viewvc/files/pkg-message.in
+++ b/devel/viewvc/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************
-
+[
+{ type: install
+  message: <<EOM
  To use ViewVC, modify the configuration file located at
  %%PREFIX%%/viewvc/viewvc.conf.
 
@@ -54,5 +55,6 @@
        ".cgi" => "%%PYTHON_CMD%%",
      )
  }
-
-*****************************************************************
+EOM
+}
+]
diff --git a/devel/visualparadigm/pkg-message b/devel/visualparadigm/pkg-message
index 83a54b9d1c36..354d17158307 100644
--- a/devel/visualparadigm/pkg-message
+++ b/devel/visualparadigm/pkg-message
@@ -1,4 +1,8 @@
-******************************************************************
+[
+{ type: install
+  message: <<EOM
 Visit http://www.visual-paradigm.com/ to get either a community or
 an enterprise license key
-******************************************************************
+EOM
+}
+]
diff --git a/devel/websvn/files/pkg-message.in b/devel/websvn/files/pkg-message.in
index 498653a6e77e..b36c8fe24876 100644
--- a/devel/websvn/files/pkg-message.in
+++ b/devel/websvn/files/pkg-message.in
@@ -1,7 +1,11 @@
-----------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To setup WebSVN, please edit the configuration file:
 %%WWWDIR%%/include/config.php
 
 and modify your web server's configuration to serve
 WebSVN actually!
-----------------------------------------------------
+EOM
+}
+]
diff --git a/devel/xc3sprog/pkg-message b/devel/xc3sprog/pkg-message
index 2a391b59a5a6..1e66953eb605 100644
--- a/devel/xc3sprog/pkg-message
+++ b/devel/xc3sprog/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Visit:
 
 	http://wiki.freebsd.org/FPGA/
 
 for FreeBSD-specific usage.
+EOM
+}
+]
diff --git a/devel/youcompleteme/files/pkg-message.in b/devel/youcompleteme/files/pkg-message.in
index d4772d20c0fd..5cc471ef7015 100644
--- a/devel/youcompleteme/files/pkg-message.in
+++ b/devel/youcompleteme/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For JavaScript Semantic Completion:
 	cd %%VIMFILESDIR%%/third_party/ycmd/third_party/tern_runtime
 	pkg install npm
@@ -7,3 +10,6 @@ For TypeScript Semantic Completion:
 	pkg install npm
 	npm install -g typescript
 
+EOM
+}
+]
diff --git a/devel/zanata-platform/pkg-message b/devel/zanata-platform/pkg-message
index 20266f7002cc..73a706b02219 100644
--- a/devel/zanata-platform/pkg-message
+++ b/devel/zanata-platform/pkg-message
@@ -1,6 +1,8 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 For installation instructions of devel/zanata-platform port, visit
 https://wiki.freebsd.org/Zanata/Install
-
-===============================================================================
+EOM
+}
+]
diff --git a/devel/zeal/pkg-message b/devel/zeal/pkg-message
index 207d90e851d4..226c00602da2 100644
--- a/devel/zeal/pkg-message
+++ b/devel/zeal/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 After installing Zeal, you need to download docsets.
 
 Go to Tools->Docsets, select the ones you want, and click the Download
@@ -5,3 +8,6 @@ button.
 
 You can also create your own docsets by following these instructions:
 https://kapeli.com/docsets
+EOM
+}
+]
diff --git a/dns/adsuck/files/pkg-message.in b/dns/adsuck/files/pkg-message.in
index cc377f4315c1..608a3faed546 100644
--- a/dns/adsuck/files/pkg-message.in
+++ b/dns/adsuck/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-
+[
+{ type: install
+  message: <<EOM
 Quick way to use adsuck chrooted in /var/adsuck
 
 mkdir /var/adsuck
@@ -17,5 +18,6 @@ echo "nameserver 127.0.0.1" > /etc/resolv.conf
 
 If you're using DHCP consider configuring your dhclient.conf(5) to prevent
 resolv.conf updates.
-
-
+EOM
+}
+]
diff --git a/dns/bindgraph/pkg-message b/dns/bindgraph/pkg-message
index 34faeed075ae..7484a16c5def 100644
--- a/dns/bindgraph/pkg-message
+++ b/dns/bindgraph/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To get bindgraph working, you have to set querylog for bind. An example
 named.conf will be
 
@@ -10,3 +13,6 @@ named.conf will be
   };
 
 Make sure BINDGRAPH_USER (default www) can read this log file.
+EOM
+}
+]
diff --git a/dns/checkdns/files/pkg-message.in b/dns/checkdns/files/pkg-message.in
index e44e163e4f29..b421700da7e6 100644
--- a/dns/checkdns/files/pkg-message.in
+++ b/dns/checkdns/files/pkg-message.in
@@ -1,8 +1,12 @@
-   --------------------------------------------------------------------
-  |            >>> ATTENTION PLEASE <<<                                |
-  |                                                                    |
-  |   Please don't forget these :                                      |
-  |         - editing %%PREFIX%%/etc/checkdns.conf file !              |
-  |         - copying checkdns.css file to Html Output Directory !     |
-  |                                                                    |
-   --------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
+              >>> ATTENTION PLEASE <<<
+
+     Please don't forget these :
+           - editing %%PREFIX%%/etc/checkdns.conf file !
+           - copying checkdns.css file to Html Output Directory !
+
+EOM
+}
+]
diff --git a/dns/cli53/pkg-message b/dns/cli53/pkg-message
index bd48b2ebc3b8..e9d208f429b3 100644
--- a/dns/cli53/pkg-message
+++ b/dns/cli53/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please configure your AWS credentials, either through environment variables or
 ~/.aws/credentials config file.
 
@@ -17,3 +20,6 @@ You can switch between different sets in the credentials file by passing
 
 For example:
     cli53 list --profile my_profile
+EOM
+}
+]
diff --git a/dns/credns/pkg-message b/dns/credns/pkg-message
index 8f63a4185dd7..9786a03f8b52 100644
--- a/dns/credns/pkg-message
+++ b/dns/credns/pkg-message
@@ -1,10 +1,12 @@
-**************************************************************************
-*                                                                        *
-*   To run credns from startup, add credns_enable="YES"                  *
-*   to your /etc/rc.conf                                                 *
-*                                                                        *
-*   Take good care when using credns commands, since they often need to  *
-*   be executed as user dedicated to credns, in order for the files it   *
-*   touches or creates to have the proper permissions.                   *
-*                                                                        *
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
+   To run credns from startup, add credns_enable="YES"
+   to your /etc/rc.conf
+
+   Take good care when using credns commands, since they often need to
+   be executed as user dedicated to credns, in order for the files it
+   touches or creates to have the proper permissions.
+EOM
+}
+]
diff --git a/dns/curvedns/files/pkg-message.in b/dns/curvedns/files/pkg-message.in
index 9daef969e220..9e3a4dd04f20 100644
--- a/dns/curvedns/files/pkg-message.in
+++ b/dns/curvedns/files/pkg-message.in
@@ -1,5 +1,6 @@
-###########################################################
-
+[
+{ type: install
+  message: <<EOM
  To start using curvedns, finish the following tasks:
 
 ------- generate/install keys -----------------------------
@@ -29,5 +30,6 @@
  # examples:
  dig @<curvedns-ip> auth-dom.example any
  drill <curvedns-ip> auth-dom.example any
-
-###########################################################
+EOM
+}
+]
diff --git a/dns/ddclient/files/pkg-message.in b/dns/ddclient/files/pkg-message.in
index a320b5b7808b..226e65398842 100644
--- a/dns/ddclient/files/pkg-message.in
+++ b/dns/ddclient/files/pkg-message.in
@@ -1,5 +1,6 @@
-***********************************************************
-
+[
+{ type: install
+  message: <<EOM
 To configure ddclient, edit the following file:
 
 	%%PREFIX%%/etc/ddclient.conf
@@ -14,5 +15,6 @@ daily regardless of IP changes add the following line to
 your /etc/periodic.conf
 
 	daily_ddclient_force_enable="YES"
-
-***********************************************************
+EOM
+}
+]
diff --git a/dns/ddns/files/pkg-message.in b/dns/ddns/files/pkg-message.in
index 72ae93afa443..0d039f8a68fb 100644
--- a/dns/ddns/files/pkg-message.in
+++ b/dns/ddns/files/pkg-message.in
@@ -1,4 +1,6 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 ddns configuration files were installed in the following directory:
 
 	%%ETCDIR%%
@@ -38,4 +40,6 @@ Then you can start a ddns daemon by issuing the following command:
     or
 
 	%%PREFIX%%/etc/rc.d/ddns_client start
-========================================================================
+EOM
+}
+]
diff --git a/dns/dns2blackhole/pkg-message b/dns/dns2blackhole/pkg-message
index 813b8ce6b66a..403583aadda2 100644
--- a/dns/dns2blackhole/pkg-message
+++ b/dns/dns2blackhole/pkg-message
@@ -1,9 +1,11 @@
-########################################################################
-
+[
+{ type: install
+  message: <<EOM
                       dns2blackhole
 
    Malware Prevention through Domain Blocking (Black Hole)
 
    Issue "man dns2blackhole"  For configuration and usage information
-
-########################################################################
+EOM
+}
+]
diff --git a/dns/dnscheckengine/files/pkg-message.in b/dns/dnscheckengine/files/pkg-message.in
index 10a3212947b9..c7953d00e17f 100644
--- a/dns/dnscheckengine/files/pkg-message.in
+++ b/dns/dnscheckengine/files/pkg-message.in
@@ -1,11 +1,10 @@
-*************************************************************************
-*	    _  _____ _____ _____ _   _ _____ ___ ___  _   _ 		*
-*	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |		*
-*	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |		*
-*	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
-*	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
-*                                                                       *
-*************************************************************************
+[
+{ type: install
+  message: <<EOM
+	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |
+	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |
+	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |
+	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|
 
 The DNSCheck software included in the port is the PERL-based engine and
 includes a command line utility that uses that engine in %%PREFIX%%/bin
@@ -32,3 +31,6 @@ Academ Consulting Services
 http://www.stanbarber.com
 http://www.academ.com
 
+EOM
+}
+]
diff --git a/dns/dnscrypt-proxy2/files/pkg-message.in b/dns/dnscrypt-proxy2/files/pkg-message.in
index ba894e3b62c3..9d5b29a5b6cf 100644
--- a/dns/dnscrypt-proxy2/files/pkg-message.in
+++ b/dns/dnscrypt-proxy2/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 Version 2 of dnscrypt-proxy is written in Go and therefore isn't capable
 of dropping privileges after binding to a low port on FreeBSD.
 
@@ -56,4 +58,6 @@ Below are a few examples on how to redirect local connections from port
   If you are using local_unbound, DNSSEC is enabled by default. You should
   comment the "auto-trust-anchor-file" line or change dnscrypt-proxy to use
   servers with DNSSEC support only.
-======================================================================
+EOM
+}
+]
diff --git a/dns/dnsmasq-devel/files/pkg-message.in b/dns/dnsmasq-devel/files/pkg-message.in
index 4ec9add459b7..adcbeb5d5375 100644
--- a/dns/dnsmasq-devel/files/pkg-message.in
+++ b/dns/dnsmasq-devel/files/pkg-message.in
@@ -1,7 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+ To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
+ set dnsmasq_enable="YES" in /etc/rc.conf[.local]
 
-*** To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
-*** set dnsmasq_enable="YES" in /etc/rc.conf[.local]
-***
-*** Further options and actions are documented inside
-*** %%PREFIX%%/etc/rc.d/dnsmasq
-
+ Further options and actions are documented inside
+ %%PREFIX%%/etc/rc.d/dnsmasq
+EOM
+}
+]
diff --git a/dns/dnsmasq/files/pkg-message.in b/dns/dnsmasq/files/pkg-message.in
index 88a8ae592f96..931dec5f38c0 100644
--- a/dns/dnsmasq/files/pkg-message.in
+++ b/dns/dnsmasq/files/pkg-message.in
@@ -1,14 +1,18 @@
+[
+{ type: install
+  message: <<EOM
+ To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
+ set dnsmasq_enable="YES" in /etc/rc.conf[.local]
 
-*** To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
-*** set dnsmasq_enable="YES" in /etc/rc.conf[.local]
-***
-*** Further options and actions are documented inside
-*** %%PREFIX%%/etc/rc.d/dnsmasq
-
-*** SECURITY RECOMMENDATION
-*** ~~~~~~~~~~~~~~~~~~~~~~~
-*** It is recommended to enable the wpad-related options
-*** at the end of the configuration file (you may need to
-*** copy them from the example file to yours) to fix
-*** CERT Vulnerability VU#598349.
+ Further options and actions are documented inside
+ %%PREFIX%%/etc/rc.d/dnsmasq
 
+ SECURITY RECOMMENDATION
+ ~~~~~~~~~~~~~~~~~~~~~~~
+ It is recommended to enable the wpad-related options
+ at the end of the configuration file (you may need to
+ copy them from the example file to yours) to fix
+ CERT Vulnerability VU#598349.
+EOM
+}
+]
diff --git a/dns/dnsmax-perl/pkg-message b/dns/dnsmax-perl/pkg-message
index 91cd01e5da5b..d134aa8f1e55 100644
--- a/dns/dnsmax-perl/pkg-message
+++ b/dns/dnsmax-perl/pkg-message
@@ -1,5 +1,6 @@
-***************************************************************
-
+[
+{ type: install
+  message: <<EOM
 The DNSMax update client has been installed.  You will need
 a dynamic dns account from a DNSMax enabled provider.
 
@@ -8,5 +9,6 @@ Providers:
 - www.thatip.com
 
 To set up your configuration, run dnsmax-perl
-
-***************************************************************
+EOM
+}
+]
diff --git a/dns/dnsproxy/files/pkg-message.in b/dns/dnsproxy/files/pkg-message.in
index 1434e9d15655..89433f9442f0 100644
--- a/dns/dnsproxy/files/pkg-message.in
+++ b/dns/dnsproxy/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To enable dnsproxy you need:
 
 1) Enable dnsproxy in /etc/rc.conf with the following line:
@@ -8,7 +10,6 @@ To enable dnsproxy you need:
    dnsproxy.conf.sample file.
 
 For more information see man dnsproxy(1)
-
-**********************************************************************
-
-
+EOM
+}
+]
diff --git a/dns/dsc/files/pkg-message.in b/dns/dsc/files/pkg-message.in
index 2c8de6a11f57..5e6b7fe0f104 100644
--- a/dns/dsc/files/pkg-message.in
+++ b/dns/dsc/files/pkg-message.in
@@ -1,7 +1,9 @@
-###########################################
-
+[
+{ type: install
+  message: <<EOM
 Before you configure:
 To obtain MaxMind's GeoIP tables, install net/geoipupdate
 and run %%LOCALBASE%%/bin/geoipupdate manually.
-
-###########################################
+EOM
+}
+]
diff --git a/dns/dynip/pkg-message b/dns/dynip/pkg-message
index 89aec54092d9..bb5880260cc7 100644
--- a/dns/dynip/pkg-message
+++ b/dns/dynip/pkg-message
@@ -1,9 +1,11 @@
-########################################################################
-
+[
+{ type: install
+  message: <<EOM
                       dynip
 
              Dynamic IP Address Updater
 
    Issue "man dynip"  For set up and usage information
-
-########################################################################
+EOM
+}
+]
diff --git a/dns/gdnsd3/pkg-message b/dns/gdnsd3/pkg-message
index c54265435d9f..ee928e7b98c2 100644
--- a/dns/gdnsd3/pkg-message
+++ b/dns/gdnsd3/pkg-message
@@ -1,4 +1,6 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 As of version 3.0.0, gdnsd no longer has the ability to bind to
 privileged ports and then drop privileges.  As a result, you must use
 mac_portacl to allow the gdnsd user to bind to 53 udp/tcp.
@@ -24,5 +26,6 @@ kldload mac_portacl
 kldload accf_dns
 kldload accf_data
 service sysctl reload
-
-************************************************************************
+EOM
+}
+]
diff --git a/dns/getdns/files/pkg-message.in b/dns/getdns/files/pkg-message.in
index f1ee9be4ba6a..36eda9b9e57b 100644
--- a/dns/getdns/files/pkg-message.in
+++ b/dns/getdns/files/pkg-message.in
@@ -1,12 +1,18 @@
-***
-***  !!! IMPORTANT !!!!  libgetdns needs a DNSSEC trust anchor!
-***
-***  For the library to be able to perform DNSSEC, the root
-***  trust anchor needs to be present in presentation format
-***  in the file:
-***     %%LOCALBASE%%/etc/unbound/root.key
-***
-***  We recomend using unbound-anchor to retrieve and install
-***  the root trust anchor like this:
-***     su -m unbound -c /usr/local/sbin/unbound-anchor
-***
+[
+{ type: install
+  message: <<EOM
+
+  !!! IMPORTANT !!!!  libgetdns needs a DNSSEC trust anchor!
+
+  For the library to be able to perform DNSSEC, the root
+  trust anchor needs to be present in presentation format
+  in the file:
+     %%LOCALBASE%%/etc/unbound/root.key
+
+  We recomend using unbound-anchor to retrieve and install
+  the root trust anchor like this:
+     su -m unbound -c /usr/local/sbin/unbound-anchor
+
+EOM
+}
+]
diff --git a/dns/kadnode/pkg-message b/dns/kadnode/pkg-message
index f7954db4d331..617527a20ba8 100644
--- a/dns/kadnode/pkg-message
+++ b/dns/kadnode/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 In order to resolve domains using kadnode all over the system, add this
 line to your /etc/nsswitch.conf:
 
 hosts: kadnode dns
 
 If the hosts line already exists, just add kadnode before the dns entry.
+EOM
+}
+]
diff --git a/dns/knot-resolver/files/pkg-message.in b/dns/knot-resolver/files/pkg-message.in
index adb121c11ba8..d72c09dbfc0a 100644
--- a/dns/knot-resolver/files/pkg-message.in
+++ b/dns/knot-resolver/files/pkg-message.in
@@ -1,5 +1,6 @@
-######################################################################
-
+[
+{ type: install
+  message: <<EOM
   Please consult the documentation:
    - man kresd
    - https://knot-resolver.readthedocs.io/
@@ -9,5 +10,6 @@
 
   If upgrading:
    - https://knot-resolver.readthedocs.io/en/stable/upgrading.html
-
-######################################################################
+EOM
+}
+]
diff --git a/dns/knot2/files/pkg-message.in b/dns/knot2/files/pkg-message.in
index 175006c9cda8..a11ffed7f5d3 100644
--- a/dns/knot2/files/pkg-message.in
+++ b/dns/knot2/files/pkg-message.in
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
   To start using Knot DNS, you should complete the following tasks:
 
     cp %%ETCDIR%%/knot.conf.sample %%ETCDIR%%/knot.conf
@@ -15,6 +16,6 @@
 
   When upgrading from 2.4.x read:
    - https://www.knot-dns.cz/docs/2.5/html/migration.html#upgrade-2-4-x-to-2-5-x
-
-################################################################################
-
+EOM
+}
+]
diff --git a/dns/mDNSResponder_nss/pkg-message b/dns/mDNSResponder_nss/pkg-message
index a232498a8961..09bffe7f6012 100644
--- a/dns/mDNSResponder_nss/pkg-message
+++ b/dns/mDNSResponder_nss/pkg-message
@@ -1,6 +1,10 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 To enable the mDNSResponder NSS module, update the hosts entry in
 /etc/nsswitch.conf by adding mdns, preferably between files and dns:
 
 hosts: files mdns dns
-================================================================================
+EOM
+}
+]
diff --git a/dns/mdnsd/pkg-message b/dns/mdnsd/pkg-message
index e63520068bd3..0eeef1006d09 100644
--- a/dns/mdnsd/pkg-message
+++ b/dns/mdnsd/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 To use:
      mdnsd 'unique name' 12.34.56.78 80 '/optionalpath'
 For example:
      mdnsd audiotron 192.168.123.195 80 '/index.asp' &
+EOM
+}
+]
diff --git a/dns/mydns-ng/files/pkg-message.in b/dns/mydns-ng/files/pkg-message.in
index c6bd630bf2a3..e3e73329db69 100644
--- a/dns/mydns-ng/files/pkg-message.in
+++ b/dns/mydns-ng/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To get MyDNS working you will need to do some configuration, first you
 will need to create %%PREFIX%%/etc/mydns.conf based on the
 installed sample file. Following that you will need to setup your
@@ -17,5 +19,6 @@ You can use %%DOCSDIR%%/contrib/admin.php to maintain MyDNS.
 If you are looking for the web interface for MyDNS, it's included in
 the MyDNS distribution as %%DOCSDIR%%/contrib/admin.php.
 See %%DOCSDIR%%/contrib/README for installation instructions.
-
-*********************************************************************
+EOM
+}
+]
diff --git a/dns/mydns/files/pkg-message.in b/dns/mydns/files/pkg-message.in
index a4840bb5b715..9b2c8280f262 100644
--- a/dns/mydns/files/pkg-message.in
+++ b/dns/mydns/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To get MyDNS working you will need to do some configuration, first you
 will need to create %%PREFIX%%/etc/mydns.conf based on the
 installed sample file. Following that you will need to setup your
@@ -11,4 +13,6 @@ as a template. Finally enable MyDNS by adding
  mydns_enable="YES"
 
 into your rc.conf.
-*********************************************************************
+EOM
+}
+]
diff --git a/dns/noip/files/pkg-message.in b/dns/noip/files/pkg-message.in
index 8246aa2b0bb3..1b8c40373b8e 100644
--- a/dns/noip/files/pkg-message.in
+++ b/dns/noip/files/pkg-message.in
@@ -1,4 +1,6 @@
-###########################################################
+[
+{ type: install
+  message: <<EOM
 You must have a registered host with No-IP (www.noip.com)
 to use the noip Dynamic DNS Update Client (DUC).
 
@@ -27,4 +29,6 @@ Refer to the following for more information:
 
 /usr/local/bin/noip2 --help
 /usr/local/share/doc/noip/README.FIRST
-###########################################################
+EOM
+}
+]
diff --git a/dns/nsd/pkg-message b/dns/nsd/pkg-message
index 048c29c57cdc..19b102abda8c 100644
--- a/dns/nsd/pkg-message
+++ b/dns/nsd/pkg-message
@@ -1,12 +1,14 @@
-**************************************************************************
-*
-*   To run nsd from startup, add nsd_enable="YES" to your etc/rc.conf
-*
-*   Starting with nsd version 4 the old nsdc control program has been
-*   replaced by nsd-control. This requires some manual setup with
-*   nsd-control-setup and editing of the config files.
-*
-*   nsd-control is incompatible with nsdc so when that is used in scripts,
-*   these should be adapted
-*
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
+   To run nsd from startup, add nsd_enable="YES" to your etc/rc.conf
+
+   Starting with nsd version 4 the old nsdc control program has been
+   replaced by nsd-control. This requires some manual setup with
+   nsd-control-setup and editing of the config files.
+
+   nsd-control is incompatible with nsdc so when that is used in scripts,
+   these should be adapted
+EOM
+}
+]
diff --git a/dns/opendnssec2/files/pkg-message.in b/dns/opendnssec2/files/pkg-message.in
index 389bde5fcb4d..549cc3b4f398 100644
--- a/dns/opendnssec2/files/pkg-message.in
+++ b/dns/opendnssec2/files/pkg-message.in
@@ -1,27 +1,31 @@
-######
-# A manual migration step is needed to migration from 1.4 to 2.0.
-#
-# First migrate to at least the 1.4.10 release if you have not already done
-# so.
-#
-# Review the documentation on the OpenDNSSEC site.  This can be
-# updated in between releases to provide more help.  Especially if
-# you have tooling around OpenDNSSEC you should be aware that some
-# command line utilities have changed.  A fair amount of backward
-# compatibility has been respected, but changes are present.
-# 
-# The enforcer does require a full migration, as the internal database has
-# been completely revised.  See the documentation in 
-# %%DOCSDIR%%/1.4-2.0_db_convert/README.md for a description.
-# 
-# Migration scripts are installed in %%DOCSDIR%%.
-#
-# The signer does not require any migration.  Backward compatibility is
-# respected from earlier 1.4 release.  The signer should not require a
-# full resign of your zone when upgrading, however if you decide to downgrade
-# a full resign is required.
-######
+[
+{ type: install
+  message: <<EOM
+ A manual migration step is needed to migration from 1.4 to 2.0.
+
+ First migrate to at least the 1.4.10 release if you have not already done
+ so.
+
+ Review the documentation on the OpenDNSSEC site.  This can be
+ updated in between releases to provide more help.  Especially if
+ you have tooling around OpenDNSSEC you should be aware that some
+ command line utilities have changed.  A fair amount of backward
+ compatibility has been respected, but changes are present.
+ 
+ The enforcer does require a full migration, as the internal database has
+ been completely revised.  See the documentation in 
+ %%DOCSDIR%%/1.4-2.0_db_convert/README.md for a description.
+ 
+ Migration scripts are installed in %%DOCSDIR%%.
+
+ The signer does not require any migration.  Backward compatibility is
+ respected from earlier 1.4 release.  The signer should not require a
+ full resign of your zone when upgrading, however if you decide to downgrade
+ a full resign is required.
 
 An HowTo is provided at
 <https://wiki.opendnssec.org/display/DOCS20/Quick+start+guide>
 
+EOM
+}
+]
diff --git a/dns/openresolv/files/pkg-message.in b/dns/openresolv/files/pkg-message.in
index b17d948ce23a..e25daf854019 100644
--- a/dns/openresolv/files/pkg-message.in
+++ b/dns/openresolv/files/pkg-message.in
@@ -1,8 +1,9 @@
-=================================================
-
+[
+{ type: install
+  message: <<EOM
 To make sure openresolv runs correctly
 please symlink /etc/resolv.conf to
 %%PREFIX%%/etc/resolvconf/run/resolv.conf
-
-=================================================
-
+EOM
+}
+]
diff --git a/dns/powerdns-recursor/files/pkg-message.in b/dns/powerdns-recursor/files/pkg-message.in
index a5480fd56ad2..36e346d90979 100644
--- a/dns/powerdns-recursor/files/pkg-message.in
+++ b/dns/powerdns-recursor/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
  If you want to use the powerdns recursor,
  you need the following line in /etc/rc.conf(.local)
 
@@ -7,5 +8,6 @@
 
  Configuration templates are available in %%PREFIX%%/etc/pdns
  as recursor.conf-dist.
-*******************************************************************
-
+EOM
+}
+]
diff --git a/dns/powerdns/files/pkg-message.in b/dns/powerdns/files/pkg-message.in
index 70defb2b70dd..7ad5592d6161 100644
--- a/dns/powerdns/files/pkg-message.in
+++ b/dns/powerdns/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
  Enable powerdns in /etc/rc.conf with the following line:
 
     pdns_enable="YES"
@@ -9,12 +10,17 @@
 
  A pdns.conf with all possible options is available in
  %%EXAMPLESDIR%%
-
+EOM
+}
+{ type: upgrade
+  maximum_versio: 3.4
+  message: <<EOM
  ---------------------------------------------
  IMPORTANT: PowerDNS Authoritive Server 3.4.0+:
  ---------------------------------------------
  This version needs a mandatory schema change for the gmsyql,
  gpgsql and gsqlite3 backends. SQL statements are available in
  %%DOCSDIR%% or http://doc.powerdns.com
-*******************************************************************
-
+EOM
+}
+]
diff --git a/dns/radns/files/pkg-message.in b/dns/radns/files/pkg-message.in
index 8e6cf44d5520..c0307b41c3f8 100644
--- a/dns/radns/files/pkg-message.in
+++ b/dns/radns/files/pkg-message.in
@@ -1,5 +1,6 @@
-****************************************************
-
+[
+{ type: install
+  message: <<EOM
 To enable radns, edit /etc/rc.conf and add:
 
   radns_enable="YES"
@@ -9,5 +10,6 @@ own file %%PREFIX%%/etc/radns/radns-resolv.conf.
 
 To make sure the system's /etc/resolv.conf file is created from all
 sources, read %%PREFIX%%/share/doc/radns/README.FreeBSD.
-
-****************************************************
+EOM
+}
+]
diff --git a/dns/rbldnsd/files/pkg-message.in b/dns/rbldnsd/files/pkg-message.in
index 5eaa84203b17..fcea614b8e70 100644
--- a/dns/rbldnsd/files/pkg-message.in
+++ b/dns/rbldnsd/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 The rbldnsd port has been installed with an example zone file, located
 in %%PREFIX%%/etc/rbldnsd/.
 
@@ -13,5 +14,6 @@ or
 	% nslookup -query=any 1.1.31.172.bl.example.com. localhost
 
 If you see a response that mentions 127.0.0.2, the install worked!
-
-========================================================================
+EOM
+}
+]
diff --git a/dns/sleuth/pkg-message b/dns/sleuth/pkg-message
index adedeb0e8cf6..5932f176156d 100644
--- a/dns/sleuth/pkg-message
+++ b/dns/sleuth/pkg-message
@@ -1,7 +1,9 @@
-============================================================
-
+[
+{ type: install
+  message: <<EOM
 Before you can run "sleuth" you will need to copy
 
 ${PREFIX}etc/sleuth.conf.sample to ${PREFIX}etc/sleuth.conf
-
-============================================================
+EOM
+}
+]
diff --git a/dns/unbound/files/pkg-message.in b/dns/unbound/files/pkg-message.in
index eba979e3b205..94a1f3bc8975 100644
--- a/dns/unbound/files/pkg-message.in
+++ b/dns/unbound/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Munin support requires additional configuration in the plugin config file:
 %%PREFIX%%/etc/munin/plugin-conf.d/plugins.conf
 
@@ -8,3 +11,6 @@ env.unbound_conf %%PREFIX%%/etc/unbound/unbound.conf
 env.unbound_control %%PREFIX%%/sbin/unbound-control
 env.spoof_warn 1000
 env.spoof_crit 100000
+EOM
+}
+]
diff --git a/dns/void-zones-tools/files/pkg-message.in b/dns/void-zones-tools/files/pkg-message.in
index ef5d20004008..690e2ee5df78 100644
--- a/dns/void-zones-tools/files/pkg-message.in
+++ b/dns/void-zones-tools/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To download the host lists and convert them to void zones,
 run the following script:
 %%PREFIX%%/bin/void-zones-update.sh
@@ -14,3 +17,6 @@ For future updates, run void-zones-update.sh and restart Unbound.
 
 For more information, see %%PREFIX%%/share/doc/void-zones-tools/README.md
 or https://github.com/cyclaero/void-zones-tools
+EOM
+}
+]