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

---
 www/Stikked/files/pkg-message.in              |  8 +++-
 www/ach/files/pkg-message.in                  |  7 ++-
 www/adzap/files/pkg-message.in                | 10 +++--
 www/analog/files/pkg-message.in               |  6 +++
 www/apache-forrest/files/pkg-message.in       | 11 ++---
 www/apache-mode.el/pkg-message                | 11 ++---
 www/apache24/pkg-message                      |  9 ++--
 www/apt-cacher-ng/files/pkg-message.in        |  6 +++
 www/awstats/files/pkg-message.in              | 10 +++--
 www/bacula-web/files/pkg-message.in           | 12 ++---
 www/baikal/files/pkg-message.in               |  6 +++
 www/bareos-webui/files/pkg-message.in         | 11 ++---
 www/bareos16-webui/files/pkg-message.in       | 11 ++---
 www/bareos17-webui/files/pkg-message.in       | 11 ++---
 www/bigbluebutton/files/pkg-message.in        | 10 +++--
 www/blogsum/files/pkg-message.in              | 19 +++++---
 www/bluefish/pkg-message                      |  9 ++--
 www/boa/files/pkg-message.in                  |  8 +++-
 www/bolt/pkg-message                          | 10 +++--
 www/butterfly/files/pkg-message.in            |  8 +++-
 www/cadaver/pkg-message                       |  8 +++-
 www/caddy/files/pkg-message.in                | 10 +++--
 www/calendarserver/files/pkg-message.in       | 16 ++++---
 www/carbonapi/pkg-message                     |  6 +++
 www/cgiwrap/files/pkg-message.in              |  8 +++-
 www/chems/files/pkg-message.in                |  7 ++-
 www/cherokee/files/pkg-message.in             | 10 +++--
 www/chpasswd/pkg-message                      |  6 +++
 www/chrome-gnome-shell/pkg-message            |  6 +++
 www/chromium/files/pkg-message.in             |  6 +++
 www/codeigniter/files/pkg-message-apache.in   |  8 +++-
 www/codeigniter/files/pkg-message-noapache.in |  8 +++-
 www/codeigniter/files/pkg-message.in          |  8 +++-
 www/coppermine/files/pkg-message.in           |  9 ++--
 www/crp/pkg-message                           |  8 +++-
 www/davical/files/pkg-message.in              |  6 +++
 www/dojo-shrinksafe/pkg-message               |  6 +++
 www/dojo/files/pkg-message.in                 |  8 +++-
 www/dokuwiki/files/pkg-message.in             | 11 ++---
 www/domoticz/pkg-message                      |  7 ++-
 www/drupal7/files/pkg-message.in              | 13 ++++--
 www/drupal8/files/pkg-message.in              | 13 ++++--
 www/e107/files/pkg-message.in                 | 13 +++---
 www/e2guardian/files/pkg-message.in           |  8 +++-
 www/efront/files/pkg-message.in               | 10 +++--
 www/elgg/files/pkg-message.in                 | 20 +++++----
 www/emacs-w3m/pkg-message                     | 44 ++++++++++---------
 www/falkon/pkg-message                        |  6 +++
 www/firefox-esr/pkg-message                   | 16 ++++---
 www/firefox/pkg-message                       | 16 ++++---
 www/fnord/files/pkg-message.in                |  8 +++-
 www/formication/files/pkg-message.in          | 10 +++--
 www/foswiki/files/pkg-message-apache.in       |  8 +++-
 www/foswiki/files/pkg-message-noapache.in     |  7 ++-
 www/ftasv/files/pkg-message.in                | 12 ++---
 www/g-gcl/pkg-message                         |  8 +++-
 www/gallery2/files/pkg-message.in             |  8 +++-
 www/geneweb/files/pkg-message.in              | 10 +++--
 www/gitea/pkg-message                         |  6 +++
 www/glassfish/pkg-message                     |  6 +++
 www/glpi/files/pkg-message.in                 |  8 +++-
 www/gnome-user-share/pkg-message              |  6 +++
 www/grails/files/pkg-message.in               | 10 +++--
 www/groupoffice/files/pkg-message.in          |  6 +++
 www/guacamole-client/files/pkg-message.in     |  6 +++
 www/hastymail2-devel/files/pkg-message.in     | 10 +++--
 www/hiawatha-monitor/files/pkg-message.in     |  6 +++
 www/hotcrp/files/pkg-message.in               | 11 ++---
 www/ilias/files/pkg-message.in                | 11 +++--
 www/itop/files/pkg-message.in                 |  6 +++
 www/jetty9/files/pkg-message.in               | 18 ++++----
 www/joomla3/files/pkg-message.in              | 10 +++--
 www/jspwiki/pkg-message                       |  8 +++-
 www/junkbuster/files/pkg-message.in           |  6 +++
 www/kannel-sqlbox/files/pkg-message.in        | 10 +++--
 www/kohana/files/pkg-message.in               |  6 +++
 www/larbin/files/pkg-message.in               | 10 +++--
 .../files/pkg-message.in                      | 14 +++---
 www/lightsquid/files/pkg-message.in           |  8 +++-
 www/linux-flashplayer/pkg-message             |  6 +++
 www/lynx/files/pkg-message.in                 |  6 +++
 www/mathopd/pkg-message                       | 10 +++--
 www/matomo/files/pkg-message.in               | 11 ++---
 www/mediawiki131/files/pkg-message.in         |  8 +++-
 www/mediawiki132/files/pkg-message.in         |  8 +++-
 www/mediawiki133/files/pkg-message.in         |  8 +++-
 www/mnogosearch/files/pkg-message.in          |  6 +++
 www/mod_auth_cas/pkg-message                  |  8 +++-
 www/mod_auth_openidc/files/pkg-message.in     |  8 +++-
 www/mod_authnz_crowd/files/pkg-message.in     | 10 +++--
 www/mod_cvs2/pkg-message                      |  8 +++-
 www/mod_fcgid/files/pkg-message.in            |  8 +++-
 www/mod_gnutls/files/pkg-message.in           | 10 +++--
 www/mod_jk/files/pkg-message.in               |  8 +++-
 www/mod_log_sql2/files/pkg-message.in         | 16 ++++---
 www/mod_perl2/files/pkg-message.in            |  9 ++--
 www/mod_python35/files/pkg-message.in         | 10 +++--
 www/mod_rivet/files/pkg-message.in            | 10 +++--
 www/mod_scgi/pkg-message                      | 10 +++--
 www/mod_security/files/pkg-message.in         |  7 ++-
 www/mod_vhs/pkg-message                       | 11 ++---
 www/mod_wsgi4/files/pkg-message.in            | 10 +++--
 www/moinmoincli/files/pkg-message.in          |  6 +++
 www/moodle35/files/pkg-message.in             | 14 ++++--
 www/moodle36/files/pkg-message.in             | 14 ++++--
 www/moodle37/files/pkg-message.in             | 14 ++++--
 www/mozplugger/pkg-message                    |  6 +++
 www/mybb/files/pkg-message.in                 |  7 ++-
 www/mythplugin-mythweb/files/pkg-message.in   |  6 +++
 www/nanoblogger/files/pkg-message.in          |  7 ++-
 www/nextcloud/files/pkg-message.in            | 19 ++++----
 www/nginx-devel/files/pkg-message.in          | 10 +++--
 www/nginx/files/pkg-message.in                | 10 +++--
 www/nibbleblog/files/pkg-message.in           | 10 +++--
 www/node/pkg-message                          |  6 +++
 www/node10/pkg-message                        |  6 +++
 www/node6/pkg-message                         |  6 +++
 www/node8/pkg-message                         |  6 +++
 www/npc/pkg-message                           | 14 +++---
 www/nspluginwrapper/pkg-message               | 18 ++++----
 www/opencart/files/pkg-message.in             | 12 ++---
 www/orangehrm/files/pkg-message.in            | 11 ++---
 www/otrs/files/pkg-message.in                 |  8 +++-
 www/otter-browser/pkg-message                 | 10 +++--
 www/owncloud/files/pkg-message.in             | 14 +++---
 www/p5-Apache-Gallery/files/pkg-message.in    | 10 +++--
 www/p5-Apache-MP3/pkg-message                 |  6 +++
 www/p5-CGI-Kwiki/pkg-message                  |  8 +++-
 www/p5-Catalyst-Runtime/pkg-message           | 10 +++--
 www/p5-FCGI-Spawn/pkg-message                 |  8 +++-
 www/p5-Maypole/files/pkg-message.in           | 10 +++--
 www/p5-Nginx-ReadBody/pkg-message             | 10 +++--
 www/p5-RT-Extension-SLA/files/pkg-message.in  |  8 +++-
 www/p5-RTx-Calendar/pkg-message               |  7 ++-
 .../files/pkg-message.in                      |  6 +++
 www/payara/pkg-message                        |  7 ++-
 www/pebble/files/pkg-message.in               |  8 +++-
 www/pglogd/files/pkg-message.in               |  8 +++-
 www/php-screw/files/pkg-message.in            | 10 +++--
 www/phpbb/files/pkg-message.in                |  8 +++-
 www/phpbb3/files/pkg-message.in               |  9 ++--
 www/phpmustache/files/pkg-message.in          |  6 +++
 www/phpmyfaq/pkg-message                      |  9 ++--
 www/phprecipebook/files/pkg-message.in        |  8 +++-
 www/phproxy/pkg-message                       |  9 ++--
 www/phpsysinfo/files/pkg-message.in           |  8 +++-
 www/piwigo/files/pkg-message.in               |  8 +++-
 www/planet/files/pkg-message.in               |  8 +++-
 www/pmwiki/files/pkg-message.in               | 10 +++--
 www/polipo/files/pkg-message.in               | 10 +++--
 www/privatebin/pkg-message                    |  6 +++
 www/privoxy/files/pkg-message.in              |  9 ++--
 www/punbb/files/pkg-message.in                | 10 +++--
 www/pwebstats/pkg-message                     |  8 +++-
 www/py-bokeh/pkg-message                      |  6 +++
 www/py-django-cms/pkg-message                 | 44 +++++++++----------
 www/py-django-datetime-widget/pkg-message     |  7 ++-
 www/py-django-filer/pkg-message               | 10 +++--
 www/py-django-mezzanine/files/pkg-message.in  | 10 +++--
 www/py-graphite-api/files/pkg-message.in      |  6 +++
 www/py-graphite-web/files/pkg-message.in      | 10 +++--
 www/py-horizon/files/pkg-message.in           | 10 +++--
 www/py-kallithea/files/pkg-message.in         |  6 +++
 www/py-nevow/files/pkg-message.in             | 10 +++--
 www/py-qp/files/pkg-message.in                |  8 +++-
 www/py-rhodecode/files/pkg-message.in         |  6 +++
 www/pycarddav/files/pkg-message.in            |  7 ++-
 www/radicale2/pkg-message                     |  6 +++
 www/redmine/pkg-message                       | 10 +++--
 www/reportmagic/pkg-message                   |  6 +++
 www/repos-style/files/pkg-message.in          |  8 +++-
 www/resin3/files/pkg-message.in               |  8 +++-
 www/restbed/pkg-message                       |  8 +++-
 www/rssowl/pkg-message                        |  8 +++-
 www/rt42/files/pkg-message.in                 | 15 ++++---
 www/rt44/files/pkg-message.in                 | 15 ++++---
 .../files/pkg-message-apache.in               | 10 +++--
 .../files/pkg-message-nginx.in                | 10 +++--
 www/rubygem-sinatra/pkg-message               |  9 ++--
 www/rubygem-sinatra1/pkg-message              |  9 ++--
 www/sahi/pkg-message                          | 10 +++--
 www/sakai/pkg-message                         |  8 +++-
 www/seahub/files/pkg-message.in               |  6 +++
 www/searx/files/pkg-message.in                |  8 +++-
 www/selenium/pkg-message                      |  6 +++
 www/serendipity/files/pkg-message.in          | 12 ++---
 www/skytemplate/files/pkg-message.in          | 10 +++--
 www/smarty2/files/pkg-message.in              |  6 +++
 www/smarty3/files/pkg-message.in              |  6 +++
 www/smb_auth/pkg-message                      | 10 +++--
 www/sogo2/pkg-message                         | 10 +++--
 www/sogo3/pkg-message                         | 10 +++--
 www/sogo4/files/pkg-message.in                | 10 +++--
 www/sqstat/files/pkg-message.in               |  8 +++-
 www/squid/files/pkg-message.in                |  7 ++-
 www/squid3/files/pkg-message.in               |  7 ++-
 www/squidanalyzer/files/pkg-message.in        |  8 +++-
 www/squidguard/files/pkg-message.in           |  8 +++-
 www/suphp/files/pkg-message.in                |  6 +++
 www/suphp/pkg-message                         | 22 ++++++----
 www/tdiary/files/pkg-message.in               | 10 +++--
 www/template_/pkg-message                     | 10 +++--
 www/templatelite/files/pkg-message.in         | 10 +++--
 www/thttpd/files/pkg-message.in               |  8 +++-
 www/thundercache/files/pkg-message.in         |  7 ++-
 www/thundersnarf/files/pkg-message.in         |  7 ++-
 www/tikiwiki/files/pkg-message.in             | 10 +++--
 www/tokyopromenade/files/pkg-message.in       |  9 ++--
 www/trac-bzr/pkg-message                      |  6 +++
 www/trac-ccselector/pkg-message               |  8 +++-
 www/trac-childtickets/files/pkg-message.in    |  6 +++
 www/trac-customfieldadmin/pkg-message         |  8 +++-
 www/trac-devel/pkg-message                    | 10 +++--
 www/trac-estimator/pkg-message                |  8 +++-
 www/trac-gantt/pkg-message                    |  8 +++-
 www/trac-math/files/pkg-message.in            |  6 +++
 www/trac-scrumburndown/pkg-message            |  8 +++-
 www/trac-timingandestimation/pkg-message      |  8 +++-
 www/trac-tweakui/files/pkg-message.in         |  8 +++-
 www/trac-wikinotification/pkg-message         |  8 +++-
 www/trac-wysiwyg/pkg-message                  |  8 +++-
 www/trac/pkg-message                          | 10 +++--
 www/tt-rss/files/pkg-message.in               |  8 +++-
 www/typo3-8/files/pkg-message.in              | 13 +++---
 www/typo3-9/files/pkg-message.in              | 13 +++---
 www/udmsearch/files/pkg-message.in            |  6 +++
 www/ufdbguard/files/pkg-message.in            |  6 +++
 www/validator/files/pkg-message.in            |  8 +++-
 www/varnish-nagios/files/pkg-message.in       | 10 +++--
 www/varnish4/files/pkg-message.in             |  6 +++
 www/varnish6/pkg-message                      |  6 +++
 www/volta/files/pkg-message.in                |  6 +++
 www/w3m/pkg-message                           | 28 +++++++-----
 www/web2ldap/files/pkg-message.in             |  9 ++--
 www/webreport/files/pkg-message.in            |  7 ++-
 www/websh/files/pkg-message.in                |  9 ++--
 www/webstats/pkg-message                      |  8 +++-
 www/webstone-ssl/pkg-message                  |  8 +++-
 www/webstone/pkg-message                      |  8 +++-
 www/webtrees/files/pkg-message.in             | 10 +++--
 www/wordpress/files/pkg-message.in            |  7 ++-
 www/wwwoffle/files/pkg-message.in             |  7 ++-
 www/xoops/files/pkg-message.in                | 12 ++---
 www/yabb/files/pkg-message.in                 |  8 +++-
 www/yanopaste/files/pkg-message.in            |  6 +++
 www/yourls/files/pkg-message.in               | 12 ++---
 www/youtube_dl/pkg-message                    | 10 +++--
 www/zend-framework/files/pkg-message.in       |  9 ++--
 www/zend-framework1/files/pkg-message.in      |  9 ++--
 www/zenphoto/files/pkg-message.in             | 17 ++++---
 www/zope213/files/pkg-message.in              |  8 +++-
 251 files changed, 1638 insertions(+), 706 deletions(-)

diff --git a/www/Stikked/files/pkg-message.in b/www/Stikked/files/pkg-message.in
index 10d07af5ecd0..916fa5c1d388 100644
--- a/www/Stikked/files/pkg-message.in
+++ b/www/Stikked/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 The configuration file is in %%ETCDIR%%/stikked.php
 
 This package contains a true_paste feature which has been sent
@@ -13,4 +15,6 @@ Set driver to one of:
 * 'sqlite'
 
 Set appropriate values in the 'Database connection' section.
-
+EOM
+}
+]
diff --git a/www/ach/files/pkg-message.in b/www/ach/files/pkg-message.in
index e62fa5b50deb..eda363decc31 100644
--- a/www/ach/files/pkg-message.in
+++ b/www/ach/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You now need to create the DB where ACH is going to live.
 
 MySQL:
@@ -38,4 +41,6 @@ Finally, change the RewriteBase URL in %%WWWDIR%%/.htaccess so it
 matches the URL in the Alias directive above, e.g.:
 
     RewriteBase /ach
-
+EOM
+}
+]
diff --git a/www/adzap/files/pkg-message.in b/www/adzap/files/pkg-message.in
index dc93b071d544..0215bb84229c 100644
--- a/www/adzap/files/pkg-message.in
+++ b/www/adzap/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
   Adzap has now been installed.  To get it up and running, copy
   %%EXAMPLESDIR%%/adzap.conf to %%PREFIX%%/etc/ and
   modify it to match your setup.  Then edit your squid configuration
@@ -11,5 +12,6 @@
 
   You can find JavaScript proxy auto-configuration scripts in
   %%EXAMPLESDIR%%/rc
-
-==========================================================================
+EOM
+}
+]
diff --git a/www/analog/files/pkg-message.in b/www/analog/files/pkg-message.in
index 81eb8dac1380..e465f7de15e1 100644
--- a/www/analog/files/pkg-message.in
+++ b/www/analog/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Note: Analog includes an optional form and perl script to request
 analyses via a web interface. The form and script both require
 customization before use. If you would like to use them, first copy
@@ -5,3 +8,6 @@ customization before use. If you would like to use them, first copy
 $$HTDOCS/anlgform.html and $$CGI-BIN/anlgform.pl for your local
 configuration. Both files are extensively commented with instructions
 for customization.
+EOM
+}
+]
diff --git a/www/apache-forrest/files/pkg-message.in b/www/apache-forrest/files/pkg-message.in
index 5657f89825db..48df8f81af92 100644
--- a/www/apache-forrest/files/pkg-message.in
+++ b/www/apache-forrest/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-*************************************************************************
-
+[
+{ type: install
+  message: <<EOM
   Set the environment variable:
 
       FORREST_HOME=%%DATADIR%%
@@ -16,5 +16,6 @@
 
   To avoid any issue with old classes being loaded, run a 'forrest clean-work'
   in your project directory, after you upgraded to this version (%%PORTVERSION%%)
-
-*************************************************************************
+EOM
+}
+]
diff --git a/www/apache-mode.el/pkg-message b/www/apache-mode.el/pkg-message
index acb8b4e2e166..521de74184fc 100644
--- a/www/apache-mode.el/pkg-message
+++ b/www/apache-mode.el/pkg-message
@@ -1,6 +1,6 @@
-
-===================================================================
-
+[
+{ type: install
+  message: <<EOM
 Put this in your .emacs file to enable autoloading of apache-mode,
 and auto-recognition of Apache configs:
 
@@ -11,5 +11,6 @@ and auto-recognition of Apache configs:
  (add-to-list 'auto-mode-alist '("access\\.conf\\'" . apache-mode))
  (add-to-list 'auto-mode-alist
                '("sites-\\(available\\|enabled\\)/" . apache-mode))
-
-===================================================================
+EOM
+}
+]
diff --git a/www/apache24/pkg-message b/www/apache24/pkg-message
index b343c0ee81d0..d1600b6f123e 100644
--- a/www/apache24/pkg-message
+++ b/www/apache24/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run apache www server from startup, add apache24_enable="yes"
 in your /etc/rc.conf. Extra options can be found in startup script.
 
@@ -5,7 +8,6 @@ Your hostname must be resolvable using at least 1 mechanism in
 /etc/nsswitch.conf typically DNS or /etc/hosts or apache might
 have issues starting depending on the modules you are using.
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 - apache24 default build changed from static MPM to modular MPM
 - more modules are now enabled per default in the port
@@ -18,5 +20,6 @@ have issues starting depending on the modules you are using.
 
 Please compare the existing httpd.conf with httpd.conf.sample
 and merge missing modules/instructions into httpd.conf!
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/www/apt-cacher-ng/files/pkg-message.in b/www/apt-cacher-ng/files/pkg-message.in
index 49800685361b..5ac98a4f355f 100644
--- a/www/apt-cacher-ng/files/pkg-message.in
+++ b/www/apt-cacher-ng/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This port sets up apt-cacher-ng to be used in a FreeBSD context.
 
 The FreeBSD installer on the official media does not allow to provide the name of a proxy server.
@@ -12,3 +15,6 @@ proxy settings for pkgng can be persisted by editing /usr/local/etc/pkg.conf and
 pkg_env: {
         http_proxy: "http://myproxy:3142",
 }
+EOM
+}
+]
diff --git a/www/awstats/files/pkg-message.in b/www/awstats/files/pkg-message.in
index 40933be39d57..984522de0e7d 100644
--- a/www/awstats/files/pkg-message.in
+++ b/www/awstats/files/pkg-message.in
@@ -1,10 +1,12 @@
-*********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Use %%PREFIX%%/www/awstats/tools/awstats_configure.pl to set up your
 hosts.
 
 To activate awstats in your webserver, see the example files for
 apache: %%DOCSDIR%%/httpd_conf
 nginx:  %%DOCSDIR%%/nginx/
-
-*********************************************************************
+EOM
+}
+]
diff --git a/www/bacula-web/files/pkg-message.in b/www/bacula-web/files/pkg-message.in
index a2796c47e20a..033a1c43d920 100644
--- a/www/bacula-web/files/pkg-message.in
+++ b/www/bacula-web/files/pkg-message.in
@@ -1,8 +1,6 @@
-
-***********************************************************************
-*                         POST INSTALL CONFIGURATION                  *
-***********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please note that everything has been installed in %%BASE%%.
 
 You need to copy %%BASE%%/application/config/config.php.sample to
@@ -17,4 +15,6 @@ And restart Apache.
 
 Alternatively, you can create a host dedicated to bacula-web and use
 a DocumentRoot of %%BASE%%/.
-
+EOM
+}
+]
diff --git a/www/baikal/files/pkg-message.in b/www/baikal/files/pkg-message.in
index 51c636d3959c..31b1d2cd7134 100644
--- a/www/baikal/files/pkg-message.in
+++ b/www/baikal/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 If this is a new installation, please follow the instructions there:
 
 http://sabre.io/baikal/install/
@@ -8,3 +11,6 @@ If you are upgrading from a previous version of Baikal, please
 follow the instructions here:
 
 http://sabre.io/baikal/upgrade/
+EOM
+}
+]
diff --git a/www/bareos-webui/files/pkg-message.in b/www/bareos-webui/files/pkg-message.in
index 648ccb67f21f..2b120024b65e 100644
--- a/www/bareos-webui/files/pkg-message.in
+++ b/www/bareos-webui/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos webui was installed
 
 Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
@@ -9,6 +10,6 @@ https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
 
 1) Configuration files are stored at %%ETCDIR%%
 2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
-
-
-###############################################################################
+EOM
+}
+]
diff --git a/www/bareos16-webui/files/pkg-message.in b/www/bareos16-webui/files/pkg-message.in
index 648ccb67f21f..2b120024b65e 100644
--- a/www/bareos16-webui/files/pkg-message.in
+++ b/www/bareos16-webui/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos webui was installed
 
 Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
@@ -9,6 +10,6 @@ https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
 
 1) Configuration files are stored at %%ETCDIR%%
 2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
-
-
-###############################################################################
+EOM
+}
+]
diff --git a/www/bareos17-webui/files/pkg-message.in b/www/bareos17-webui/files/pkg-message.in
index 648ccb67f21f..2b120024b65e 100644
--- a/www/bareos17-webui/files/pkg-message.in
+++ b/www/bareos17-webui/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos webui was installed
 
 Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
@@ -9,6 +10,6 @@ https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
 
 1) Configuration files are stored at %%ETCDIR%%
 2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
-
-
-###############################################################################
+EOM
+}
+]
diff --git a/www/bigbluebutton/files/pkg-message.in b/www/bigbluebutton/files/pkg-message.in
index 97db0486ca8f..fed995f8f67e 100644
--- a/www/bigbluebutton/files/pkg-message.in
+++ b/www/bigbluebutton/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 BigBlueButon is now installed. If you install it for the first time,
 you may need to perform the following steps:
 
@@ -30,5 +31,6 @@ For more detailed information please visit:
 http://code.google.com/p/bigbluebutton/wiki/InstallingBigBlueButton
 http://code.google.com/p/bigbluebutton/wiki/ConfigurationFiles
 http://code.google.com/p/bigbluebutton/wiki/FAQ
-
-===============================================================================
+EOM
+}
+]
diff --git a/www/blogsum/files/pkg-message.in b/www/blogsum/files/pkg-message.in
index 257b614f8a6d..ad2bf5325e73 100644
--- a/www/blogsum/files/pkg-message.in
+++ b/www/blogsum/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 # To finish installing Blogsum, the following steps must be completed.
 
 1)  Setup the SQLite database:
@@ -10,12 +13,6 @@
 	$ cp %%WWWDIR%%/Blogsum/Config.pm.dist \
 		%%WWWDIR%%/Blogsum/Config.pm
 
-################################################################
-NOTE: If you are updating from blogsum 0.9 you should merge the
-relevant changes from %%WWWDIR%%/Blogsum/Config.pm.dist
-into your current %%WWWDIR%%/Blogsum/Config.pm
-###############################################################
-
 3)  If comments will be enabled, visit the CAPTCHA (http://www.captcha.net/)
     project and register your account.  Add your keys to Config.pm.
 
@@ -45,3 +42,13 @@ edited at http://localhost/blogsum/admin.cgi.
 Please refer to the online support resources if you have questions.
 
 	http://blogsum.obfuscurity.com/
+EOM
+}
+{ type: upgrade, maximum_version: 1.0
+  message: <<EOM
+NOTE: If you are updating from blogsum 0.9 you should merge the
+relevant changes from %%WWWDIR%%/Blogsum/Config.pm.dist
+into your current %%WWWDIR%%/Blogsum/Config.pm
+EOM
+}
+]
diff --git a/www/bluefish/pkg-message b/www/bluefish/pkg-message
index f7ad926c9eeb..638a69808879 100644
--- a/www/bluefish/pkg-message
+++ b/www/bluefish/pkg-message
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 WARNING:
 
 DUE CHANGE OF tidy to tidy4
@@ -6,5 +8,6 @@ DUE CHANGE OF tidy to tidy4
 If ~/.bluefish exists, the commands should be manually fixed opening the
 preferences window (Edit->Preferences) and then changing tidy to tidy4 in
 "External filters" and "Output parser" preferences.
-
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/boa/files/pkg-message.in b/www/boa/files/pkg-message.in
index dd96628826ce..4515eebcc2d1 100644
--- a/www/boa/files/pkg-message.in
+++ b/www/boa/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You may wish to copy and edit the sample startup script
 
 %%PREFIX%%/etc/rc.d/boa.sh.sample
 
 according to your requirements.
-
+EOM
+}
+]
diff --git a/www/bolt/pkg-message b/www/bolt/pkg-message
index cde2f2896f82..2a080e010fe6 100644
--- a/www/bolt/pkg-message
+++ b/www/bolt/pkg-message
@@ -1,7 +1,9 @@
-
-
+[
+{ type: install
+  message: <<EOM
 Additional configuration documentation can be found at:
 
 https://docs.bolt.cm/installation
-
-
+EOM
+}
+]
diff --git a/www/butterfly/files/pkg-message.in b/www/butterfly/files/pkg-message.in
index cc6c032680d2..6744dfce7b8a 100644
--- a/www/butterfly/files/pkg-message.in
+++ b/www/butterfly/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed butterfly, the web terminal that works through your
 browser.
 
@@ -11,4 +13,6 @@ http://localhost:57575
 
 The port and other parameters can be configured in
 %%ETCDIR%%/butterfly.conf
-======================================================================
+EOM
+}
+]
diff --git a/www/cadaver/pkg-message b/www/cadaver/pkg-message
index 6f45f4d828ea..c22d2dbe4f84 100644
--- a/www/cadaver/pkg-message
+++ b/www/cadaver/pkg-message
@@ -1,6 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 	For SSL-verification of remote servers, the /etc/ssl/cert.pem
 	should exist and point to a reasonable CA-certificate bundle.
 
 	Installing security/ca_root_nss is one way to get it.
-
+EOM
+}
+]
diff --git a/www/caddy/files/pkg-message.in b/www/caddy/files/pkg-message.in
index d9ac0843137d..d4dc5ce0a315 100644
--- a/www/caddy/files/pkg-message.in
+++ b/www/caddy/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************
-
+[
+{ type: install
+  message: <<EOM
 www/caddy does not ship with any in-tree documentation. Online
 documentation can be found at https://caddyserver.com/docs.
 
@@ -47,5 +48,6 @@ Specific metrics can be disabled at run-time using the
 
 More information about the Caddy Telemetry Project can be found
 at https://caddyserver.com/docs/telemetry.
-
-*****************************************************************
+EOM
+}
+]
diff --git a/www/calendarserver/files/pkg-message.in b/www/calendarserver/files/pkg-message.in
index 3999364f1901..80033c0ee287 100644
--- a/www/calendarserver/files/pkg-message.in
+++ b/www/calendarserver/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This is the core code base for the Calendar and Contacts Server,
 which is a CalDAV, CardDAV, WebDAV, and HTTP server.
 
@@ -66,11 +69,10 @@ In this case there is no need to define a server path on the client.
 Updates from earlier versions may require a DB schema update, which is done
 automatically on server start up, if <key>FailIfUpgradeNeeded</key> is set to
 <false/>.
-
-
-Upgrading
----------
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 Upgrading from the previous version of this port (5.1) requires adjustments
 to the configuration:
 
@@ -112,4 +114,6 @@ to the configuration:
 	Starting schema upgrade from version 24 to 60.
 	Schema upgraded from version 24 to 60.
    These schould complete without errors.
-
+EOM
+}
+]
diff --git a/www/carbonapi/pkg-message b/www/carbonapi/pkg-message
index f7565c2e22e6..214268a0ae19 100644
--- a/www/carbonapi/pkg-message
+++ b/www/carbonapi/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 NOTE ABOUT CARBONAPI:
 
 This daemon can be configured with both yaml and toml. Choose one and specify 
 it's path in carbonapi_conf in /etc/rc.conf or with sysrc.
+EOM
+}
+]
diff --git a/www/cgiwrap/files/pkg-message.in b/www/cgiwrap/files/pkg-message.in
index 5c724c4c5a09..210528c33bb7 100644
--- a/www/cgiwrap/files/pkg-message.in
+++ b/www/cgiwrap/files/pkg-message.in
@@ -1,4 +1,6 @@
------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The cgiwrap binaries have been installed in the following
 directory:
 
@@ -9,4 +11,6 @@ not function as expected:
 
   %%ALLOW_FILE%%
   %%DENY_FILE%%
------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/chems/files/pkg-message.in b/www/chems/files/pkg-message.in
index 94f3c486efbb..9a7e12170477 100644
--- a/www/chems/files/pkg-message.in
+++ b/www/chems/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 mybb has been installed into:
 
     %%WWWDIR%%
@@ -8,4 +11,6 @@ somethinglike this:
         Alias /chems "%%WWWDIR%%"
 
 And restart Apache.
-
+EOM
+}
+]
diff --git a/www/cherokee/files/pkg-message.in b/www/cherokee/files/pkg-message.in
index d91afca78ba3..a05fc5d0806e 100644
--- a/www/cherokee/files/pkg-message.in
+++ b/www/cherokee/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-                 **** PLEASE READ THIS ****
-
+[
+{ type: install
+  message: <<EOM
    o  To run Cherokee at startup or using the rc script, you need
       to add
 
@@ -20,4 +20,6 @@
    o  By default, the cherokee daemon runs as www:www user.
       If you need it to run as another user, you'll need to manually
       adjust Makefile and recompile the port.
-
+EOM
+}
+]
diff --git a/www/chpasswd/pkg-message b/www/chpasswd/pkg-message
index 798d1882809f..d36e1f89a364 100644
--- a/www/chpasswd/pkg-message
+++ b/www/chpasswd/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Remember, passwd and log file must be owned by httpd user.
+EOM
+}
+]
diff --git a/www/chrome-gnome-shell/pkg-message b/www/chrome-gnome-shell/pkg-message
index 205be964fb0f..e39730cdba19 100644
--- a/www/chrome-gnome-shell/pkg-message
+++ b/www/chrome-gnome-shell/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This only installs the native host connector.
 
 You will need to install a browser extension in order to use properly
@@ -6,3 +9,6 @@ Chromium: https://chrome.google.com/webstore/detail/gnome-shell-integration/gphh
 Firefox: https://addons.mozilla.org/en-US/firefox/addon/gnome-shell-integration/
 Opera: https://addons.opera.com/en/extensions/details/gnome-shell-integration/
 Epiphany has built in support.
+EOM
+}
+]
diff --git a/www/chromium/files/pkg-message.in b/www/chromium/files/pkg-message.in
index 42176980ac5a..3a2117faec70 100644
--- a/www/chromium/files/pkg-message.in
+++ b/www/chromium/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Chromium has a known problem of hanging tabs. The bug has been fixed
 in r337328. Therefore, it is recommended to upgrade the system after
 the correction date.
@@ -5,3 +8,6 @@ the correction date.
     # svn diff -c337328 --summarize svn://svn.freebsd.org/base
 
 See PR 212812 for further details.
+EOM
+}
+]
diff --git a/www/codeigniter/files/pkg-message-apache.in b/www/codeigniter/files/pkg-message-apache.in
index dc7de006ffb6..5f5f807b5dc2 100644
--- a/www/codeigniter/files/pkg-message-apache.in
+++ b/www/codeigniter/files/pkg-message-apache.in
@@ -1,5 +1,6 @@
-
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 You have just installed the CodeIgniter web application framework.
 
 Note that you should restart your Apache web server to ensure that
@@ -21,3 +22,6 @@ Optional post-installation instructions include:
 - If you are upgrading from a prior release, please visit:
   http://codeigniter.com/user_guide/installation/upgrading.html
   for additional post-installation instructions.
+EOM
+}
+]
diff --git a/www/codeigniter/files/pkg-message-noapache.in b/www/codeigniter/files/pkg-message-noapache.in
index 038b5e1424e2..acb5e94ca18f 100644
--- a/www/codeigniter/files/pkg-message-noapache.in
+++ b/www/codeigniter/files/pkg-message-noapache.in
@@ -1,5 +1,6 @@
-
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 You have just installed the CodeIgniter web application framework.
 
 Optional post-installation instructions include:
@@ -18,3 +19,6 @@ Optional post-installation instructions include:
 - If you are upgrading from a prior release, please visit:
   http://codeigniter.com/user_guide/installation/upgrading.html
   for additional post-installation instructions.
+EOM
+}
+]
diff --git a/www/codeigniter/files/pkg-message.in b/www/codeigniter/files/pkg-message.in
index bb7de32a5712..90223d10011a 100644
--- a/www/codeigniter/files/pkg-message.in
+++ b/www/codeigniter/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 You have just installed the CodeIgniter web application framework.
 
 Note that you should restart your web server to ensure that
@@ -18,3 +19,6 @@ To use CodeIgniter:
 - If you are upgrading from a prior release, please visit:
   http://codeigniter.com/user_guide/installation/upgrading.html
   for additional post-installation instructions.
+EOM
+}
+]
diff --git a/www/coppermine/files/pkg-message.in b/www/coppermine/files/pkg-message.in
index f24bae57dc41..2901024cdb33 100644
--- a/www/coppermine/files/pkg-message.in
+++ b/www/coppermine/files/pkg-message.in
@@ -1,4 +1,6 @@
-****************************************************************
+[
+{ type: install
+  message: <<EOM
 The Coppermine Photo Gallery has been installed in the directory
 %%WWWDIR%%.
 
@@ -14,5 +16,6 @@ A typical configuration would be:
 	Order allow,deny
 	Allow from all
     </Directory>
-
-****************************************************************
+EOM
+}
+]
diff --git a/www/crp/pkg-message b/www/crp/pkg-message
index 45d9c5f44272..5f3dd3c59fcb 100644
--- a/www/crp/pkg-message
+++ b/www/crp/pkg-message
@@ -1,4 +1,8 @@
-*************************************************************
+[
+{ type: install
+  message: <<EOM
 You must edit %%WWWDIR%%/Code/confConfig.inc for your setup,
 and follow the other directions at http://crp.sourceforge.net/installation.html
-*************************************************************
+EOM
+}
+]
diff --git a/www/davical/files/pkg-message.in b/www/davical/files/pkg-message.in
index 3afc7c97796b..cb5ac36f930b 100644
--- a/www/davical/files/pkg-message.in
+++ b/www/davical/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To complete the installation of DAViCal:
 
 1. Create DAViCal's database
@@ -18,3 +21,6 @@ top of the accounts
 	%%DATADIR%%/httpd-davical.conf
 
 to the Apache Include directory and restart Apache.
+EOM
+}
+]
diff --git a/www/dojo-shrinksafe/pkg-message b/www/dojo-shrinksafe/pkg-message
index 116fc3ac36a2..f23c77c23624 100644
--- a/www/dojo-shrinksafe/pkg-message
+++ b/www/dojo-shrinksafe/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 You have just installed Dojo Toolkit Shrinksafe, a Javascript
 code compressor.  Type "dojo-shrinksafe -help" to view the
 available program options.
 
 Full documentation with usage examples may be found at:
 http://dojotoolkit.org/reference-guide/1.9/util/shrinksafe/index.html
+EOM
+}
+]
diff --git a/www/dojo/files/pkg-message.in b/www/dojo/files/pkg-message.in
index bafa28efbc0e..97d4f2c18131 100644
--- a/www/dojo/files/pkg-message.in
+++ b/www/dojo/files/pkg-message.in
@@ -1,6 +1,10 @@
-
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 You have just installed the Dojo DHTML toolkit.
 
 Note that you should restart your Apache web server to ensure that
 the Dojo configuration file is loaded.
+EOM
+}
+]
diff --git a/www/dokuwiki/files/pkg-message.in b/www/dokuwiki/files/pkg-message.in
index 2ced763aa10b..359633452dfb 100644
--- a/www/dokuwiki/files/pkg-message.in
+++ b/www/dokuwiki/files/pkg-message.in
@@ -1,6 +1,6 @@
-======================================================================
-                          INSTALLATION NOTES
-
+[
+{ type: install
+  message: <<EOM
 The wiki program have been installed to %%WWWDIR%%.
 
 Please configure your web server to allow running PHP scripts there.
@@ -20,5 +20,6 @@ http://wiki.splitbrain.org/wiki:config
 
 After installation please change the permissions of
 %%WWWDIR%%/conf back to root:wheel.
-
-======================================================================
+EOM
+}
+]
diff --git a/www/domoticz/pkg-message b/www/domoticz/pkg-message
index b586a784fdfc..2d59fc7acdf7 100644
--- a/www/domoticz/pkg-message
+++ b/www/domoticz/pkg-message
@@ -1,4 +1,6 @@
-Notice:
+[
+{ type: install
+  message: <<EOM
  This port runs per default using uid:gid domoticz:domoticz to
  avoid security problems.
 
@@ -12,3 +14,6 @@ domoticz_group="wheel"
 
 If you have issues with domoticz listen option, you can add
  net.inet6.ip6.v6only=0 to /etc/sysctl.conf
+EOM
+}
+]
diff --git a/www/drupal7/files/pkg-message.in b/www/drupal7/files/pkg-message.in
index ba07752771c0..75c0012674fa 100644
--- a/www/drupal7/files/pkg-message.in
+++ b/www/drupal7/files/pkg-message.in
@@ -1,4 +1,6 @@
-################################################################################
+[
+{ type: install
+  message: <<EOM
 Complete instructions for installing and configuring Drupal can be found here:
 
 %%DOCSDIR%%/INSTALL.txt
@@ -36,7 +38,12 @@ configuration:
 - PHP "register_globals" is set to "Off"
 - PHP "safe_mode" is set to "Off"
 - PHP "session.cache_limiter" is set to "nocache"
-
+EOM
+}
+{ type: UPGRADE
+  message: <<EOM
 For important information about upgrading from previous versions of Drupal, please
 please see: %%DOCSDIR%%/UPGRADE.txt
-################################################################################
+EOM
+}
+]
diff --git a/www/drupal8/files/pkg-message.in b/www/drupal8/files/pkg-message.in
index fb81a280c1df..ed143c768f7e 100644
--- a/www/drupal8/files/pkg-message.in
+++ b/www/drupal8/files/pkg-message.in
@@ -1,4 +1,6 @@
-################################################################################
+[
+{ type: install
+  message: <<EOM
 Complete instructions for installing and configuring Drupal can be found here:
 
 %%DOCSDIR%%/INSTALL.txt
@@ -36,10 +38,15 @@ configuration:
 - PHP "register_globals" is set to "Off"
 - PHP "safe_mode" is set to "Off"
 - PHP "session.cache_limiter" is set to "nocache"
-
+EOM
+}
+{ type: UPGRADE
+  message: <<EOM
 For important information about upgrading from previous versions of Drupal, please
 please see: %%DOCSDIR%%/UPDATE.txt
 
 You can install www/drush if you have problems with Drupal update. Drush is a 
 command line tool for Drupal
-################################################################################
+EOM
+}
+]
diff --git a/www/e107/files/pkg-message.in b/www/e107/files/pkg-message.in
index 65fe3bc15c98..f1648effa762 100644
--- a/www/e107/files/pkg-message.in
+++ b/www/e107/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR e107
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Create a user and a database for e107 to store all
    its tables in (or choose an existing database).
 
@@ -24,7 +24,6 @@ For more information, see the INSTALL DOCUMENTATION:
 
    http://wiki.e107.org/?title=HOWTO:Install_e107
    http://wiki.e107.org/?title=HOWTO:Install_troubleshoot
-
-Enjoying it !
-
-=========================================================
+EOM
+}
+]
diff --git a/www/e2guardian/files/pkg-message.in b/www/e2guardian/files/pkg-message.in
index 927a455dabd0..5dd910f08136 100644
--- a/www/e2guardian/files/pkg-message.in
+++ b/www/e2guardian/files/pkg-message.in
@@ -1,4 +1,6 @@
-####################################################################################
+[
+{ type: install
+  message: <<EOM
      o You can find the configuration files for this package in the
        directory %%PREFIX%%/etc/e2guardian.
 
@@ -46,4 +48,6 @@
          - GitHub repository https://github.com/e2guardian/e2guardian/
          - support forum https://groups.google.com/forum/#!forum/e2guardian
          - link for bug reports https://github.com/e2guardian/e2guardian/issues
-####################################################################################
+EOM
+}
+]
diff --git a/www/efront/files/pkg-message.in b/www/efront/files/pkg-message.in
index 509e8ce476d7..95e562501b23 100644
--- a/www/efront/files/pkg-message.in
+++ b/www/efront/files/pkg-message.in
@@ -1,5 +1,6 @@
-POST-INSTALL CONFIGURATION FOR EFRONT
-=====================================
+[
+{ type: install
+  message: <<EOM
 1 Add the following to your Apache configuration, and
    restart the server:
 
@@ -17,5 +18,6 @@ POST-INSTALL CONFIGURATION FOR EFRONT
    be taken to the install.php script, which will lead
    you through creating a config file and then
    setting up eFront, creating an admin account, etc.
-=====================================================
-
+EOM
+}
+]
diff --git a/www/elgg/files/pkg-message.in b/www/elgg/files/pkg-message.in
index 14f221fdc1ce..111b9058897f 100644
--- a/www/elgg/files/pkg-message.in
+++ b/www/elgg/files/pkg-message.in
@@ -1,10 +1,6 @@
-POST-UPGRADE INSTRUCTIONS
-=========================
-Please follow instructions in %%WWWDIR%%/UPGRADE.txt.
-
-
-POST-INSTALL CONFIGURATION FOR ELGG
-===================================
+[
+{ type: install
+  message: <<EOM
 1) Make sure your apache's mod_rewrite extension is working,
 and change the AllowOverride setting of the DocumentRoot to
     AllowOverride all
@@ -28,5 +24,11 @@ For more information, see the INSTALL DOCUMENTATION:
 
    http://docs.elgg.org/wiki/Installation
    http://docs.elgg.org/wiki/Troubleshooting
-
-=====================================
+EOM
+}
+{ type: install
+  message: <<EOM
+Please follow instructions in %%WWWDIR%%/UPGRADE.txt.
+EOM
+}
+]
diff --git a/www/emacs-w3m/pkg-message b/www/emacs-w3m/pkg-message
index 91687eaf932d..c2c812184e4b 100644
--- a/www/emacs-w3m/pkg-message
+++ b/www/emacs-w3m/pkg-message
@@ -1,20 +1,24 @@
-********************************************************************
-* Before using emacs-w3m, you must add this to your own .emacs:    *
-*                                                                  *
-* (autoload 'w3m "w3m" "Interface for w3m on Emacs." t)            *
-*                                                                  *
-* To use emacs-w3m on Wanderlust, add this to your own .emacs:     *
-*                                                                  *
-* (require 'mime-w3m)                                              *
-*                                                                  *
-* To use emacs-w3m on Mew, add this to your own .mew.el:           *
-*                                                                  *
-* (require 'mew-w3m)                                               *
-* (setq mew-prog-html '(mew-mime-text/html-w3m nil nil))           *
-*                                                                  *
-* And to use octet stream viewer, add this to your own .emacs:     *
-*                                                                  *
-* (require 'w3m)                                                   *
-* (require 'octet)                                                 *
-* (octet-mime-setup)                                               *
-********************************************************************
+[
+{ type: install
+  message: <<EOM
+ Before using emacs-w3m, you must add this to your own .emacs:
+
+ (autoload 'w3m "w3m" "Interface for w3m on Emacs." t)
+
+ To use emacs-w3m on Wanderlust, add this to your own .emacs:
+
+ (require 'mime-w3m)
+
+ To use emacs-w3m on Mew, add this to your own .mew.el:
+
+ (require 'mew-w3m)
+ (setq mew-prog-html '(mew-mime-text/html-w3m nil nil))
+
+ And to use octet stream viewer, add this to your own .emacs:
+
+ (require 'w3m)
+ (require 'octet)
+ (octet-mime-setup)
+EOM
+}
+]
diff --git a/www/falkon/pkg-message b/www/falkon/pkg-message
index 0ece5312a771..85e76631c521 100644
--- a/www/falkon/pkg-message
+++ b/www/falkon/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 On FreeBSD < 11.3 Web Content process may frequently crash due to bug 181741.
 If you cannot upgrade try applying the following workaround:
 
 # sysctl net.local.stream.recvspace=16384
+EOM
+}
+]
diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message
index a947abccda5c..54339ed984ff 100644
--- a/www/firefox-esr/pkg-message
+++ b/www/firefox-esr/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Some features available on other platforms are not implemented:
 - Native audio (requires OSS backend, feature parity with ALSA or PulseAudio)
 - Encrypted Media Extensions (requires Widevine CDM binary)
@@ -11,21 +12,21 @@ Some features available on other platforms are not implemented:
 - WebVR (requires open source runtime)
 - TCP fast open
 
-======================================================================
+
 
 On FreeBSD < 11.3 Web Content process may frequently crash due to bug 181741.
 If you cannot upgrade try applying the following workaround:
 
 $ sysctl net.local.stream.recvspace=16384
 
-======================================================================
+
 
 To select non-default audio backend open about:config page and create
 media.cubeb.backend preference. Supported values are: alsa, jack,
 pulse, pulse-rust, sndio. Currently used backend can be inspected
 on about:support page.
 
-======================================================================
+
 
 smb:// issues (Gvfs/GIO option):
 Network group, machine, and share browsing does not work correctly.
@@ -38,5 +39,6 @@ ssh-keygen
 cat ~/.ssh/id_rsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
 
 The SSH server on remote_host must allow pub key authentication.
-
-======================================================================
+EOM
+}
+]
diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message
index 3fbe33357346..40f9dd50773b 100644
--- a/www/firefox/pkg-message
+++ b/www/firefox/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Some features available on other platforms are not implemented:
 - Native audio (requires OSS backend, feature parity with ALSA or PulseAudio)
 - Encrypted Media Extensions (requires Widevine CDM binary)
@@ -12,21 +13,21 @@ Some features available on other platforms are not implemented:
 - TCP fast open
 - about:networking (requires link state notification)
 
-======================================================================
+
 
 On FreeBSD < 11.3 Web Content process may frequently crash due to bug 181741.
 If you cannot upgrade try applying the following workaround:
 
 $ sysctl net.local.stream.recvspace=16384
 
-======================================================================
+
 
 To select non-default audio backend open about:config page and create
 media.cubeb.backend preference. Supported values are: alsa, jack,
 pulse, pulse-rust, sndio. Currently used backend can be inspected
 on about:support page.
 
-======================================================================
+
 
 smb:// issues (Gvfs/GIO option):
 Network group, machine, and share browsing does not work correctly.
@@ -39,5 +40,6 @@ ssh-keygen
 cat ~/.ssh/id_rsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
 
 The SSH server on remote_host must allow pub key authentication.
-
-======================================================================
+EOM
+}
+]
diff --git a/www/fnord/files/pkg-message.in b/www/fnord/files/pkg-message.in
index 47277dcefcc0..5046d7936aea 100644
--- a/www/fnord/files/pkg-message.in
+++ b/www/fnord/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Now that fnord is installed, do the following :
 
 1) If you chose to use daemontools and/or tcpserver, I assume you
@@ -23,4 +25,6 @@ know how to do it, go to 4). If you chose to use inetd go to 2).
 5- Test with your favorite web browser.
 
    # links http://host.tld/index.html
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/formication/files/pkg-message.in b/www/formication/files/pkg-message.in
index 94ac65c25896..39cd79aaf8ba 100644
--- a/www/formication/files/pkg-message.in
+++ b/www/formication/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You have installed the formication package.
 
 Edit %%LOCALBASE%%/etc/apache/httpd.conf and add:
@@ -8,5 +9,6 @@ Edit %%LOCALBASE%%/etc/apache/httpd.conf and add:
     AddHandler formication .fcn
 
 Read %%DOCSDIR%%/formication.txt to learn how to use
-
-*****************************************************************************
+EOM
+}
+]
diff --git a/www/foswiki/files/pkg-message-apache.in b/www/foswiki/files/pkg-message-apache.in
index 765c7b19e43c..453a2bad857e 100644
--- a/www/foswiki/files/pkg-message-apache.in
+++ b/www/foswiki/files/pkg-message-apache.in
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 You have just installed Foswiki with a sample Apache configuration
 file.
 
@@ -36,4 +38,6 @@ To complete the installation, please:
 
 - Visit http://foswiki.org/System/InstallationGuide#Configure_Foswiki for
   additional post-installation configuration information.
-
+EOM
+}
+]
diff --git a/www/foswiki/files/pkg-message-noapache.in b/www/foswiki/files/pkg-message-noapache.in
index 68a58b05c678..5727dbff8ad0 100644
--- a/www/foswiki/files/pkg-message-noapache.in
+++ b/www/foswiki/files/pkg-message-noapache.in
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 You have just installed Foswiki without configuring it for a specific
 web server.
 
@@ -11,3 +13,6 @@ Notes for Apache 2.4 users:
 * Generate a new foswiki.conf for Apache 2.4:
     https://foswiki.org/Support.ApacheConfigGenerator
 * Enable these DSO modules in httpd.conf: cgi_module, rewrite_module
+EOM
+}
+]
diff --git a/www/ftasv/files/pkg-message.in b/www/ftasv/files/pkg-message.in
index 1ce132eea120..6a3f55825bde 100644
--- a/www/ftasv/files/pkg-message.in
+++ b/www/ftasv/files/pkg-message.in
@@ -1,8 +1,8 @@
-
-*******************************************************************************
-
+[
+{ type: install
+  message: <<EOM
     See %%DOCSDIR%%/README to know how configure the httpd.conf
     of your apache.
-
-*******************************************************************************
-
+EOM
+}
+]
diff --git a/www/g-gcl/pkg-message b/www/g-gcl/pkg-message
index 67c534f70dd8..3e047d88e248 100644
--- a/www/g-gcl/pkg-message
+++ b/www/g-gcl/pkg-message
@@ -1,5 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
    Sample scripts installed in the
    ${PREFIX}/share/examples/gracula/
    directory.
-
+EOM
+}
+]
diff --git a/www/gallery2/files/pkg-message.in b/www/gallery2/files/pkg-message.in
index 895f8f5f678b..e35f3709b33d 100644
--- a/www/gallery2/files/pkg-message.in
+++ b/www/gallery2/files/pkg-message.in
@@ -1,4 +1,6 @@
-*****************************************************************
+[
+{ type: install
+  message: <<EOM
 Before using Gallery 2, you will need to configure your database.
 Full instructions are available here:
 
@@ -27,4 +29,6 @@ Then restart Apache: 'apachectl graceful'
 
 Please visit 'http://{host.domain}/gallery2/' in a
 web-browser and follow the configuration instructions.
-*****************************************************************
+EOM
+}
+]
diff --git a/www/geneweb/files/pkg-message.in b/www/geneweb/files/pkg-message.in
index aeab4e886690..733080ef03ca 100644
--- a/www/geneweb/files/pkg-message.in
+++ b/www/geneweb/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 In order to install GeneWeb in a user's public_html directory, please run:
 	%%DATADIR%%/install.sh
 OR from directory to install in, run:
@@ -25,5 +26,6 @@ using an up-to-date template. Additional attributes, e.g., occupation got
 added around v6.06, and if your template does not include this, you will
 likely experience problems as the code throws an exception when trying to
 edit a family.
-
-==========================================================================
+EOM
+}
+]
diff --git a/www/gitea/pkg-message b/www/gitea/pkg-message
index 1aea18f07d54..a7d61a2459ab 100644
--- a/www/gitea/pkg-message
+++ b/www/gitea/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 When upgrading from Gitea 1.7 or earlier, Gitea requires the addition of
 another secret to the config file in order to start up.  Either manually add
 JWT_SECRET to the ${PREFIX}/etc/gitea/conf/app.ini config file (see
 app.ini.sample), or allow Gitea to make the change for you by making the
 config file writable to the git user.
+EOM
+}
+]
diff --git a/www/glassfish/pkg-message b/www/glassfish/pkg-message
index c17d74edce90..48f4178b5c18 100644
--- a/www/glassfish/pkg-message
+++ b/www/glassfish/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 To run the glassfish java application server from startup,
 add glassfish_enable="YES" in your /etc/rc.conf.
 
 Extra options can be found in startup script.
+EOM
+}
+]
diff --git a/www/glpi/files/pkg-message.in b/www/glpi/files/pkg-message.in
index 7119f389f5ca..7d4560fd80fd 100644
--- a/www/glpi/files/pkg-message.in
+++ b/www/glpi/files/pkg-message.in
@@ -1,4 +1,6 @@
-*****************************************************************
+[
+{ type: install
+  message: <<EOM
 First time installation notes:
 
 Before using GLPI, you will need to configure your database.
@@ -30,4 +32,6 @@ Then reload Apache: 'apachectl graceful'
 
 Please visit 'http://{host.domain}/glpi/' in a
 web-browser and follow the configuration instructions.
-*****************************************************************
+EOM
+}
+]
diff --git a/www/gnome-user-share/pkg-message b/www/gnome-user-share/pkg-message
index 84e4725071cf..c34fe9527b0f 100644
--- a/www/gnome-user-share/pkg-message
+++ b/www/gnome-user-share/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Run gnome-file-share-properties as the user with which you want
 to use gnome-user-share, then logout and log back into GNOME.  Now everything
 under ~/Public should be shared.  You can view this by opening Nautilus, and
 clicking on the Network icon under Computer.
+EOM
+}
+]
diff --git a/www/grails/files/pkg-message.in b/www/grails/files/pkg-message.in
index 41de075d1dc2..7ea5ef6ec61b 100644
--- a/www/grails/files/pkg-message.in
+++ b/www/grails/files/pkg-message.in
@@ -1,9 +1,11 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 Before you start using Grails you will need to set the GRAILS_HOME environment
 variable to %%JAVASHAREDIR%%/grails
 
 Documentation on creating your first Grails application can be found at the
 Grails website http://grails.codehaus.org/
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/www/groupoffice/files/pkg-message.in b/www/groupoffice/files/pkg-message.in
index f8deaa7f6b0d..7428b435c7d4 100644
--- a/www/groupoffice/files/pkg-message.in
+++ b/www/groupoffice/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 GroupOffice has been installed into:
 
     %%WWWDIR%%
@@ -16,3 +19,6 @@ or update
 	http://<hostname>/groupoffice/install/upgrade.php
 
 in a web-browser and follow the configuration instructions.
+EOM
+}
+]
diff --git a/www/guacamole-client/files/pkg-message.in b/www/guacamole-client/files/pkg-message.in
index 20df17fc94c8..da50a7500211 100644
--- a/www/guacamole-client/files/pkg-message.in
+++ b/www/guacamole-client/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For a quick Guacamole setup and test:
 	Guacamole-client requires authentication to start.
 	cp %%ETCDIR%%/user-mapping.xml.sample \
@@ -9,3 +12,6 @@ For a quick Guacamole setup and test:
 For upgrading guacamole, this is a reminder to upgrade
 the auth-extensions. (and database if jdbc is used)
 https://guacamole.apache.org/doc/gug/jdbc-auth.html
+EOM
+}
+]
diff --git a/www/hastymail2-devel/files/pkg-message.in b/www/hastymail2-devel/files/pkg-message.in
index 6d5fd9be6aaa..a85b7ea8856b 100644
--- a/www/hastymail2-devel/files/pkg-message.in
+++ b/www/hastymail2-devel/files/pkg-message.in
@@ -1,5 +1,6 @@
-******************************************************
-
+[
+{ type: install
+  message: <<EOM
 You have successfully installed Hastymail webmail client.
 Don't forget to edit your own config file. A sample config
 has been installed in:
@@ -17,5 +18,6 @@ after you edit config file run:
     hastymail2.conf hastymail2.rc
 
 Note: if hastymail2.rc already exists, you must remove it
-
-******************************************************
+EOM
+}
+]
diff --git a/www/hiawatha-monitor/files/pkg-message.in b/www/hiawatha-monitor/files/pkg-message.in
index 19cff1a5235d..16b08d7d9efc 100644
--- a/www/hiawatha-monitor/files/pkg-message.in
+++ b/www/hiawatha-monitor/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 See %%DOCSDIR%%/INSTALL for setup instructions.
 
 All monitored web servers have to be compiled with Hiawatha Monitor
 support.  In www/hiawatha it can be enabled through the MONITOR
 option.
+EOM
+}
+]
diff --git a/www/hotcrp/files/pkg-message.in b/www/hotcrp/files/pkg-message.in
index a2b5e3a0fa9c..341f52e4dcae 100644
--- a/www/hotcrp/files/pkg-message.in
+++ b/www/hotcrp/files/pkg-message.in
@@ -1,8 +1,6 @@
-
-***********************************************************************
-*                         POST INSTALL CONFIGURATION                  *
-***********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please note that everything has been installed in %%WWWDIR%%.
 
 Read %%WWWDIR%%/README.md.
@@ -18,3 +16,6 @@ like this:
 	</Directory>
 
 And restart Apache.
+EOM
+}
+]
diff --git a/www/ilias/files/pkg-message.in b/www/ilias/files/pkg-message.in
index ef20725f088b..412f3f3e0cff 100644
--- a/www/ilias/files/pkg-message.in
+++ b/www/ilias/files/pkg-message.in
@@ -1,6 +1,7 @@
-=============================================
-1 Congratulations! You have successfully installed
-ILIAS e-learning platform. Please keep in mind that
+[
+{ type: install
+  message: <<EOM
+1 Please keep in mind that
 heavily used ILIAS installation can cause huge growth
 of your log file, so remember to disable notices logging
 in your PHP installation.
@@ -30,4 +31,6 @@ with username/root and password/homer as the administrator.
 
 For more information, see the INSTALL DOCUMENTATION:
 http://www.ilias.de/docu/goto.php?target=lm_367&client_id=docu
-=============================================
+EOM
+}
+]
diff --git a/www/itop/files/pkg-message.in b/www/itop/files/pkg-message.in
index 98660a2a5ed1..50735511d8c4 100644
--- a/www/itop/files/pkg-message.in
+++ b/www/itop/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Installation:
 
 1. Ensure that all the scripts have the appropriate owner (if PHP is running in
@@ -25,3 +28,6 @@ Installation:
 
 3. Open the main iTop directory in your web browser. iTop should then display
    the setup instructions on screen.
+EOM
+}
+]
diff --git a/www/jetty9/files/pkg-message.in b/www/jetty9/files/pkg-message.in
index d12da5dbab0a..a316a86eb5b7 100644
--- a/www/jetty9/files/pkg-message.in
+++ b/www/jetty9/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=== INSTALLATION ===
-
+[
+{ type: install
+  message: <<EOM
 Jetty is now installed in %%APP_HOME%%
 
 From Jetty 9, the way to configure it has changed. You are **strongly**
@@ -46,11 +46,13 @@ variables in the configuration file, e.g.,
   JAVA_OPTIONS="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8186"
 
 More configuration options are presented in the sample file.
-
-== DEINSTALLATION ==
-
+EOM
+}
+{ type: remove
+  message: <<EOM
 If, when, Jetty is removed, you can safely delete this directory:
 
     %%WWWDIR%%
-
-Enjoy!
+EOM
+}
+]
diff --git a/www/joomla3/files/pkg-message.in b/www/joomla3/files/pkg-message.in
index b20aca218574..d0eb6d077313 100644
--- a/www/joomla3/files/pkg-message.in
+++ b/www/joomla3/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
  1) Add the following to your Apache configuration, and restart the server:
 
   ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later.
@@ -26,5 +27,6 @@
  4) As of 3.6.4, php7 is also supported, and the php*-mysql extension is NOT 
     asked for.  Also, the php*-pgsql extension is asked for as Joomla supports
     PostgreSQL as well.
-
-================================================================================
+EOM
+}
+]
diff --git a/www/jspwiki/pkg-message b/www/jspwiki/pkg-message
index 4a7fdb90e689..93425ddc209a 100644
--- a/www/jspwiki/pkg-message
+++ b/www/jspwiki/pkg-message
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 Now you should start your Tomcat server and browse with:
 
    http://your-server:8180/JSPWiki/
@@ -6,4 +8,6 @@ Now you should start your Tomcat server and browse with:
 to do some configuration.
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/www/junkbuster/files/pkg-message.in b/www/junkbuster/files/pkg-message.in
index 443324a72e01..e0c85e3a2bc5 100644
--- a/www/junkbuster/files/pkg-message.in
+++ b/www/junkbuster/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Please, review the samples of the configuration files (in
 %%PREFIX%%/etc/junkbuster/) and create your own config files. Read
 the junkbuster man-page (man junkbuster) for even more information.
+EOM
+}
+]
diff --git a/www/kannel-sqlbox/files/pkg-message.in b/www/kannel-sqlbox/files/pkg-message.in
index 893afe616cf5..7d57e25be0ff 100644
--- a/www/kannel-sqlbox/files/pkg-message.in
+++ b/www/kannel-sqlbox/files/pkg-message.in
@@ -1,7 +1,9 @@
-**********************************************************************
-
+[
+{ type: upgrade, maximum_version: 1.0.0
+  message: <<EOM
 If you are upgrading kannel-sqlbox from a version prior to 1.0.1, 
 please, remove tables `send_sms` and `sent_sms` before starting it 
 and let kannel_sqlbox recreate them.
-
-**********************************************************************
+EOM
+}
+]
diff --git a/www/kohana/files/pkg-message.in b/www/kohana/files/pkg-message.in
index 000ac34373c3..f5f7048c8ef8 100644
--- a/www/kohana/files/pkg-message.in
+++ b/www/kohana/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use Kohana framework you should do the following:
 1. Copy %%WWWDIR%%/index.php and %%WWWDIR%%/install.php
    to your public directory.
@@ -7,3 +10,6 @@ To use Kohana framework you should do the following:
 3. Modify index.php if it's necessary.
 4. Open index.php in your browser and check the requirements.
 5. If the requirements are right you can delete install.php.
+EOM
+}
+]
diff --git a/www/larbin/files/pkg-message.in b/www/larbin/files/pkg-message.in
index 0ac00cb07304..70266f846288 100644
--- a/www/larbin/files/pkg-message.in
+++ b/www/larbin/files/pkg-message.in
@@ -1,9 +1,11 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 You must invoke larbin with the name of the configuration file, e.g:
 larbin -c config-file
 
 Documentation: %%DOCSDIR%%
 Configuration file: %%PREFIX%%/etc/larbin.conf.sample
-
-=====================================================================
+EOM
+}
+]
diff --git a/www/libresonic-standalone/files/pkg-message.in b/www/libresonic-standalone/files/pkg-message.in
index d10c8e1bc3cd..b3d497893d90 100644
--- a/www/libresonic-standalone/files/pkg-message.in
+++ b/www/libresonic-standalone/files/pkg-message.in
@@ -1,12 +1,12 @@
-
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Enable Libresonic by putting the following line in /etc/rc.conf
   libresonic_enable="YES"
 
 See %%LOCALBASE%%/etc/rc.d/libresonic for all the options.
 
-========================================================================
+
 
 Transcoding in Libresonic is a way to re-encode music on the fly to a format
 your listening device supports. A common use is transcoding FLAC, WMA, and
@@ -46,6 +46,6 @@ the heavy FFmpeg dependency:
 
   [Trackers to MP3] [mod s3m xm it] [mp3] ...
     [xmp -q -c %s] [lame --silent -h -b %b -]
-
-========================================================================
-
+EOM
+}
+]
diff --git a/www/lightsquid/files/pkg-message.in b/www/lightsquid/files/pkg-message.in
index f58aa558a34f..3708cbebac99 100644
--- a/www/lightsquid/files/pkg-message.in
+++ b/www/lightsquid/files/pkg-message.in
@@ -1,4 +1,8 @@
-****************************************************************************
+[
+{ type: install
+  message: <<EOM
 %%NOTEWORK%%
 Edit %%ETCDIR%%/lightsquid.cfg to suit your needs.
-****************************************************************************
+EOM
+}
+]
diff --git a/www/linux-flashplayer/pkg-message b/www/linux-flashplayer/pkg-message
index 723ecf62582d..8e299801935d 100644
--- a/www/linux-flashplayer/pkg-message
+++ b/www/linux-flashplayer/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Flash Player needs linprocfs mounted on /compat/linux/proc.  Add the
 following line to /etc/fstab:
 
 linprocfs   /compat/linux/proc	linprocfs	rw	0	0
 
 Then run "mount /compat/linux/proc".
+EOM
+}
+]
diff --git a/www/lynx/files/pkg-message.in b/www/lynx/files/pkg-message.in
index dc916cfe4dd0..313691dbf4dd 100644
--- a/www/lynx/files/pkg-message.in
+++ b/www/lynx/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable certificate handling for SSL connnections, set
 SSL_CERT_DIR and SSL_CERT_FILE in your environment to the
 proper values (depending upon which SSL library
@@ -11,3 +14,6 @@ and:
 
 You may also need to generate keys and certificates as
 described in the latter document and your SSL documentation.
+EOM
+}
+]
diff --git a/www/mathopd/pkg-message b/www/mathopd/pkg-message
index a83acc6b4f77..413b82a7dbaa 100644
--- a/www/mathopd/pkg-message
+++ b/www/mathopd/pkg-message
@@ -1,5 +1,6 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 Before you start the server you must create a config file.
 The easiest way to do it is to copy /usr/local/etc/mathopd.conf.sample
 to /usr/local/etc/mathopd.conf and edit this file to your taste.
@@ -9,5 +10,6 @@ and run it.
 
 Also do not forget to create your web hierarchy and to set its
 permissions to something secure.
-
-=====================================================================
+EOM
+}
+]
diff --git a/www/matomo/files/pkg-message.in b/www/matomo/files/pkg-message.in
index d9e9b45f1ec8..a1814e02077d 100644
--- a/www/matomo/files/pkg-message.in
+++ b/www/matomo/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-POST-INSTALL CONFIGURATION FOR Matomo
-=======================================
+[
+{ type: install
+  message: <<EOM
 1) Create a user and a empty database for Matomo to store all
    its tables in (or choose an existing database).
 
@@ -25,5 +25,6 @@ POST-INSTALL CONFIGURATION FOR Matomo
 For more information, see the INSTALL DOCUMENTATION:
 
   https://matomo.org/docs/installation/
-
-========================================
+EOM
+}
+]
diff --git a/www/mediawiki131/files/pkg-message.in b/www/mediawiki131/files/pkg-message.in
index d98978fe6903..b05e89945b5f 100644
--- a/www/mediawiki131/files/pkg-message.in
+++ b/www/mediawiki131/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-	**** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
@@ -9,3 +10,6 @@ and
 %%MEDIAWIKIDIR%%/UPGRADE
 
 for details
+EOM
+}
+]
diff --git a/www/mediawiki132/files/pkg-message.in b/www/mediawiki132/files/pkg-message.in
index d98978fe6903..b05e89945b5f 100644
--- a/www/mediawiki132/files/pkg-message.in
+++ b/www/mediawiki132/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-	**** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
@@ -9,3 +10,6 @@ and
 %%MEDIAWIKIDIR%%/UPGRADE
 
 for details
+EOM
+}
+]
diff --git a/www/mediawiki133/files/pkg-message.in b/www/mediawiki133/files/pkg-message.in
index d98978fe6903..b05e89945b5f 100644
--- a/www/mediawiki133/files/pkg-message.in
+++ b/www/mediawiki133/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-	**** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
@@ -9,3 +10,6 @@ and
 %%MEDIAWIKIDIR%%/UPGRADE
 
 for details
+EOM
+}
+]
diff --git a/www/mnogosearch/files/pkg-message.in b/www/mnogosearch/files/pkg-message.in
index dca5bf258a56..1848f6eb236b 100644
--- a/www/mnogosearch/files/pkg-message.in
+++ b/www/mnogosearch/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 mnoGoSearch is successfully installed.
 Now, to use mnoGoSearch you need to create the appropriate *sql database
 manually: Please read INSTALL file located in %%DOCSDIR%%.
 
 For more information on how to use mnoGoSearch, please refer to their
 web site at http://www.mnogosearch.org/
+EOM
+}
+]
diff --git a/www/mod_auth_cas/pkg-message b/www/mod_auth_cas/pkg-message
index 7b7fceb700f8..b7e5463a1b8b 100644
--- a/www/mod_auth_cas/pkg-message
+++ b/www/mod_auth_cas/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
  Set a few required parameters in your Apache configuration:
 
  CASCookiePath   /var/cache/apache2/mod_auth_cas/
@@ -29,4 +31,6 @@
 
  For more informations see:
  https://github.com/Jasig/mod_auth_cas
-======================================================================
+EOM
+}
+]
diff --git a/www/mod_auth_openidc/files/pkg-message.in b/www/mod_auth_openidc/files/pkg-message.in
index 17b27c4c3282..246fa143344c 100644
--- a/www/mod_auth_openidc/files/pkg-message.in
+++ b/www/mod_auth_openidc/files/pkg-message.in
@@ -1,7 +1,11 @@
-===========================================================================
+[
+{ type: install
+  message: <<EOM
 Please add the following to %%PREFIX%%/%%APACHEETCDIR%%/httpd.conf:
 LoadModule auth_openidc_module %%APACHEMODDIR%%/mod_auth_openidc.so
 
 Then update the following config file with your settings:
 %%PREFIX%%/%%APACHEETCDIR%%/Includes/auth_openidc.conf
-===========================================================================
+EOM
+}
+]
diff --git a/www/mod_authnz_crowd/files/pkg-message.in b/www/mod_authnz_crowd/files/pkg-message.in
index 773846188c0f..5eb62a478297 100644
--- a/www/mod_authnz_crowd/files/pkg-message.in
+++ b/www/mod_authnz_crowd/files/pkg-message.in
@@ -1,5 +1,6 @@
-=================================================================
-
+[
+{ type: install
+  message: <<EOM
 authnz_crowd apache config was installed as
   %%PREFIX%%/%%APACHEETCDIR%%/Includes/zzz_authnz_crowd.conf
 
@@ -10,5 +11,6 @@ modules are enabled and loaded first, like this:
   LoadModule authz_svn_module %%APACHEMODDIR%%/mod_authz_svn.so
 
   Include %%APACHEETCDIR%%/Includes/zzz_authnz_crowd.conf
-
-=================================================================
+EOM
+}
+]
diff --git a/www/mod_cvs2/pkg-message b/www/mod_cvs2/pkg-message
index 980fb7be273b..4c25e0fde1b4 100644
--- a/www/mod_cvs2/pkg-message
+++ b/www/mod_cvs2/pkg-message
@@ -1,6 +1,10 @@
------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 You have installed mod_cvs, a module that makes Apache CVS aware.
 
 For help on using this module, please see the mod_cvs reference:
     http://www.sub.nu/mod_cvs/reference.shtml
------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/mod_fcgid/files/pkg-message.in b/www/mod_fcgid/files/pkg-message.in
index 25838e2a4cb6..17707a68c4f3 100644
--- a/www/mod_fcgid/files/pkg-message.in
+++ b/www/mod_fcgid/files/pkg-message.in
@@ -1,4 +1,6 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 To enable this module, add something like the following
 lines to your server configuration file:
 
@@ -11,4 +13,6 @@ lines to your server configuration file:
 If you are upgrading from mod_fcgid 2.2, you have to rename
 the directives you have used in the config files:
 http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#upgrade
-************************************************************
+EOM
+}
+]
diff --git a/www/mod_gnutls/files/pkg-message.in b/www/mod_gnutls/files/pkg-message.in
index f8dad14e39ee..eb9fc1736628 100644
--- a/www/mod_gnutls/files/pkg-message.in
+++ b/www/mod_gnutls/files/pkg-message.in
@@ -1,5 +1,6 @@
-*********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Sample %%PREFIX%%/%%APACHEETCDIR%%/httpd.conf:
 
     #LoadModule ssl_module %%APACHEMODDIR%%/mod_ssl.so
@@ -23,5 +24,6 @@ Sample %%PREFIX%%/%%APACHEETCDIR%%/extra/httpd-gnutls.conf:
         GnuTLSClientCAFile %%PREFIX%%/etc/ssl/certs/example_com.ca.pem
         GnuTLSPriorities NORMAL:%COMPAT
     </VirtualHost>
-
-*********************************************************************
+EOM
+}
+]
diff --git a/www/mod_jk/files/pkg-message.in b/www/mod_jk/files/pkg-message.in
index 8ee47a2ad630..22b8a3aa47dd 100644
--- a/www/mod_jk/files/pkg-message.in
+++ b/www/mod_jk/files/pkg-message.in
@@ -1,5 +1,9 @@
-*****************************************************************************
+[
+{ type: install
+  message: <<EOM
 Make sure mod_jk.so is enabled in %%APACHEETCDIR%%/httpd.conf and
 mod_jk is configured.  Have a look at
 %%APACHEETCDIR%%/mod_jk.conf.sample for an example.
-*****************************************************************************
+EOM
+}
+]
diff --git a/www/mod_log_sql2/files/pkg-message.in b/www/mod_log_sql2/files/pkg-message.in
index ceb3aeb29219..fb83310af788 100644
--- a/www/mod_log_sql2/files/pkg-message.in
+++ b/www/mod_log_sql2/files/pkg-message.in
@@ -1,6 +1,10 @@
-============================================================
-* The mod_log_sql modules have been installed.
-*
-* The module config file was installed as
-*   %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMODCFG%%
-============================================================
+[
+{ type: install
+  message: <<EOM
+ The mod_log_sql modules have been installed.
+
+ The module config file was installed as
+   %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMODCFG%%
+EOM
+}
+]
diff --git a/www/mod_perl2/files/pkg-message.in b/www/mod_perl2/files/pkg-message.in
index 3275782bc87e..61e14f4415b6 100644
--- a/www/mod_perl2/files/pkg-message.in
+++ b/www/mod_perl2/files/pkg-message.in
@@ -1,4 +1,6 @@
-===================================================================
+[
+{ type: install
+  message: <<EOM
 Simple config:
 
   LoadModule perl_module %%APACHEMODDIR%%/mod_perl.so
@@ -15,5 +17,6 @@ or online:
 
 The module can be enabled in
  %%APACHEETCDIR%%/modules.d/260_mod_perl.conf
-
-===================================================================
+EOM
+}
+]
diff --git a/www/mod_python35/files/pkg-message.in b/www/mod_python35/files/pkg-message.in
index ce6b37b01207..2af65eab79f8 100644
--- a/www/mod_python35/files/pkg-message.in
+++ b/www/mod_python35/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 The mod_python module is no longer activated in httpd.conf!
 There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
 
@@ -11,5 +12,6 @@ PythonHandler foobar
 PythonDebug On
 
 For more information, see http://www.modpython.org/.
-
-================================================================================
+EOM
+}
+]
diff --git a/www/mod_rivet/files/pkg-message.in b/www/mod_rivet/files/pkg-message.in
index aa96b66df748..d5cae5fbc7e0 100644
--- a/www/mod_rivet/files/pkg-message.in
+++ b/www/mod_rivet/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-====================================================
+[
+{ type: install
+  message: <<EOM
 Remember to modify your apache configuration file
 to load mod_rivet and set the appropriate handlers:
 
@@ -9,5 +10,6 @@ AddType application/x-httpd-rivet .rvt
 AddType application/x-rivet-tcl .tcl
 
 Visit http://tcl.apache.org/rivet/ for documentation
-
-====================================================
+EOM
+}
+]
diff --git a/www/mod_scgi/pkg-message b/www/mod_scgi/pkg-message
index 7814ebd9b474..1aad6a4ff906 100644
--- a/www/mod_scgi/pkg-message
+++ b/www/mod_scgi/pkg-message
@@ -1,3 +1,7 @@
-********************************************************************
-* If your mod_scgi seg faults, try disabling mod_fastcgi           *
-********************************************************************
+[
+{ type: install
+  message: <<EOM
+ If your mod_scgi seg faults, try disabling mod_fastcgi
+EOM
+}
+]
diff --git a/www/mod_security/files/pkg-message.in b/www/mod_security/files/pkg-message.in
index 1e5c0a04fddc..57ce54e1491e 100644
--- a/www/mod_security/files/pkg-message.in
+++ b/www/mod_security/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 You have installed ModSecurity.
 To enable ModSecurity in Apache, follow the instructions in
 
@@ -6,3 +8,6 @@ To enable ModSecurity in Apache, follow the instructions in
 
 Most users will use the signatures from the OWASP Core Rule Set (CRS).
 For configuration instructions, see %%DOCSDIR%%/README.
+EOM
+}
+]
diff --git a/www/mod_vhs/pkg-message b/www/mod_vhs/pkg-message
index ab8d680fe573..52a0e7015d98 100644
--- a/www/mod_vhs/pkg-message
+++ b/www/mod_vhs/pkg-message
@@ -1,7 +1,8 @@
-***************************************************************
-
+[
+{ type: install
+  message: <<EOM
 If you use PHP support you should load mod_php BEFORE mod_vhs
 otherwise your Apache will not start.
-
-
-***************************************************************
+EOM
+}
+]
diff --git a/www/mod_wsgi4/files/pkg-message.in b/www/mod_wsgi4/files/pkg-message.in
index 72a08b942f1e..e6e2be1c1723 100644
--- a/www/mod_wsgi4/files/pkg-message.in
+++ b/www/mod_wsgi4/files/pkg-message.in
@@ -1,9 +1,11 @@
-============================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you want to use daemon mode you will need to make sure Apache and APR
 include thread support.
 
 For more information, see :
 http://www.modwsgi.org/en/latest/user-guides/quick-configuration-guide.html
-
-============================================================================
+EOM
+}
+]
diff --git a/www/moinmoincli/files/pkg-message.in b/www/moinmoincli/files/pkg-message.in
index fde6677f3b41..bf2d0cfd6aef 100644
--- a/www/moinmoincli/files/pkg-message.in
+++ b/www/moinmoincli/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Now it is time to configure moinmoincli to make it easy to use.
 Copy "%%EXAMPLESDIR%%/moinmoincli.conf.sample"
 into your home directory as ".moinmoincli.conf" and edit it to suit your needs.
+EOM
+}
+]
diff --git a/www/moodle35/files/pkg-message.in b/www/moodle35/files/pkg-message.in
index 4bf333d0f8bb..69db1a9e116d 100644
--- a/www/moodle35/files/pkg-message.in
+++ b/www/moodle35/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR MOODLE
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Create a user and a database for Moodle to store all
    its tables in (or choose an existing database).
    It doesn't matter what the database or user names are,
@@ -43,7 +43,10 @@ For more information, see the INSTALL DOCUMENTATION:
 It may be worth reading the installation docs even if Moodle seems
 to be working at first, to ensure your PHP settings and database
 configuration will allow Moodle to operate properly.
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
@@ -51,3 +54,6 @@ possible additional steps at:
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.
+EOM
+}
+]
diff --git a/www/moodle36/files/pkg-message.in b/www/moodle36/files/pkg-message.in
index e35add4d24db..cfdb44bc8461 100644
--- a/www/moodle36/files/pkg-message.in
+++ b/www/moodle36/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR MOODLE
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Create a user and a database for Moodle to store all
    its tables in (or choose an existing database).
    It doesn't matter what the database or user names are,
@@ -43,7 +43,10 @@ For more information, see the INSTALL DOCUMENTATION:
 It may be worth reading the installation docs even if Moodle seems
 to be working at first, to ensure your PHP settings and database
 configuration will allow Moodle to operate properly.
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
@@ -51,3 +54,6 @@ possible additional steps at:
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.
+EOM
+}
+]
diff --git a/www/moodle37/files/pkg-message.in b/www/moodle37/files/pkg-message.in
index 10becf77ae50..b17b53d32fdb 100644
--- a/www/moodle37/files/pkg-message.in
+++ b/www/moodle37/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR MOODLE
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Create a user and a database for Moodle to store all
    its tables in (or choose an existing database).
    It doesn't matter what the database or user names are,
@@ -43,7 +43,10 @@ For more information, see the INSTALL DOCUMENTATION:
 It may be worth reading the installation docs even if Moodle seems
 to be working at first, to ensure your PHP settings and database
 configuration will allow Moodle to operate properly.
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
@@ -51,3 +54,6 @@ possible additional steps at:
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.
+EOM
+}
+]
diff --git a/www/mozplugger/pkg-message b/www/mozplugger/pkg-message
index 797fd5dff844..da9767816572 100644
--- a/www/mozplugger/pkg-message
+++ b/www/mozplugger/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This plugin needs external viewers before it can display any content.
 External viewers that are supported include:
 	Mplayer
@@ -9,3 +12,6 @@ External viewers that are supported include:
 	Gnumeric
 	Abiword
 	and others...
+EOM
+}
+]
diff --git a/www/mybb/files/pkg-message.in b/www/mybb/files/pkg-message.in
index b66bd863f245..23ed83510ea0 100644
--- a/www/mybb/files/pkg-message.in
+++ b/www/mybb/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 mybb has been installed into:
 
     %%WWWDIR%%
@@ -11,4 +14,6 @@ And restart Apache.
 
 Open the following page in your browser and follow the instructions:
 http://www.your.host/mybb/install/index.php
-
+EOM
+}
+]
diff --git a/www/mythplugin-mythweb/files/pkg-message.in b/www/mythplugin-mythweb/files/pkg-message.in
index 22a9b5922edd..1d3dbd6268a5 100644
--- a/www/mythplugin-mythweb/files/pkg-message.in
+++ b/www/mythplugin-mythweb/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 mythweb has been installed into:
 
     %%WWWDIR%%
@@ -9,3 +12,6 @@ You need to configure mythweb now according to the instructions in
 For lighttpd you should have a look at the MythTV Wiki
 
     http://www.mythtv.org/wiki/MythWeb_on_Lighttpd
+EOM
+}
+]
diff --git a/www/nanoblogger/files/pkg-message.in b/www/nanoblogger/files/pkg-message.in
index a2a562893ba3..c2a085da4024 100644
--- a/www/nanoblogger/files/pkg-message.in
+++ b/www/nanoblogger/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 POST-INSTALLATION NOTES:
 
 Before you can use NanoBlogger, you will have to create a global configuration
@@ -21,4 +24,6 @@ SIDE NOTES FOR OLD USERS:
 
 As always with new release, don't forget to read the documentation and to
 update your weblog configuration file, e.g. ${blog_dir}/blog.conf.
-
+EOM
+}
+]
diff --git a/www/nextcloud/files/pkg-message.in b/www/nextcloud/files/pkg-message.in
index b875627d618d..8bc0247819a0 100644
--- a/www/nextcloud/files/pkg-message.in
+++ b/www/nextcloud/files/pkg-message.in
@@ -1,10 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 /!\ The FreeBSD package REQUIRES the apps_paths configuration as    /!\
 /!\ seen in config/config.sample.php to function                    /!\
 
-***********************************************************************
-*                         POST INSTALL CONFIGURATION                  *
-***********************************************************************
-
 Please note that everything has been installed in %%WWWDIR%%.
 
 You will probably want to add an alias to your httpd.conf file,
@@ -30,14 +29,14 @@ in the same directory. Nextcloud's configuration documentation is at
 	https://docs.nextcloud.com/server/16/admin_manual/configuration_server
 
 The caching options require additional Nextcloud configuration.
-
-***********************************************************************
-*                       NEXTCLOUD VERSION UPGRADE                     *
-***********************************************************************
-
+}
+{ type: upgrade
+  message: <<EOM
 After a version migration you should upgrade your nextcloud instance
 using command line:
 
   cd %%WWWDIR%%
   su -m www -c "php ./occ upgrade"
-
+EOM
+}
+]
diff --git a/www/nginx-devel/files/pkg-message.in b/www/nginx-devel/files/pkg-message.in
index 7022d9c83995..adde28032712 100644
--- a/www/nginx-devel/files/pkg-message.in
+++ b/www/nginx-devel/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-===================================================================
+[
+{ type: install
+  message: <<EOM
 Recent version of the NGINX introduces dynamic modules support.  In
 FreeBSD ports tree this feature was enabled by default with the DSO
 knob.  Several vendor's and third-party modules have been converted
@@ -19,5 +20,6 @@ details.
 Default path for the NGINX dynamic modules is
 
 %%PREFIX%%/libexec/nginx.
-===================================================================
-
+EOM
+}
+]
diff --git a/www/nginx/files/pkg-message.in b/www/nginx/files/pkg-message.in
index 7022d9c83995..adde28032712 100644
--- a/www/nginx/files/pkg-message.in
+++ b/www/nginx/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-===================================================================
+[
+{ type: install
+  message: <<EOM
 Recent version of the NGINX introduces dynamic modules support.  In
 FreeBSD ports tree this feature was enabled by default with the DSO
 knob.  Several vendor's and third-party modules have been converted
@@ -19,5 +20,6 @@ details.
 Default path for the NGINX dynamic modules is
 
 %%PREFIX%%/libexec/nginx.
-===================================================================
-
+EOM
+}
+]
diff --git a/www/nibbleblog/files/pkg-message.in b/www/nibbleblog/files/pkg-message.in
index fc424ab8ad5c..37eb14d2e2fa 100644
--- a/www/nibbleblog/files/pkg-message.in
+++ b/www/nibbleblog/files/pkg-message.in
@@ -1,6 +1,6 @@
------------------------------------------------------------------------------------------------
-Installation has successfully completed!
------------------------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Nibbleblog installed in %%WWWDIR%%
 
 You must enter the following link into web browser
@@ -8,4 +8,6 @@ http://your-server/nibbleblog/install.php
 
 If you want another themes, plugins or additional languages, please visit official web site
 http://www.nibbleblog.com/
------------------------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/node/pkg-message b/www/node/pkg-message
index 87d7ce8d688e..ddea08386149 100644
--- a/www/node/pkg-message
+++ b/www/node/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Note: If you need npm (Node Package Manager), please install www/npm.
+EOM
+}
+]
diff --git a/www/node10/pkg-message b/www/node10/pkg-message
index 87d7ce8d688e..ddea08386149 100644
--- a/www/node10/pkg-message
+++ b/www/node10/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Note: If you need npm (Node Package Manager), please install www/npm.
+EOM
+}
+]
diff --git a/www/node6/pkg-message b/www/node6/pkg-message
index 3c3a16e0cd44..7c1c6720b22a 100644
--- a/www/node6/pkg-message
+++ b/www/node6/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Note: If you need npm (Node Package Manager), please install the npm3
 package, or build any of the www/npm* ports with the NODE6 option enabled. 
+EOM
+}
+]
diff --git a/www/node8/pkg-message b/www/node8/pkg-message
index 87d7ce8d688e..ddea08386149 100644
--- a/www/node8/pkg-message
+++ b/www/node8/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Note: If you need npm (Node Package Manager), please install www/npm.
+EOM
+}
+]
diff --git a/www/npc/pkg-message b/www/npc/pkg-message
index 193aa06f45ee..62be56bf52e4 100644
--- a/www/npc/pkg-message
+++ b/www/npc/pkg-message
@@ -1,5 +1,9 @@
-****************************************
-** Then you should create the default
-** index file as:
-**   ${PREFIX}/etc/npc/npc.idx
-****************************************
+[
+{ type: install
+  message: <<EOM
+ Then you should create the default
+ index file as:
+   ${PREFIX}/etc/npc/npc.idx
+EOM
+}
+]
diff --git a/www/nspluginwrapper/pkg-message b/www/nspluginwrapper/pkg-message
index 402dd9ec3824..e123aed54bb3 100644
--- a/www/nspluginwrapper/pkg-message
+++ b/www/nspluginwrapper/pkg-message
@@ -1,30 +1,32 @@
-================================================================
-
+[
+{ type: install
+  message: <<EOM
 The nspluginwrapper is installed on a per user basis. All of
 the commands can be run as an unprivileged user.
 
-================================================================
+
 
 To install all the plugins from their default locations:
 
 nspluginwrapper -v -a -i
 
-================================================================
+
 
 To install a specific plugin:
 
 nspluginwrapper -i path/to/plugin.so
 
-================================================================
+
 
 To remove a specific plugin:
 
 nspluginwrapper -r path/to/plugin.so
 
-================================================================
+
 
 To view all currently installed plugins:
 
 nspluginwrapper -l
-
-================================================================
+EOM
+}
+]
diff --git a/www/opencart/files/pkg-message.in b/www/opencart/files/pkg-message.in
index 0107d9b8774e..ae980b26010c 100644
--- a/www/opencart/files/pkg-message.in
+++ b/www/opencart/files/pkg-message.in
@@ -1,7 +1,6 @@
-
-POST-INSTALL CONFIGURATION FOR OPENCART
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Create a user and a database for opencart to store all
    its tables in (or choose an existing database).
 
@@ -23,5 +22,6 @@ POST-INSTALL CONFIGURATION FOR OPENCART
 For more information, see the INSTALL DOCUMENTATION:
 
    http://www.opencart.com/documentation
-
-=====================================
+EOM
+}
+]
diff --git a/www/orangehrm/files/pkg-message.in b/www/orangehrm/files/pkg-message.in
index ba9a494ccf4c..1d1f8decf102 100644
--- a/www/orangehrm/files/pkg-message.in
+++ b/www/orangehrm/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR OrangeHRM
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Add the following to your Apache configuration, and
    restart the server:
 
@@ -20,5 +20,6 @@ POST-INSTALL CONFIGURATION FOR OrangeHRM
 For more information, see the INSTALL DOCUMENTATION:
 
    http://www.orangehrm.com/installation-Linux.shtml
-
-================================================================
+EOM
+}
+]
diff --git a/www/otrs/files/pkg-message.in b/www/otrs/files/pkg-message.in
index 0ff56582ee14..e0506c566617 100644
--- a/www/otrs/files/pkg-message.in
+++ b/www/otrs/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 OTRS is now installed.
 
 The rest of installation must be completed manually.
@@ -19,4 +21,6 @@ For example:
 If you are upgrading from an earlier version, follow the instructions for
 upgrading your database schema and configuration files given in
 %%DOCSDIR%%/UPGRADING.md
-==========================================================================
+EOM
+}
+]
diff --git a/www/otter-browser/pkg-message b/www/otter-browser/pkg-message
index 3064f049894c..64cb7a07acae 100644
--- a/www/otter-browser/pkg-message
+++ b/www/otter-browser/pkg-message
@@ -1,9 +1,11 @@
-=============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To switch to the newer QtWebEngine web backend, add this section to the
 ~/.config/otter/otter.conf:
 
 [Backends]
 Web=qtwebengine
-
-=============================================================================
+EOM
+}
+]
diff --git a/www/owncloud/files/pkg-message.in b/www/owncloud/files/pkg-message.in
index 8d3aab2f2817..6b33c4724d9b 100644
--- a/www/owncloud/files/pkg-message.in
+++ b/www/owncloud/files/pkg-message.in
@@ -1,8 +1,6 @@
-
-***********************************************************************
-*                         POST INSTALL CONFIGURATION                  *
-***********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please note that everything has been installed in %%WWWDIR%%.
 
 You will probably want to add an alias to your httpd.conf file, something
@@ -17,7 +15,7 @@ like this:
 
 And restart Apache.
 
-********************************************************************
+
 The owncloud newsyslog.conf(5) filename has been changed:
   OLD: ${PREFIX}/etc/newsyslog.conf.d/owncloud
   NEW: ${PREFIX}/etc/newsyslog.conf.d/owncloud.conf
@@ -31,4 +29,6 @@ newsyslog configuration now only includes filenames that end with
 If you use provisioning/configuration management tools to create or
 edit this file, you will need to change their configuration to use
 the new filename.
-********************************************************************
+EOM
+}
+]
diff --git a/www/p5-Apache-Gallery/files/pkg-message.in b/www/p5-Apache-Gallery/files/pkg-message.in
index 7cd158c62133..573ad354fc36 100644
--- a/www/p5-Apache-Gallery/files/pkg-message.in
+++ b/www/p5-Apache-Gallery/files/pkg-message.in
@@ -1,5 +1,6 @@
----------------------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 <VirtualHost 123.123.123.123>
         ServerName   gallery.yourdomain.org
         DocumentRoot /data/pictures/
@@ -17,5 +18,6 @@
 </VirtualHost>
 
 And copy %%DATADIR%%/templates/default/gallery.css to your DocumentRoot
-
----------------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/p5-Apache-MP3/pkg-message b/www/p5-Apache-MP3/pkg-message
index 3949002077a1..6910a8f6596c 100644
--- a/www/p5-Apache-MP3/pkg-message
+++ b/www/p5-Apache-MP3/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 To read the manual on how to set up Apache::MP3, run:
 
     % perldoc Apache::MP3
 
 It contains information on what you need to put in your httpd.conf.
+EOM
+}
+]
diff --git a/www/p5-CGI-Kwiki/pkg-message b/www/p5-CGI-Kwiki/pkg-message
index 7ce1d3079658..38320500ccf7 100644
--- a/www/p5-CGI-Kwiki/pkg-message
+++ b/www/p5-CGI-Kwiki/pkg-message
@@ -1,4 +1,6 @@
-/* ================================================================= */
+[
+{ type: install
+  message: <<EOM
 Note:
 	Kwiki software installed! Now you should create
 	your kwiki web directory by yourself:
@@ -11,4 +13,6 @@ $ cd cgi-bin/my-kwiki
 $ kwiki-install
 
 	Finally remember to point your browser at required location.
-/* ================================================================= */
+EOM
+}
+]
diff --git a/www/p5-Catalyst-Runtime/pkg-message b/www/p5-Catalyst-Runtime/pkg-message
index 4644740058aa..360e0d04d2fc 100644
--- a/www/p5-Catalyst-Runtime/pkg-message
+++ b/www/p5-Catalyst-Runtime/pkg-message
@@ -1,6 +1,6 @@
-------------------------------------------------------------------------
-NOTE!
-
+[
+{ type: install
+  message: <<EOM
 The Apache engines have been moved to a separate package: Please install
 www/p5-Catalyst-Engine-Apache if you need Apache/mod_perl support.
 
@@ -10,4 +10,6 @@ to develop Catalyst-apps, as opposed to simply running them.
 
 The majority of the documentation has been moved to a separate package as
 well: Install www/p5-Catalyst-Manual for the tutorially goodness.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/p5-FCGI-Spawn/pkg-message b/www/p5-FCGI-Spawn/pkg-message
index ced4b938bb11..ef32fe38a926 100644
--- a/www/p5-FCGI-Spawn/pkg-message
+++ b/www/p5-FCGI-Spawn/pkg-message
@@ -1,5 +1,6 @@
--=*** FCGI::Spawn and fcgi_spawn are installed ***=-
-
+[
+{ type: install
+  message: <<EOM
 For the first time, check all the docs supplied wwith the package.
 
 To run the fcgi_spawn on boot time, create the system user for it, and group,
@@ -10,3 +11,6 @@ fcgi_spawn_username="fcgi"
 fcgi_spawn_groupname="fcgi"
 
 You may want to set fcgi_spawn_flags also according to taste.
+EOM
+}
+]
diff --git a/www/p5-Maypole/files/pkg-message.in b/www/p5-Maypole/files/pkg-message.in
index 7cebb7cf8547..7315f918d669 100644
--- a/www/p5-Maypole/files/pkg-message.in
+++ b/www/p5-Maypole/files/pkg-message.in
@@ -1,10 +1,12 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Maypole has now been installed.
 
 Documentation:	%%DOCSDIR%%/
 Examples:	%%EXAMPLESDIR%%/
 
 Enjoy!
-
-========================================================================
+EOM
+}
+]
diff --git a/www/p5-Nginx-ReadBody/pkg-message b/www/p5-Nginx-ReadBody/pkg-message
index 46d85e47caf6..cabdc079d17e 100644
--- a/www/p5-Nginx-ReadBody/pkg-message
+++ b/www/p5-Nginx-ReadBody/pkg-message
@@ -1,7 +1,9 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 WARNING:
     Do not forget compile www/nginx or www/nginx-devel
     with HTTP_PERL_MODULE support
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/www/p5-RT-Extension-SLA/files/pkg-message.in b/www/p5-RT-Extension-SLA/files/pkg-message.in
index 6edf614f7610..82cabf635c86 100644
--- a/www/p5-RT-Extension-SLA/files/pkg-message.in
+++ b/www/p5-RT-Extension-SLA/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
   If this is a first-time installation of RT::Extension::SLA, you will need
   to run the following in order to initialise various settings in the RT
   database:
@@ -13,4 +15,6 @@
 
      rt-setup-database --action insert --datafile \
          %%PREFIX%%/%%RTHOME%%/%%SCHEMAUPGRADE%%
-
+EOM
+}
+]
diff --git a/www/p5-RTx-Calendar/pkg-message b/www/p5-RTx-Calendar/pkg-message
index 4a4f8d012e67..c8777be3cf49 100644
--- a/www/p5-RTx-Calendar/pkg-message
+++ b/www/p5-RTx-Calendar/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
     To use MyCalendar portlet you must add MyCalendar to $HomepageComponents
     in etc/RT_SiteConfig.pm like that :
 
@@ -7,3 +9,6 @@
 
     To enable private searches ICal feeds, you need to give
     CreateSavedSearch and LoadSavedSearch rights to your users.
+EOM
+}
+]
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/files/pkg-message.in b/www/p5-Text-MultiMarkdown-ApacheHandler/files/pkg-message.in
index 6ec81263ec25..4567c60cd992 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/files/pkg-message.in
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please create %%PREFIX%%/etc/apache22/Includes/mmd.conf
 with the following contents:
 
@@ -7,3 +10,6 @@ AddType text/multimarkdown .markdown .mmd
 	PerlHandler Text::MultiMarkdown::ApacheHandler
 	PerlSetVar mm_useSmartyPants 1
 </Files>
+EOM
+}
+]
diff --git a/www/payara/pkg-message b/www/payara/pkg-message
index f41ac3862f51..45c23a85e7ac 100644
--- a/www/payara/pkg-message
+++ b/www/payara/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run the Payara Java Application Server from startup, add
 payara_enable="YES" in your /etc/rc.conf.
 Extra options can be found in the startup script.
@@ -11,4 +14,6 @@ default location, issue the command:
 
 Because default payara user is low-privileged, to allow Payara to listen
 ports under 1024 you will need to tweak Mandatory Access Control policies.
-
+EOM
+}
+]
diff --git a/www/pebble/files/pkg-message.in b/www/pebble/files/pkg-message.in
index fd18b26209e2..d1b168a7458d 100644
--- a/www/pebble/files/pkg-message.in
+++ b/www/pebble/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Pebble will store its data files in:
 
   %%PEBBLE_HOME%%
@@ -16,4 +18,6 @@ overwritten. Rather, a sample configuration file will be provided:
 To setup your blog, read the documentation at:
 
   file://%%DOCSDIR%%/index.html
-
+EOM
+}
+]
diff --git a/www/pglogd/files/pkg-message.in b/www/pglogd/files/pkg-message.in
index f7a3b3aaea3d..84f8a971e5a6 100644
--- a/www/pglogd/files/pkg-message.in
+++ b/www/pglogd/files/pkg-message.in
@@ -1,4 +1,6 @@
-=========================================================
+[
+{ type: install
+  message: <<EOM
 You need to create a PostgreSQL database for your logs:
 
   # su - postgres
@@ -15,4 +17,6 @@ pglogd can then be started with:
 
 Read the complete documentation on configuring pglogd
 and apache at http://www.digitalstratum.com/pglogd/
-=========================================================
+EOM
+}
+]
diff --git a/www/php-screw/files/pkg-message.in b/www/php-screw/files/pkg-message.in
index 9da44833d26e..6b1ab9aec8f6 100644
--- a/www/php-screw/files/pkg-message.in
+++ b/www/php-screw/files/pkg-message.in
@@ -1,10 +1,12 @@
-*****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You have installed the php-screw package.
 
 The following line has been added to %%PREFIX%%/etc/php/ext-30-screw.ini,
 so that the extension is automatically enabled:
 
 extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/php_screw.so"
-
-*****************************************************************************
+EOM
+}
+]
diff --git a/www/phpbb/files/pkg-message.in b/www/phpbb/files/pkg-message.in
index d8de0457cca9..c1efc3dd8d07 100644
--- a/www/phpbb/files/pkg-message.in
+++ b/www/phpbb/files/pkg-message.in
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 phpBB2 has been installed, but is not quite ready to be used yet!
 
 You have to ensure that you have a database server (or ODBC access to a
@@ -24,4 +26,6 @@ delete the following files manually for security purposes from
 
 Duplicates of these files have been installed to %%DATADIR%%.
 %%DATADIR%%/contrib contains contributed software for phpBB2.
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/phpbb3/files/pkg-message.in b/www/phpbb3/files/pkg-message.in
index ca2ddfcbfb9b..1c1585b16b1e 100644
--- a/www/phpbb3/files/pkg-message.in
+++ b/www/phpbb3/files/pkg-message.in
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 phpBB3 has been installed, but is not quite ready to be used yet!
 
 You have to ensure that you have a database server (or ODBC access to a
@@ -18,5 +20,6 @@ configure your installation of phpBB3:
 
 After configuring phpBB3 and ensuring that it is operational, you MUST
 remove or rename the install/ directory from %%PREFIX%%/%%PHPBBDIR%%.
-
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/phpmustache/files/pkg-message.in b/www/phpmustache/files/pkg-message.in
index b9d8ebd9a029..d19f8e1461ee 100644
--- a/www/phpmustache/files/pkg-message.in
+++ b/www/phpmustache/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 You need to adjust php's include_path to contain `%%DATADIR%%'!
 For example, insert
 	include_path = ".:%%DATADIR%%"
 into `%%LOCALBASE%%/etc/php.ini'.
+EOM
+}
+]
diff --git a/www/phpmyfaq/pkg-message b/www/phpmyfaq/pkg-message
index e2e197620678..72884f3696db 100644
--- a/www/phpmyfaq/pkg-message
+++ b/www/phpmyfaq/pkg-message
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
   phpMyFAQ has been installed, but is not quite ready to be used yet!
 
   You have to ensure that you have a database server (or ODBC access to a
@@ -12,5 +14,6 @@
 
   Use the username admin and your selected password
   for your first login into the admin section.
-
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/phprecipebook/files/pkg-message.in b/www/phprecipebook/files/pkg-message.in
index 22bc9253a628..bd8b88535a1f 100644
--- a/www/phprecipebook/files/pkg-message.in
+++ b/www/phprecipebook/files/pkg-message.in
@@ -1,4 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+[
+{ type: install
+  message: <<EOM
 Please read:
 
 %%WWWDIR%%/docs/INSTALL.UNIX
@@ -6,4 +8,6 @@ Please read:
 If you are upgrading then read this too:
 
 %%WWWDIR%%/docs/UPGRADE.TXT
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/www/phproxy/pkg-message b/www/phproxy/pkg-message
index 90051ed3f121..1764af90aaac 100644
--- a/www/phproxy/pkg-message
+++ b/www/phproxy/pkg-message
@@ -1,5 +1,6 @@
-
-------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 NOTE:
 
 - safe_mode must be turned off in php.ini
@@ -7,4 +8,6 @@ NOTE:
 - JavaScript turned on for the browser. Setting the flags and
   encrypting the supplied URL initially requires the use of
   JavaScript.
-------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/phpsysinfo/files/pkg-message.in b/www/phpsysinfo/files/pkg-message.in
index d9f1ca230a28..cabaa41c4f3b 100644
--- a/www/phpsysinfo/files/pkg-message.in
+++ b/www/phpsysinfo/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'
 
 Please visit 'http://localhost/phpsysinfo/' in a
 web-browser and follow the configuration instructions.
-*****************************************************************
+EOM
+}
+]
diff --git a/www/piwigo/files/pkg-message.in b/www/piwigo/files/pkg-message.in
index 511d3237f85b..d8c414397746 100644
--- a/www/piwigo/files/pkg-message.in
+++ b/www/piwigo/files/pkg-message.in
@@ -1,4 +1,6 @@
-****************************************************************
+[
+{ type: install
+  message: <<EOM
 The Piwigo Photo Gallery has been installed in the directory
 %%WWWDIR%%
 and optionally, with the documentation at
@@ -35,4 +37,6 @@ A typical configuration would be:
     </Directory>
 
 For installation and upgrade information, check the readme file.
-****************************************************************
+EOM
+}
+]
diff --git a/www/planet/files/pkg-message.in b/www/planet/files/pkg-message.in
index c27f0be25a47..d4710268c92e 100644
--- a/www/planet/files/pkg-message.in
+++ b/www/planet/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 Planet has been installed into %%DATADIR%%
 
 To get started, make a copy of the examples directory and configure to taste.
 
 *** Try to keep your configuration and output files away from the installation folder %%DATADIR%%, the INSTALL doc recommends ~/planet, but %%PREFIX%%/etc/planet is a good choice.***
-
+EOM
+}
+]
diff --git a/www/pmwiki/files/pkg-message.in b/www/pmwiki/files/pkg-message.in
index bac154b216dd..333ed32f7c4b 100644
--- a/www/pmwiki/files/pkg-message.in
+++ b/www/pmwiki/files/pkg-message.in
@@ -1,10 +1,12 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
  Before the first use of PmWiki, copy sample-config.php to config.php
 
  in %%PREFIX%%/%%PMWIKIDIR%%
 
  Please visit 'http://{host.domain}/pmwiki/pmwiki.php' in a
  web-browser and follow the configuration instructions.
-
-**********************************************************************
+EOM
+}
+]
diff --git a/www/polipo/files/pkg-message.in b/www/polipo/files/pkg-message.in
index 630ca996f81a..f7eeaf2b7985 100644
--- a/www/polipo/files/pkg-message.in
+++ b/www/polipo/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the polipo installation you should:
 
 1. copy the configuration file example and modify it if desired
@@ -14,5 +15,6 @@ To complete the polipo installation you should:
    %%DESTDIR%%%%PREFIX%%/etc/rc.d/polipo start
 
 4. point your browser to the new proxy server, the default port is 8123
-******************************************************************************
-
+EOM
+}
+]
diff --git a/www/privatebin/pkg-message b/www/privatebin/pkg-message
index 7f09ed52aca2..3dd8625a3a6a 100644
--- a/www/privatebin/pkg-message
+++ b/www/privatebin/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Please check https://github.com/PrivateBin/PrivateBin/wiki/Configuration 
 for information regarding the secure configuration of PrivateBin.
 
 If used with the apache web-server, mod_php must be installed and enabled
 in httpd.conf.
+EOM
+}
+]
diff --git a/www/privoxy/files/pkg-message.in b/www/privoxy/files/pkg-message.in
index 45ade5ff4c2a..6280a2c661ba 100644
--- a/www/privoxy/files/pkg-message.in
+++ b/www/privoxy/files/pkg-message.in
@@ -1,4 +1,6 @@
-***********************************************************
+[
+{ type: install
+  message: <<EOM
   To start Privoxy on boot, add: privoxy_enable="YES"
   to /etc/rc.conf.
 
@@ -19,5 +21,6 @@
   overwritten with each Privoxy update. Instead of
   changing them you should use your own action and
   filter files as described in Privoxy's manual.
-
-***********************************************************
+EOM
+}
+]
diff --git a/www/punbb/files/pkg-message.in b/www/punbb/files/pkg-message.in
index 927dccc51e6b..59d9db3717c4 100644
--- a/www/punbb/files/pkg-message.in
+++ b/www/punbb/files/pkg-message.in
@@ -1,5 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 Congratulations, PunBB is now installed!
 
 
@@ -11,5 +12,6 @@ If you want to optimize PunBB, read the following website:
 http://punbb.org/docs/install.html
 
 PunBB has been installed in %%WWWDIR%%.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/www/pwebstats/pkg-message b/www/pwebstats/pkg-message
index 399ab1fdba89..c51f925fa29f 100644
--- a/www/pwebstats/pkg-message
+++ b/www/pwebstats/pkg-message
@@ -1,4 +1,8 @@
----------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 You need to configure the conf/pwebstats.conf.
 http://martin.gleeson.com/pwebstats/running.html#config
----------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/py-bokeh/pkg-message b/www/py-bokeh/pkg-message
index 68affdb39da3..f18e79a4cdf9 100644
--- a/www/py-bokeh/pkg-message
+++ b/www/py-bokeh/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 The bokeh.charts interface and various examples depend on the Pandas library.
 If you want to use this functionality - please install math/py-pandas
+EOM
+}
+]
diff --git a/www/py-django-cms/pkg-message b/www/py-django-cms/pkg-message
index cd548f529ff7..449ac076f60d 100644
--- a/www/py-django-cms/pkg-message
+++ b/www/py-django-cms/pkg-message
@@ -1,8 +1,7 @@
-===============================================================================
-
-****************************************************************************
+[
+{ type: install
+  message: <<EOM
  IMPORTANT / 
-****************************************************************************
 
 If you're upgrading from a older version of py-django-cms please read the
 upgrade instructions at: 
@@ -20,15 +19,15 @@ full documentation available at:
 
 http://docs.django-cms.org/en/latest/index.html
 
-****************************************************************************
+
  1. Create a new Django project
-****************************************************************************
+
 
 $ django-admin.py startproject myproject
 
-****************************************************************************
+
  2. Edit settings.py
-****************************************************************************
+
 
 --- Set a SITE_ID by adding the following line:
 
@@ -108,9 +107,9 @@ CMS_TEMPLATES = [
 --- Note: See Django's template language documentation for more on how template
 --- inheritance works.
 
-****************************************************************************
+
  3. Edit urls.py
-****************************************************************************
+
 
 --- Edit urls.py and add url(r'^', include('cms.urls')) to the urlpatterns
 --- list. It should come after other patterns, so that specific URLs for other
@@ -128,9 +127,9 @@ urlpatterns = [
     url(r'^', include('cms.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
-****************************************************************************
+
  4. Setup the relational database backend
-****************************************************************************
+
 
 --- For testing purpose SQLite can be used and it is configured by default
 --- in a new Django project's DATABASES.
@@ -138,26 +137,26 @@ urlpatterns = [
 --- Refer to Django's DATABASES setting documentation for the appropriate
 --- configuration when PostgreSQL or MySQL are used as database backends.
 
-****************************************************************************
+
  5. Run migrations to create database tables
-****************************************************************************
+
 
 --- When a database backend has been choosen and set up properly, run the
 --- following command:
 
 $ python manage.py migrate
 
-****************************************************************************
+
  6. Create an admin superuser
-****************************************************************************
+
 
 --- For maintenance purposes it is necessary to create a admin user:
 
 $ python manage.py createsuperuser
 
-****************************************************************************
+
  7. Check CMS installation
-****************************************************************************
+
 
 --- This will check your configuration, your applications, your database and
 --- report on any problems:
@@ -166,9 +165,9 @@ $ python manage.py cms check
 
 --- When there are no errors continue with the last step.
 
-****************************************************************************
+
  8. Start the CMS
-****************************************************************************
+
 
 --- The django CMS project will now run by issuing:
 
@@ -176,5 +175,6 @@ $ python manage.py runserver
 
 --- The CMS can now be reached http://localhost:8000/ and the admin interface
 --- at http://localhost:8000/admin/
-
-===============================================================================
+EOM
+}
+]
diff --git a/www/py-django-datetime-widget/pkg-message b/www/py-django-datetime-widget/pkg-message
index 239232ae6ea0..207ff956712c 100644
--- a/www/py-django-datetime-widget/pkg-message
+++ b/www/py-django-datetime-widget/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use the widget, follow the Basic Configuration at:
 
 https://github.com/asaglimbeni/django-datetime-widget
@@ -7,4 +10,6 @@ the following lines in your pages:
 
 	<link rel="StyleSheet" src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap.min.css" type="text/css />
 	<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js" type="text/javascript></script>
-
+EOM
+}
+]
diff --git a/www/py-django-filer/pkg-message b/www/py-django-filer/pkg-message
index 765484d2b4e1..4f8878f812d2 100644
--- a/www/py-django-filer/pkg-message
+++ b/www/py-django-filer/pkg-message
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 Add "filer" and related apps to your INSTALLED_APPS setting and run
 manage.py migrate:
 
@@ -21,5 +22,6 @@ THUMBNAIL_HIGH_RESOLUTION = True
 
 If you forget this, you may not see thumbnails for your uploaded files. Adding
 this line and refreshing the admin page will create the missing thumbnails.
-
-================================================================================
+EOM
+}
+]
diff --git a/www/py-django-mezzanine/files/pkg-message.in b/www/py-django-mezzanine/files/pkg-message.in
index ac7adaf0566f..9e47ca58273d 100644
--- a/www/py-django-mezzanine/files/pkg-message.in
+++ b/www/py-django-mezzanine/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 Quick start instructions:
 
 1. Create a new project
@@ -21,5 +22,6 @@ $ env LC_ALL=en_US.UTF-8 python%%PYTHON_VER%% manage.py createdb
 $ env LC_ALL=en_US.UTF-8 python%%PYTHON_VER%% manage.py runserver
 
 Please refer to the full documentation at: http://mezzanine.jupo.org/docs/
-
-================================================================================
+EOM
+}
+]
diff --git a/www/py-graphite-api/files/pkg-message.in b/www/py-graphite-api/files/pkg-message.in
index c8439b47ce90..b9c381df87b6 100644
--- a/www/py-graphite-api/files/pkg-message.in
+++ b/www/py-graphite-api/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To complete your installation, copy %%ETCDIR%%/%%GRAPHITEAPI_APP%%.yaml.sample to
 %%ETCDIR%%/%%GRAPHITEAPI_APP%%.yaml and edit it as required, particularly ensuring
 your CORS allowed_origins are correct.
+EOM
+}
+]
diff --git a/www/py-graphite-web/files/pkg-message.in b/www/py-graphite-web/files/pkg-message.in
index 48421756559b..1e1680e3b346 100644
--- a/www/py-graphite-web/files/pkg-message.in
+++ b/www/py-graphite-web/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Please note that this port/package overrides the default installation layout
 for Graphite! To setup graphite, you will need to:
 
@@ -80,5 +81,6 @@ Setup Apache by creating a vhost similar to the following:
 
 Now you should be able to access the graphite virtual host you created in the
 first step.
-
-==============================================================================
+EOM
+}
+]
diff --git a/www/py-horizon/files/pkg-message.in b/www/py-horizon/files/pkg-message.in
index 9b76f4790444..a008ab77471d 100644
--- a/www/py-horizon/files/pkg-message.in
+++ b/www/py-horizon/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 ======================
  Apache configuration
 ======================
@@ -97,5 +98,6 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
 To enable django-compressor add this option:
 
 STATIC_ROOT = '%%PYTHON_SITELIBDIR%%/openstack_dashboard/static'
-
-================================================================================
+EOM
+}
+]
diff --git a/www/py-kallithea/files/pkg-message.in b/www/py-kallithea/files/pkg-message.in
index bb4dbd2defd5..8ecdc2c0015e 100644
--- a/www/py-kallithea/files/pkg-message.in
+++ b/www/py-kallithea/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For migration from RhodeCode please read:
 http://kallithea.readthedocs.io/en/latest/readme.html#converting-from-rhodecode
 
@@ -6,3 +9,6 @@ To create a Kallithea configuration file run the following commands:
 
 Current instructions for setup:
 http://kallithea.readthedocs.io/en/latest/setup.html
+EOM
+}
+]
diff --git a/www/py-nevow/files/pkg-message.in b/www/py-nevow/files/pkg-message.in
index 95de0b34e77e..09e2cafe49b4 100644
--- a/www/py-nevow/files/pkg-message.in
+++ b/www/py-nevow/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
   To execute the examples copy
 
      %%EXAMPLESDIR%%/*
@@ -9,5 +10,6 @@
     $ env PYTHONPATH=`pwd` twistd -noy examples.tac
 
   and navigate http://localhost:8080/
-
-************************************************************************
+EOM
+}
+]
diff --git a/www/py-qp/files/pkg-message.in b/www/py-qp/files/pkg-message.in
index 4a18f827e038..fdfe3dd3b3d8 100644
--- a/www/py-qp/files/pkg-message.in
+++ b/www/py-qp/files/pkg-message.in
@@ -1,4 +1,6 @@
-******************************************************************
+[
+{ type: install
+  message: <<EOM
 To run the demo:
 
 1. copy %%EXAMPLESDIR%% to ~/qp_sites
@@ -9,4 +11,6 @@ To run the demo:
    http://localhost:8002
 
 Read %%DOCSDIR%%/README.txt for more info.
-******************************************************************
+EOM
+}
+]
diff --git a/www/py-rhodecode/files/pkg-message.in b/www/py-rhodecode/files/pkg-message.in
index c4475d664018..0614b8e35a52 100644
--- a/www/py-rhodecode/files/pkg-message.in
+++ b/www/py-rhodecode/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For upgrade instructions please read:
 http://pythonhosted.org/RhodeCode/upgrade.html
 
@@ -7,3 +10,6 @@ To create a rhodecode configuration file run the following commands:
 
 Further instructions for setup:
 http://packages.python.org/RhodeCode/setup.html#setup
+EOM
+}
+]
diff --git a/www/pycarddav/files/pkg-message.in b/www/pycarddav/files/pkg-message.in
index ec76e55ff44f..795894b82148 100644
--- a/www/pycarddav/files/pkg-message.in
+++ b/www/pycarddav/files/pkg-message.in
@@ -1,6 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Please copy the sample configuration file located in:
 
   %%PREFIX%%/share/examples/pycarddav/
 
 to your home directory in ~/.pycard/ or ~/.config/pycard/
-
+EOM
+}
+]
diff --git a/www/radicale2/pkg-message b/www/radicale2/pkg-message
index 17e1096e8497..1147b2977d1f 100644
--- a/www/radicale2/pkg-message
+++ b/www/radicale2/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Migration from radicale 1.x to 2.x requires that you export the storage
 with radicale 1.1.x before it can be used.
 
 Migration instructions: https://radicale.org/1to2/
+EOM
+}
+]
diff --git a/www/redmine/pkg-message b/www/redmine/pkg-message
index bd16c7794526..41fa7641633e 100644
--- a/www/redmine/pkg-message
+++ b/www/redmine/pkg-message
@@ -1,5 +1,6 @@
-=============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Redmine was installed.
 
 You now need to setup your Redmine installation so
@@ -12,5 +13,6 @@ If you are upgrading please read the Upgrading Guide
 before starting the new version.
 
 https://www.redmine.org/projects/redmine/wiki/RedmineUpgrade
-
-=============================================================================
+EOM
+}
+]
diff --git a/www/reportmagic/pkg-message b/www/reportmagic/pkg-message
index 8d714deefc8c..8539a43fdaee 100644
--- a/www/reportmagic/pkg-message
+++ b/www/reportmagic/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 You must agree to the [Artistic] license agreement at
 /usr/local/share/doc/reportmagic/license.html before
 using Report Magic.
+EOM
+}
+]
diff --git a/www/repos-style/files/pkg-message.in b/www/repos-style/files/pkg-message.in
index d6b3eae6a25d..bba80b859cba 100644
--- a/www/repos-style/files/pkg-message.in
+++ b/www/repos-style/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 %%PORTNAME%% has been installed into:
 
     %%WWWDIR%%
@@ -13,5 +16,6 @@ $repo = '@@Repository@@'; // repository root, no trailing slash
 Replace @@Repository@@ with the subversion url to your repository root.
 It can be any subversion URL, both http:// and file:///. You can use
 "http:" if you have public read access to the repository.
-
-
+EOM
+}
+]
diff --git a/www/resin3/files/pkg-message.in b/www/resin3/files/pkg-message.in
index 84b62ed7db70..18b4beeafa88 100644
--- a/www/resin3/files/pkg-message.in
+++ b/www/resin3/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Resin is now installed in %%APP_HOME%%
 
 You may want to activate it in /etc/rc.conf:
@@ -29,7 +32,7 @@ http://localhost:%%PORT%%/ to read the documentation and test the samples.
 Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%/resin.xml
 Enjoy!
 
---------------------------------------------------------------------------------
+
 ADVANCED USAGE
 
 If you need to pass special options to Java, please set the
@@ -50,3 +53,6 @@ If you need to pass special options to Java, please set the
 To specify the java version to use, please use %%APP_NAME%%_java_version:
 
   %%APP_NAME%%_java_version="1.4"
+EOM
+}
+]
diff --git a/www/restbed/pkg-message b/www/restbed/pkg-message
index 56231b37f71e..688306bc24ef 100644
--- a/www/restbed/pkg-message
+++ b/www/restbed/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed restbed, the framework to build RESTful applications
 in C++11.
 
@@ -11,4 +13,6 @@ this library can fail.
 
 See https://github.com/Corvusoft/restbed/issues/231 for further
 information.
-======================================================================
+EOM
+}
+]
diff --git a/www/rssowl/pkg-message b/www/rssowl/pkg-message
index c462703ed9ed..40eff79ecd63 100644
--- a/www/rssowl/pkg-message
+++ b/www/rssowl/pkg-message
@@ -1,4 +1,8 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 This port includes software with different (mainly OSI approved) licenses.
 See LICENSE.txt in the documentation for a detailed description.
-===============================================================================
+EOM
+}
+]
diff --git a/www/rt42/files/pkg-message.in b/www/rt42/files/pkg-message.in
index 1a421416a53e..986c9f9382ea 100644
--- a/www/rt42/files/pkg-message.in
+++ b/www/rt42/files/pkg-message.in
@@ -1,5 +1,6 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 To initialize RT's database:
 
 $ sudo perl rt-setup-database --action init --dba dba --dba-password X
@@ -24,7 +25,10 @@ RT does not work with perl taint mode (-T) you must disable it.
 Note, some other ports like devel/bugzilla have you add this to your
 httpd.conf.  This isn't actually a flaw of RT, but of a subset of the
 CPAN modules that RT uses.
-
+EOM
+}
+{ type: install
+  message: <<EOM
 If you're upgrading RT then it is worth reading the UPGRADING document
 at this point. Some extension you're using may have been integrated
 into core. It's recommended to use new clean directory when you're
@@ -43,5 +47,6 @@ To upgrade your database schema, preserving ticket history:
      --action upgrade --prompt-for-dba-password
 
 and answer the prompts.
-
-=====================================================================
+EOM
+}
+]
diff --git a/www/rt44/files/pkg-message.in b/www/rt44/files/pkg-message.in
index 1a421416a53e..986c9f9382ea 100644
--- a/www/rt44/files/pkg-message.in
+++ b/www/rt44/files/pkg-message.in
@@ -1,5 +1,6 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 To initialize RT's database:
 
 $ sudo perl rt-setup-database --action init --dba dba --dba-password X
@@ -24,7 +25,10 @@ RT does not work with perl taint mode (-T) you must disable it.
 Note, some other ports like devel/bugzilla have you add this to your
 httpd.conf.  This isn't actually a flaw of RT, but of a subset of the
 CPAN modules that RT uses.
-
+EOM
+}
+{ type: install
+  message: <<EOM
 If you're upgrading RT then it is worth reading the UPGRADING document
 at this point. Some extension you're using may have been integrated
 into core. It's recommended to use new clean directory when you're
@@ -43,5 +47,6 @@ To upgrade your database schema, preserving ticket history:
      --action upgrade --prompt-for-dba-password
 
 and answer the prompts.
-
-=====================================================================
+EOM
+}
+]
diff --git a/www/rubygem-passenger/files/pkg-message-apache.in b/www/rubygem-passenger/files/pkg-message-apache.in
index 38ad68aaaf11..065a377715ed 100644
--- a/www/rubygem-passenger/files/pkg-message-apache.in
+++ b/www/rubygem-passenger/files/pkg-message-apache.in
@@ -1,5 +1,6 @@
-#####################################################################
-
+[
+{ type: install
+  message: <<EOM
 Please edit your Apache configuration file, and add these lines:
 
    LoadModule passenger_module %%PASSENGER_INSTALL_DIR%%/buildout/apache2/mod_passenger.so
@@ -9,5 +10,6 @@ Please edit your Apache configuration file, and add these lines:
 After you restart Apache, you are ready to deploy any number of Ruby on Rails
 applications on Apache, without any further Ruby on Rails-specific
 configuration!
-
-#####################################################################
+EOM
+}
+]
diff --git a/www/rubygem-passenger/files/pkg-message-nginx.in b/www/rubygem-passenger/files/pkg-message-nginx.in
index 5d869e24ac40..cefd06765a8b 100644
--- a/www/rubygem-passenger/files/pkg-message-nginx.in
+++ b/www/rubygem-passenger/files/pkg-message-nginx.in
@@ -1,9 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 The nginx flavor of this port installs passenger core binaries only,
 to make it works with nginx make sure www/nginx or www/nginx-devel
 port has been compiled with third-party PASSENGER module support and
 installed into a system.
 
-#####################################################################
+
 
 Please edit a nginx configuration file, and add these lines:
 
@@ -16,5 +19,6 @@ Please edit a nginx configuration file, and add these lines:
    
 Once nginx restarts it's possible to deploy a Ruby on Rails
 application without any further Ruby on Rails-specific configuration!
-
-#####################################################################
+EOM
+}
+]
diff --git a/www/rubygem-sinatra/pkg-message b/www/rubygem-sinatra/pkg-message
index 5a4ff3f60666..12315e90d3e8 100644
--- a/www/rubygem-sinatra/pkg-message
+++ b/www/rubygem-sinatra/pkg-message
@@ -1,6 +1,6 @@
-
-                **** NOTE ****
-
+[
+{ type: install
+  message: <<EOM
         Sinatra optionally integrates with haml/sass or Builder
         for templating and mongrel or thin as an HTTP server.
         To use them, install the respective ports separately:
@@ -9,3 +9,6 @@
                 devel/rubygem-builder
                 www/rubygem-mongrel
                 www/rubygem-thin
+EOM
+}
+]
diff --git a/www/rubygem-sinatra1/pkg-message b/www/rubygem-sinatra1/pkg-message
index 5a4ff3f60666..12315e90d3e8 100644
--- a/www/rubygem-sinatra1/pkg-message
+++ b/www/rubygem-sinatra1/pkg-message
@@ -1,6 +1,6 @@
-
-                **** NOTE ****
-
+[
+{ type: install
+  message: <<EOM
         Sinatra optionally integrates with haml/sass or Builder
         for templating and mongrel or thin as an HTTP server.
         To use them, install the respective ports separately:
@@ -9,3 +9,6 @@
                 devel/rubygem-builder
                 www/rubygem-mongrel
                 www/rubygem-thin
+EOM
+}
+]
diff --git a/www/sahi/pkg-message b/www/sahi/pkg-message
index d01f35c2b152..f55ce2780f44 100644
--- a/www/sahi/pkg-message
+++ b/www/sahi/pkg-message
@@ -1,6 +1,8 @@
-*******************************************************************
-
+[
+{ type: install
+  message: <<EOM
  To bring up the Sahi Controller use CTRL-ALT-DblClick on the page
  you are visiting with your browser
-
-*******************************************************************
+EOM
+}
+]
diff --git a/www/sakai/pkg-message b/www/sakai/pkg-message
index 4ac4def1e690..6bbac361fbd0 100644
--- a/www/sakai/pkg-message
+++ b/www/sakai/pkg-message
@@ -1,4 +1,6 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 Please visit :
 https://confluence.sakaiproject.org/pages/viewpage.action?pageId=82249313
 for more post-install information.
@@ -9,4 +11,6 @@ catalina.properties, you can start your Tomcat server and browse with:
 
 Login into the Sakai system with the user/admin and password/admin
 to configure and setup the system.
-=========================================================================
+EOM
+}
+]
diff --git a/www/seahub/files/pkg-message.in b/www/seahub/files/pkg-message.in
index 621c2395ca8f..2f12ed47b6d7 100644
--- a/www/seahub/files/pkg-message.in
+++ b/www/seahub/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To generate a new config,
 cd %%PREFIX%%/%%SEAFILE_SERVER%%
 Then choose sqlite or mysql, mysql needs to be setup with root.
@@ -15,3 +18,6 @@ Don't forget to run update scripts after every minor and major update located in
 	%%PREFIX%%/%%SEAFILE_SERVER%%/upgrade
 
 Patch updates (5.1.x) don't require these scripts, however do required a restarted.
+EOM
+}
+]
diff --git a/www/searx/files/pkg-message.in b/www/searx/files/pkg-message.in
index 828a564257aa..ccdda18d4513 100644
--- a/www/searx/files/pkg-message.in
+++ b/www/searx/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed Searx: privacy-respecting, hackable metasearch engine.
 
 It is recommended to run Searx as a service:
@@ -12,4 +14,6 @@ By default, Searx uses the network of long running Searx instances.
 You can see the list here: http://stats.searx.oe5tpo.com
 
 Please adjust Searx settings in %%PREFIX%%/etc/searx-settings.yml
-======================================================================
+EOM
+}
+]
diff --git a/www/selenium/pkg-message b/www/selenium/pkg-message
index 62d2ccf7aa6a..4bb48934b217 100644
--- a/www/selenium/pkg-message
+++ b/www/selenium/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To automate browsers you need one or more of these ports:
 www/firefox
 www/chromium
@@ -22,3 +25,6 @@ selenium_args="-enablePassThrough false"
 
 Please look it up in the documentation if you are experiencing wierdness
 together with firefox
+EOM
+}
+]
diff --git a/www/serendipity/files/pkg-message.in b/www/serendipity/files/pkg-message.in
index 14091ed4c309..1a5bad8a3540 100644
--- a/www/serendipity/files/pkg-message.in
+++ b/www/serendipity/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-===============================================================
-
+[
+{ type: install
+  message: <<EOM
 Serendipity installed in %%PREFIX%%/%%SERENDIPITY%%
 
 If this is your first install:
@@ -17,6 +17,6 @@ If you are upgrading an existing installation:
  1- Read %%PREFIX%%/%%SERENDIPITY%%/docs/UPGRADE
  2- Serendipity web based installation wizard will take care
     of the upgrade procedure
-
-===============================================================
-
+EOM
+}
+]
diff --git a/www/skytemplate/files/pkg-message.in b/www/skytemplate/files/pkg-message.in
index b56ba8cc091e..4be47db9cba9 100644
--- a/www/skytemplate/files/pkg-message.in
+++ b/www/skytemplate/files/pkg-message.in
@@ -1,8 +1,10 @@
-****************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To use SkyTemplate you have to add the correct include path into
 your %%LOCALBASE%%/etc/php.ini configuration file, like:
 
 include_path = ".:%%PREFIX%%/share/skytemplate"
-
-****************************************************************
+EOM
+}
+]
diff --git a/www/smarty2/files/pkg-message.in b/www/smarty2/files/pkg-message.in
index b9d8ebd9a029..d19f8e1461ee 100644
--- a/www/smarty2/files/pkg-message.in
+++ b/www/smarty2/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 You need to adjust php's include_path to contain `%%DATADIR%%'!
 For example, insert
 	include_path = ".:%%DATADIR%%"
 into `%%LOCALBASE%%/etc/php.ini'.
+EOM
+}
+]
diff --git a/www/smarty3/files/pkg-message.in b/www/smarty3/files/pkg-message.in
index b9d8ebd9a029..d19f8e1461ee 100644
--- a/www/smarty3/files/pkg-message.in
+++ b/www/smarty3/files/pkg-message.in
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 You need to adjust php's include_path to contain `%%DATADIR%%'!
 For example, insert
 	include_path = ".:%%DATADIR%%"
 into `%%LOCALBASE%%/etc/php.ini'.
+EOM
+}
+]
diff --git a/www/smb_auth/pkg-message b/www/smb_auth/pkg-message
index 957996cc2621..ef638c05d02b 100644
--- a/www/smb_auth/pkg-message
+++ b/www/smb_auth/pkg-message
@@ -1,8 +1,10 @@
-=========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Refer to ${PREFIX}/share/doc/smb_auth/README on how to configure smb_auth.
 
 NOTE: For smb_auth to work properly
 you must set debug level>0 in your smb.conf file.
-
-=========================================================================
+EOM
+}
+]
diff --git a/www/sogo2/pkg-message b/www/sogo2/pkg-message
index dd4700d0dd28..dd25546ea977 100644
--- a/www/sogo2/pkg-message
+++ b/www/sogo2/pkg-message
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 SOGo 2 was installed
 
 In order to run the sogo daemon (sogod), you will need to create and configure
@@ -59,5 +60,6 @@ Then add the following lines to the root users' crontab (crontab -e):
 
 For more information about using SOGo, visit:
 http://www.sogo.nu/downloads/documentation.html
-
-################################################################################
+EOM
+}
+]
diff --git a/www/sogo3/pkg-message b/www/sogo3/pkg-message
index 3d8f70078899..f4ddf19d09fb 100644
--- a/www/sogo3/pkg-message
+++ b/www/sogo3/pkg-message
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 SOGo 3 was installed
 
 In order to run the sogo daemon (sogod), you will need to create and configure
@@ -55,5 +56,6 @@ Then add the following lines to the root users' crontab (crontab -e):
 
 For more information about using SOGo, visit:
 http://www.sogo.nu/downloads/documentation.html
-
-###############################################################################
+EOM
+}
+]
diff --git a/www/sogo4/files/pkg-message.in b/www/sogo4/files/pkg-message.in
index c10acfded796..9baf3e5aa606 100644
--- a/www/sogo4/files/pkg-message.in
+++ b/www/sogo4/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 SOGo 4 was installed
 
 In order to run the sogo daemon (sogod), you will need to create and configure
@@ -55,5 +56,6 @@ Then add the following lines to the root users' crontab (crontab -e):
 
 For more information about using SOGo, visit:
 http://www.sogo.nu/downloads/documentation.html
-
-###############################################################################
+EOM
+}
+]
diff --git a/www/sqstat/files/pkg-message.in b/www/sqstat/files/pkg-message.in
index 513290afd1bd..bf5db0873f8c 100644
--- a/www/sqstat/files/pkg-message.in
+++ b/www/sqstat/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 - Copy file config.inc.php.defaults to config.inc.php, edit
   config.inc.php to specify your squid proxy server IP and port.
 
@@ -13,4 +15,6 @@ http_access deny manager
 - Set up apache web server:
 
 Alias /sqstat "%%PREFIX%%/%%SQSTATDIR%%/"
-======================================================================
+EOM
+}
+]
diff --git a/www/squid/files/pkg-message.in b/www/squid/files/pkg-message.in
index 4031db5536d0..739ae1433c57 100644
--- a/www/squid/files/pkg-message.in
+++ b/www/squid/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
      o You can find the configuration files for this package in the
        directory %%PREFIX%%/etc/squid.
 
@@ -45,4 +48,6 @@
 
      Additionally, you should check your configuration by calling
      'squid -f /path/to/squid.conf -k parse' before starting Squid.
-
+EOM
+}
+]
diff --git a/www/squid3/files/pkg-message.in b/www/squid3/files/pkg-message.in
index 4031db5536d0..739ae1433c57 100644
--- a/www/squid3/files/pkg-message.in
+++ b/www/squid3/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
      o You can find the configuration files for this package in the
        directory %%PREFIX%%/etc/squid.
 
@@ -45,4 +48,6 @@
 
      Additionally, you should check your configuration by calling
      'squid -f /path/to/squid.conf -k parse' before starting Squid.
-
+EOM
+}
+]
diff --git a/www/squidanalyzer/files/pkg-message.in b/www/squidanalyzer/files/pkg-message.in
index abea23a0a42b..37e085d530f8 100644
--- a/www/squidanalyzer/files/pkg-message.in
+++ b/www/squidanalyzer/files/pkg-message.in
@@ -1,4 +1,6 @@
------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 1. Modify your httpd.conf to allow access to HTML output like follow:
         Alias /squidreport %%PREFIX%%/www/squidreport
         <Directory %%PREFIX%%/www/squidreport>
@@ -19,4 +21,6 @@
 
 or run it manually.
 For more information, see %%PREFIX%%/share/doc/squidanalyzer/README file.
------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/squidguard/files/pkg-message.in b/www/squidguard/files/pkg-message.in
index 271a48baa075..4f20c44ec6fb 100644
--- a/www/squidguard/files/pkg-message.in
+++ b/www/squidguard/files/pkg-message.in
@@ -1,4 +1,6 @@
-===================================================================
+[
+{ type: install
+  message: <<EOM
  In order to activate %%PORTNAME%% you have to edit squid.conf
  To the contain "url_rewrite_program %%PREFIX%%/bin/%%PORTNAME%%"
  and create a configuration file for %%PORTNAME%%.
@@ -21,4 +23,6 @@
  http://www.squidguard.org/Doc/
 
  To activate the changes do a %%PREFIX%%/sbin/squid -k reconfigure
-===================================================================
+EOM
+}
+]
diff --git a/www/suphp/files/pkg-message.in b/www/suphp/files/pkg-message.in
index 1da8876bebc1..74776312371a 100644
--- a/www/suphp/files/pkg-message.in
+++ b/www/suphp/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 SuPHP has no upstream maintainer and thus is not actively having
 bugs and security issues addressed.
 
@@ -14,3 +17,6 @@ The port maintainer's thoughts on sandboxing PHP are here:
 An overview of using PHP-FPM for application sandboxing is here:
 
   http://blog.shatow.net/post/2013-11-27-sandboxing-php-part2.markdown
+EOM
+}
+]
diff --git a/www/suphp/pkg-message b/www/suphp/pkg-message
index 03fbca741ad6..4fff9541ecb2 100644
--- a/www/suphp/pkg-message
+++ b/www/suphp/pkg-message
@@ -1,13 +1,16 @@
-----------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 For help on using this module, please see the suPHP homepage:
 
         http://www.suphp.org/
 
 Using suPHP can break some PHP-scripts, because of Apache's CGI
 interface.
------------------------------------------------------------------
-
------------------------------------------------------------------
+EOM
+}
+{ type: upgrade, maximum_version: 0.6
+  message: <<EOM
 For those migrating from suPHP 0.5.x, be aware there are many
 changes since 0.6.x that can cause your current Apache environment
 to stop working or behave oddly.  Here are two migration tips:
@@ -43,9 +46,10 @@ Since suPHP 0.6.x, you should use the following:
 
 Otherwise, Apache will begin serving PHP files as downloadable
 content, rather than parse them with the PHP interpreter.
------------------------------------------------------------------
-
------------------------------------------------------------------
+EOM
+}
+{ type: upgrade, maximum_version: 0.7
+  message: <<EOM
 For those versions upgraded from 0.6.x to 0.7.x. There are some
 new features and changes for the configuration file:
 
@@ -56,4 +60,6 @@ new features and changes for the configuration file:
 
 These changes may lead to internal server error if without
 modifications of the configuration file from previous version.
------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/tdiary/files/pkg-message.in b/www/tdiary/files/pkg-message.in
index e46a088cf5c6..312e6f2d7bd6 100644
--- a/www/tdiary/files/pkg-message.in
+++ b/www/tdiary/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 There is a script to install tDiary in a user directory.
 This script should be run manually.
 
@@ -14,5 +15,6 @@ This script should be run manually.
 There are documents in the following directories.
   See ...
   %%DOCSDIR%%
-=============================================================================
-
+EOM
+}
+]
diff --git a/www/template_/pkg-message b/www/template_/pkg-message
index 46e8a29d107f..d148a7b728ce 100644
--- a/www/template_/pkg-message
+++ b/www/template_/pkg-message
@@ -1,8 +1,10 @@
-****************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To use Template_ you have to add the correct include path into
 your ${LOCALBASE}/etc/php.ini configuration file, like:
 
 include_path = ".:${PREFIX}/share/template_"
-
-****************************************************************
+EOM
+}
+]
diff --git a/www/templatelite/files/pkg-message.in b/www/templatelite/files/pkg-message.in
index ea9e0673dcd9..d19f8e1461ee 100644
--- a/www/templatelite/files/pkg-message.in
+++ b/www/templatelite/files/pkg-message.in
@@ -1,8 +1,10 @@
-*******************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You need to adjust php's include_path to contain `%%DATADIR%%'!
 For example, insert
 	include_path = ".:%%DATADIR%%"
 into `%%LOCALBASE%%/etc/php.ini'.
-
-*******************************************************************
+EOM
+}
+]
diff --git a/www/thttpd/files/pkg-message.in b/www/thttpd/files/pkg-message.in
index d779cb3782ae..69dd977845c2 100644
--- a/www/thttpd/files/pkg-message.in
+++ b/www/thttpd/files/pkg-message.in
@@ -1,4 +1,6 @@
------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 If you want users to be able to create their own web
 subdirectories off of the main web directory, you need to:
 
@@ -9,4 +11,6 @@ subdirectories off of the main web directory, you need to:
 
 See http://www.acme.com/software/thttpd/notes.html for more
 detailed instructions.
------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/thundercache/files/pkg-message.in b/www/thundercache/files/pkg-message.in
index 994834aa845f..d8c0744e5c75 100644
--- a/www/thundercache/files/pkg-message.in
+++ b/www/thundercache/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Please note that you have just installed ThunderCache Pro on
 
 	%%PREFIX%%/thunder
@@ -41,3 +43,6 @@ the following line to rc.conf:
 	thundercache_enable="YES"
 
 And start it from %%PREFIX%%/etc/rc.d/thundercache
+EOM
+}
+]
diff --git a/www/thundersnarf/files/pkg-message.in b/www/thundersnarf/files/pkg-message.in
index 2452d4406a8f..ed41338674e2 100644
--- a/www/thundersnarf/files/pkg-message.in
+++ b/www/thundersnarf/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 If you haven't setup your PostgreSQL server, set it up accordingly and create
 snortsnarf's database:
 
@@ -9,3 +11,6 @@ Run Thunder Snarf from /etc/crontab. Schedule it according to your machine
 load availability, for example:
 
 */20 * * * * root %%PREFIX%%/bin/thundersnarf >/dev/null 2>&1
+EOM
+}
+]
diff --git a/www/tikiwiki/files/pkg-message.in b/www/tikiwiki/files/pkg-message.in
index 623e93a7e1f6..46d74c53da6f 100644
--- a/www/tikiwiki/files/pkg-message.in
+++ b/www/tikiwiki/files/pkg-message.in
@@ -1,5 +1,6 @@
-=================================================================
-          	**** NOTE ****
+[
+{ type: install
+  message: <<EOM
 1) Please add the following to your apache config, and restart.
     #
     # Directives to allow use of tikiwiki
@@ -11,5 +12,6 @@
 
   For FULL configuration instructions see
   http://http://doc.tiki.org/Tiki+Installation+Guide
-
-=================================================================
+EOM
+}
+]
diff --git a/www/tokyopromenade/files/pkg-message.in b/www/tokyopromenade/files/pkg-message.in
index 2bd2d0a06657..48e1568aba68 100644
--- a/www/tokyopromenade/files/pkg-message.in
+++ b/www/tokyopromenade/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR Tokyo Promenade
-==============================================
-
+[
+{ type: install
+  message: <<EOM
 1) Install an arbitrary web server which supports the CGI mechanism.
    Then, create a directory where CGI scripts can be executed. We call
    it the base directory, which contains some files of Tokyo Promenade.
@@ -57,3 +57,6 @@ POST-INSTALL CONFIGURATION FOR Tokyo Promenade
 
 When all steps above are finished, access the CGI script with a Web
 browser.
+EOM
+}
+]
diff --git a/www/trac-bzr/pkg-message b/www/trac-bzr/pkg-message
index ea4964d43059..0bd0a4dbc464 100644
--- a/www/trac-bzr/pkg-message
+++ b/www/trac-bzr/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The following lines must be added to your trac.ini and Trac must be restarted.
 
 [trac]
@@ -6,3 +9,6 @@ repository_type = bzr
 
 [components]
 tracbzr.* = enabled
+EOM
+}
+]
diff --git a/www/trac-ccselector/pkg-message b/www/trac-ccselector/pkg-message
index ff34b9a18287..9f16ca88d56e 100644
--- a/www/trac-ccselector/pkg-message
+++ b/www/trac-ccselector/pkg-message
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -6,4 +8,6 @@ cc_selector.* = enabled
 
 to your trac.ini to enable the visual CC field
 editor.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-childtickets/files/pkg-message.in b/www/trac-childtickets/files/pkg-message.in
index 74d85dda14d4..4da6a3e5a453 100644
--- a/www/trac-childtickets/files/pkg-message.in
+++ b/www/trac-childtickets/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 See plugin homepage http://trac-hacks.org/wiki/ChildTicketsPlugin for
 more information about post install configuration.
+EOM
+}
+]
diff --git a/www/trac-customfieldadmin/pkg-message b/www/trac-customfieldadmin/pkg-message
index 4046ca5d72d6..23b864ba68d6 100644
--- a/www/trac-customfieldadmin/pkg-message
+++ b/www/trac-customfieldadmin/pkg-message
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -6,4 +8,6 @@ customfieldadmin.* = enabled
 
 to your trac.ini to enable the ticket custom field
 administrator.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-devel/pkg-message b/www/trac-devel/pkg-message
index 0298f4551323..8d8c58ec1add 100644
--- a/www/trac-devel/pkg-message
+++ b/www/trac-devel/pkg-message
@@ -1,5 +1,6 @@
-*******************************************************************************
-
+[
+{ type: upgrade, maximum_version: 1
+  message: <<EOM
 From 0.12.x to 1.0.x
 ---------------------
 You should be careful to check that the plugins you depend on have
@@ -11,5 +12,6 @@ See: http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0
 Consult the upgrade instructions at:
 
   http://trac.edgewall.org/wiki/TracUpgrade
-
-*******************************************************************************
+EOM
+}
+]
diff --git a/www/trac-estimator/pkg-message b/www/trac-estimator/pkg-message
index cedff5cbb740..279f1eef0181 100644
--- a/www/trac-estimator/pkg-message
+++ b/www/trac-estimator/pkg-message
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -14,4 +16,6 @@ Next, upgrade your database with the command:
 
 Finally, restart your web server, browse to your Trac URL
 and click on the "Estimate" button to create an estimate.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-gantt/pkg-message b/www/trac-gantt/pkg-message
index 4410493d2425..574734a3fcc6 100644
--- a/www/trac-gantt/pkg-message
+++ b/www/trac-gantt/pkg-message
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To use the TracGantt plugin, please follow these instructions:
 
 Edit your Trac config file to add custom fields to tickets, as well
@@ -70,4 +72,6 @@ Python search path.
 If you are using Trac with Apache and mod_python, you may also need
 to restart Apache, to avoid the plugin being accessible from one
 Apache process, but not others.
-----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/trac-math/files/pkg-message.in b/www/trac-math/files/pkg-message.in
index 364ae669fac1..bb0738e10587 100644
--- a/www/trac-math/files/pkg-message.in
+++ b/www/trac-math/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use the plugin, you must add at least the following to your trac.ini.
 
 	[tracmath]
@@ -9,3 +12,6 @@ You may also wish to set:
 	cache_dir = <cache directory>
 	max_png = <max number of pngs in cache - defaults to 500>
 	use_dollars = enabled
+EOM
+}
+]
diff --git a/www/trac-scrumburndown/pkg-message b/www/trac-scrumburndown/pkg-message
index 3d08569b3b37..a198216937f0 100644
--- a/www/trac-scrumburndown/pkg-message
+++ b/www/trac-scrumburndown/pkg-message
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -15,4 +17,6 @@ Finally, visit:
 http://trac-hacks.org/wiki/ScrumBurndownPlugin#Usingtheplugin
 
 for usage instructions.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-timingandestimation/pkg-message b/www/trac-timingandestimation/pkg-message
index 15072809da6e..0fb5bf3b8fff 100644
--- a/www/trac-timingandestimation/pkg-message
+++ b/www/trac-timingandestimation/pkg-message
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -14,4 +16,6 @@ Finally, visit:
 http://trac-hacks.org/wiki/TimingAndEstimationPlugin#PostInstallationConfigurationOptions
 
 for configuration instructions.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-tweakui/files/pkg-message.in b/www/trac-tweakui/files/pkg-message.in
index e40bfcccd175..bc3fc1dbd803 100644
--- a/www/trac-tweakui/files/pkg-message.in
+++ b/www/trac-tweakui/files/pkg-message.in
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -21,4 +23,6 @@ cp -Rp %%EXAMPLESDIR%%/* \
 $TRAC_ENV is the root directory of your Trac
 project. You can copy the TweakUi examples into
 as many Trac projects as you like.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-wikinotification/pkg-message b/www/trac-wikinotification/pkg-message
index ce41eddd4f22..83fb3af296f6 100644
--- a/www/trac-wikinotification/pkg-message
+++ b/www/trac-wikinotification/pkg-message
@@ -1,4 +1,6 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
@@ -10,4 +12,6 @@ Next, visit:
 http://wikinotification.ufsoft.org/wiki/Documentation/0.2.x
 
 for additional configuration instructions.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac-wysiwyg/pkg-message b/www/trac-wysiwyg/pkg-message
index b8b8686c61a1..e4b42c817f80 100644
--- a/www/trac-wysiwyg/pkg-message
+++ b/www/trac-wysiwyg/pkg-message
@@ -1,8 +1,12 @@
-**************************************************
+[
+{ type: install
+  message: <<EOM
 To complete the installation, please add:
 
 [components]
 tracwysiwyg.* = enabled
 
 to your trac.ini to enable the WYSIWYG editor.
-**************************************************
+EOM
+}
+]
diff --git a/www/trac/pkg-message b/www/trac/pkg-message
index 0298f4551323..8d8c58ec1add 100644
--- a/www/trac/pkg-message
+++ b/www/trac/pkg-message
@@ -1,5 +1,6 @@
-*******************************************************************************
-
+[
+{ type: upgrade, maximum_version: 1
+  message: <<EOM
 From 0.12.x to 1.0.x
 ---------------------
 You should be careful to check that the plugins you depend on have
@@ -11,5 +12,6 @@ See: http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0
 Consult the upgrade instructions at:
 
   http://trac.edgewall.org/wiki/TracUpgrade
-
-*******************************************************************************
+EOM
+}
+]
diff --git a/www/tt-rss/files/pkg-message.in b/www/tt-rss/files/pkg-message.in
index f8e03ce7c979..e893c6936315 100644
--- a/www/tt-rss/files/pkg-message.in
+++ b/www/tt-rss/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 Tiny Tiny RSS is now installed, but it requires some additional setup.
 
 You now need to create the DB used by Tiny Tiny RSS as its back-end:
@@ -30,4 +32,6 @@ forget to empty the cache of your browser!
 
 Please read <https://git.tt-rss.org/fox/tt-rss/wiki/InstallationNotes> and
 <https://git.tt-rss.org/fox/tt-rss/wiki/UpdatingFeeds> for important points.
-===============================================================================
+EOM
+}
+]
diff --git a/www/typo3-8/files/pkg-message.in b/www/typo3-8/files/pkg-message.in
index 1eecb48ac64e..ff9b1e61bf9c 100644
--- a/www/typo3-8/files/pkg-message.in
+++ b/www/typo3-8/files/pkg-message.in
@@ -1,8 +1,6 @@
-*************************************
-
-POST-INSTALL CONFIGURATION FOR TYPO3
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Add the following to your Apache configuration file
    httpd.conf and restart the web server:
 
@@ -34,5 +32,6 @@ POST-INSTALL CONFIGURATION FOR TYPO3
 For more information, see the INSTALL DOCUMENTATION:
 
   https://docs.typo3.org/typo3cms/GettingStartedTutorial/latest/Installation/Index.html
-
-*************************************
+EOM
+}
+]
diff --git a/www/typo3-9/files/pkg-message.in b/www/typo3-9/files/pkg-message.in
index 0ea1d0215c6e..0e4c51232440 100644
--- a/www/typo3-9/files/pkg-message.in
+++ b/www/typo3-9/files/pkg-message.in
@@ -1,8 +1,6 @@
-*************************************
-
-POST-INSTALL CONFIGURATION FOR TYPO3
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Add the following to your Apache configuration file
    httpd.conf and restart the web server:
 
@@ -21,5 +19,6 @@ POST-INSTALL CONFIGURATION FOR TYPO3
 For more information, see the INSTALL DOCUMENTATION:
 
   https://docs.typo3.org/typo3cms/GettingStartedTutorial/latest/Installation/Index.html
-
-*************************************
+EOM
+}
+]
diff --git a/www/udmsearch/files/pkg-message.in b/www/udmsearch/files/pkg-message.in
index edf254b4dc0e..75c6a974d24e 100644
--- a/www/udmsearch/files/pkg-message.in
+++ b/www/udmsearch/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Udmsearch is successfully installed.
 Now, to use udmsearch you need to create the appropriate mysql database
 manually: Please read INSTALL file located in %%DOCSDIR%%.
 
 For more information on how to use udmsearch, please refer to their
 web site at http://search.mnoGo.ru/
+EOM
+}
+]
diff --git a/www/ufdbguard/files/pkg-message.in b/www/ufdbguard/files/pkg-message.in
index 320b7caf9083..fa4f167cd4db 100644
--- a/www/ufdbguard/files/pkg-message.in
+++ b/www/ufdbguard/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please, note the following statements about %%PORTNAME%% port:
 
     o it's decided during compilation if ufdbguardd will work through Unix
@@ -11,3 +14,6 @@ Please, note the following statements about %%PORTNAME%% port:
       To make ufdbUpdate work it should be significantly rewritten for
       non-linux systems. It's not worth it due to the fact ufdbUpdate can
       be replaced by much more simple script written by local administator.
+EOM
+}
+]
diff --git a/www/validator/files/pkg-message.in b/www/validator/files/pkg-message.in
index 5cde0443069d..7e267abe0395 100644
--- a/www/validator/files/pkg-message.in
+++ b/www/validator/files/pkg-message.in
@@ -1,4 +1,6 @@
--------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The W3C Markup Validation Service has been installed. However, it will not do
 anything until you set up your web server to utilize it. An httpd.conf for the
 Apache web server can be found at
@@ -24,4 +26,6 @@ you can place it where you would like and set the environment variable
 W3C_VALIDATOR_CFG to the complete path (including filename) of validator.conf.
 An example of how to set this environment variable in Apache has been included
 in the above referenced httpd.conf file.
--------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/www/varnish-nagios/files/pkg-message.in b/www/varnish-nagios/files/pkg-message.in
index c88b323a29f4..369ed133d532 100644
--- a/www/varnish-nagios/files/pkg-message.in
+++ b/www/varnish-nagios/files/pkg-message.in
@@ -1,7 +1,9 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
  Add the following line to %%PREFIX%%/etc/sudoers:
 
    nagios ALL=NOPASSWD: %%PREFIX%%/libexec/nagios/check_varnish
-
-**********************************************************************
+EOM
+}
+]
diff --git a/www/varnish4/files/pkg-message.in b/www/varnish4/files/pkg-message.in
index 71157cc58486..8a90ea1f5c63 100644
--- a/www/varnish4/files/pkg-message.in
+++ b/www/varnish4/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 QUICK-START GUIDE
 
 It's two in the morning and someone posted a link to your website on
@@ -10,3 +13,6 @@ front of your web server:
 4) %%PREFIX%%/etc/rc.d/varnishd start
 
 Refer to the documentation for more advanced configuration.
+EOM
+}
+]
diff --git a/www/varnish6/pkg-message b/www/varnish6/pkg-message
index e6cc91687336..7b8e94f12f7d 100644
--- a/www/varnish6/pkg-message
+++ b/www/varnish6/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 QUICK-START GUIDE
 
 It's two in the morning and someone posted a link to your website on
@@ -10,3 +13,6 @@ front of your web server:
 4) service varnishd start
 
 Refer to the documentation for more advanced configuration.
+EOM
+}
+]
diff --git a/www/volta/files/pkg-message.in b/www/volta/files/pkg-message.in
index 6a32fdd02223..993e9a74a230 100644
--- a/www/volta/files/pkg-message.in
+++ b/www/volta/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To get volta up and running, you'll still need to do two things:
 
  - Enable url rewriting from within the squid configuration file.
@@ -8,3 +11,6 @@ To get volta up and running, you'll still need to do two things:
  - Create a volta rule database! For detailed instructions, please
  reference %%DOCSDIR%%/README, or volta's website at:
  https://bitbucket.org/mahlon/volta/
+EOM
+}
+]
diff --git a/www/w3m/pkg-message b/www/w3m/pkg-message
index 5cbeb642b192..9501cc337031 100644
--- a/www/w3m/pkg-message
+++ b/www/w3m/pkg-message
@@ -1,12 +1,16 @@
-**********************************************************
-* To display images in proper positions,                 *
-* you should set font size of your terminal emulator to  *
-* "# of pixels per character" and "# of pixels per line" *
-* in Option Setting Panel.                               *
-*                                                        *
-* For example, if you use 14 pixel fonts, the values     *
-* should be these.                                       *
-*                                                        *
-* # of pixels per character = 7                          *
-* # of pixels per line = 14                              *
-**********************************************************
+[
+{ type: install
+  message: <<EOM
+ To display images in proper positions,
+ you should set font size of your terminal emulator to
+ "# of pixels per character" and "# of pixels per line"
+ in Option Setting Panel.
+
+ For example, if you use 14 pixel fonts, the values
+ should be these.
+
+ # of pixels per character = 7
+ # of pixels per line = 14
+EOM
+}
+]
diff --git a/www/web2ldap/files/pkg-message.in b/www/web2ldap/files/pkg-message.in
index 852918514ca3..9c506b0b15d1 100644
--- a/www/web2ldap/files/pkg-message.in
+++ b/www/web2ldap/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 Run:
 
   service web2ldap onestart
@@ -13,5 +15,6 @@ apache *instead of the standalone version*, please look at the enclosed
 documentation in:
 
   https://fossies.org/linux/web2ldap/etc/apache2/sample-mod_wsgi.conf
-
-===============================================================================
+EOM
+}
+]
diff --git a/www/webreport/files/pkg-message.in b/www/webreport/files/pkg-message.in
index b7ddf601fa79..d5935816ce74 100644
--- a/www/webreport/files/pkg-message.in
+++ b/www/webreport/files/pkg-message.in
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 Read the %%PREFIX%%/share/doc/webreport/INSTALL to configure webreport
 
 Edit the  %%PREFIX%%/etc/webreport.conf
+EOM
+}
+]
diff --git a/www/websh/files/pkg-message.in b/www/websh/files/pkg-message.in
index 5206f2c6567a..a4ad77b2b49d 100644
--- a/www/websh/files/pkg-message.in
+++ b/www/websh/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 The websh _executable_ is deliberately not installed by this port.
 To load websh functionality into regular Tcl-scripts, simply use:
 
@@ -17,5 +19,6 @@ under more recent Apache versions.
 
 Be sure to create %%PREFIX%%/etc/websh.conf -- most likely, you'll
 simply copy the installed %%PREFIX%%/etc/websh.conf.dist over.
-
--
+EOM
+}
+]
diff --git a/www/webstats/pkg-message b/www/webstats/pkg-message
index 319f938528fc..cc8fc81724d0 100644
--- a/www/webstats/pkg-message
+++ b/www/webstats/pkg-message
@@ -1,6 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 For information on configuration look at $PREFIX/share/doc/webstats.html
 or the author's website http://www.patsplanet.com/
 
 Files can be found in $PREFIX/webstats and $PREFIX/etc/webstats
-
+EOM
+}
+]
diff --git a/www/webstone-ssl/pkg-message b/www/webstone-ssl/pkg-message
index 62ce83ee7d21..87dfd03f8072 100644
--- a/www/webstone-ssl/pkg-message
+++ b/www/webstone-ssl/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Before running webstone make sure that the non-root user
 who runs webstone has rexec access to the webclients and
 the web server. This user must also have write access to
@@ -13,4 +15,6 @@ To run configure webstones, run it, and see the results:
     ./webstone -genfiles
     ./webstone
     ./webstone -results
-
+EOM
+}
+]
diff --git a/www/webstone/pkg-message b/www/webstone/pkg-message
index 63e1f424e465..a9d10fcb3bfb 100644
--- a/www/webstone/pkg-message
+++ b/www/webstone/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Before running webstone make sure that the non-root user
 who runs webstone has rexec access to the webclients and
 the web server. This user must also have write access to
@@ -13,4 +15,6 @@ To run configure webstones, run it, and see the results:
     ./webstone -genfiles
     ./webstone
     ./webstone -results
-
+EOM
+}
+]
diff --git a/www/webtrees/files/pkg-message.in b/www/webtrees/files/pkg-message.in
index 8d3ca35d4a60..cbeaa63ef934 100644
--- a/www/webtrees/files/pkg-message.in
+++ b/www/webtrees/files/pkg-message.in
@@ -1,5 +1,6 @@
-*************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 The following configuration will need to be done prior to using
 webtrees for the first time:
 
@@ -32,5 +33,6 @@ webtrees for the first time:
    through setting up webtrees: asking for the database server, database
    user and database name, and then assist you in creating a webtrees
    admin account, etc.
-
-*************************************************************************
+EOM
+}
+]
diff --git a/www/wordpress/files/pkg-message.in b/www/wordpress/files/pkg-message.in
index 11afe3fec699..a3d0617e38e0 100644
--- a/www/wordpress/files/pkg-message.in
+++ b/www/wordpress/files/pkg-message.in
@@ -1,6 +1,11 @@
-                  **** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
 in %%WWWDIR%% and modify it to fit your MySQL.
 Maybe you need 'mysqladmin create wordpress' first.
 If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
 http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
+EOM
+}
+]
diff --git a/www/wwwoffle/files/pkg-message.in b/www/wwwoffle/files/pkg-message.in
index c2e7d6c6614b..e3251c98cf07 100644
--- a/www/wwwoffle/files/pkg-message.in
+++ b/www/wwwoffle/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 If you are upgrading from an old version of wwwoffle, you may need to
 convert the cache directory structure to work with the new version.  You
 can find programs in the WWWOFFLE distribution tarball to do this, along
@@ -9,3 +11,6 @@ configuration file, e.g.:
 
      $ perl %%WWWOFFLE_SPOOL%%/upgrade-config.pl \
             %%PREFIX%%/etc/wwwoffle.conf
+EOM
+}
+]
diff --git a/www/xoops/files/pkg-message.in b/www/xoops/files/pkg-message.in
index c67a40080b63..9e96bd0909c7 100644
--- a/www/xoops/files/pkg-message.in
+++ b/www/xoops/files/pkg-message.in
@@ -1,7 +1,6 @@
-
-POST-INSTALL CONFIGURATION FOR XOOPS
-=====================================
-
+[
+{ type: install
+  message: <<EOM
 1) Add the following to your Apache configuration, and
    restart the server:
 
@@ -33,5 +32,6 @@ POST-INSTALL CONFIGURATION FOR XOOPS
 For more information, see the INSTALL DOCUMENTATION:
 
 http://www.xoops.org/modules/mediawiki/index.php/Installation_Guide
-
-========================================================
+EOM
+}
+]
diff --git a/www/yabb/files/pkg-message.in b/www/yabb/files/pkg-message.in
index 8dc9b980b6f3..dd62462fa04c 100644
--- a/www/yabb/files/pkg-message.in
+++ b/www/yabb/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================
+[
+{ type: install
+  message: <<EOM
 YaBB is now installed in %%DIR%%
 
 Make it available through your web server and
@@ -8,4 +10,6 @@ you're done for security reasons.
 
 For additional documentation please visit the
 official site at: http://www.yabbforum.com/
-===============================================
+EOM
+}
+]
diff --git a/www/yanopaste/files/pkg-message.in b/www/yanopaste/files/pkg-message.in
index 63c44b12b7b0..4c9ee0cea088 100644
--- a/www/yanopaste/files/pkg-message.in
+++ b/www/yanopaste/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 yanopaste has been installed into:
 
     %%WWWDIR%%
@@ -8,3 +11,6 @@ somethinglike this:
         Alias /yanopaste "%%WWWDIR%%"
 
 And restart Apache.
+EOM
+}
+]
diff --git a/www/yourls/files/pkg-message.in b/www/yourls/files/pkg-message.in
index e4da1d4ee60d..353e4c784d78 100644
--- a/www/yourls/files/pkg-message.in
+++ b/www/yourls/files/pkg-message.in
@@ -1,10 +1,10 @@
-
-***************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 yourls has been installed into %%WWWDIR%%
 
 Please visit https://yourls.org/#Install for further install/upgrade
 instructions.
-
-***************************************************************************
-
+EOM
+}
+]
diff --git a/www/youtube_dl/pkg-message b/www/youtube_dl/pkg-message
index c366067483e5..898139919852 100644
--- a/www/youtube_dl/pkg-message
+++ b/www/youtube_dl/pkg-message
@@ -1,6 +1,8 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you want to use mp3 audio conversion please make sure multimedia/ffmpeg is
 built with the "LAME" option enabled.
-
-==============================================================================
+EOM
+}
+]
diff --git a/www/zend-framework/files/pkg-message.in b/www/zend-framework/files/pkg-message.in
index 7e054450976d..9ac9837c1348 100644
--- a/www/zend-framework/files/pkg-message.in
+++ b/www/zend-framework/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-***************************************************************
+[
+{ type: install
+  message: <<EOM
 Now you need to adjust PHP's include_path to contain
 	`%%DATADIR%%/library'
 
@@ -10,4 +11,6 @@ into `%%LOCALBASE%%/etc/php.ini'.
 
 For more general information about the Zend Framework, please
 visit: http://framework.zend.com/
-***************************************************************
+EOM
+}
+]
diff --git a/www/zend-framework1/files/pkg-message.in b/www/zend-framework1/files/pkg-message.in
index b3a323301231..03d32d1a4290 100644
--- a/www/zend-framework1/files/pkg-message.in
+++ b/www/zend-framework1/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-***************************************************************
+[
+{ type: install
+  message: <<EOM
 Now you need to adjust PHP's include_path to contain
 	`%%DATADIR%%/library'
 
@@ -25,4 +26,6 @@ http://framework.zend.com/manual/1.12/en/zend.tool.framework.introduction.html
 
 For more general information about the Zend Framework, please
 visit: http://framework.zend.com/
-***************************************************************
+EOM
+}
+]
diff --git a/www/zenphoto/files/pkg-message.in b/www/zenphoto/files/pkg-message.in
index f2f5ff8e600b..c073615317ac 100644
--- a/www/zenphoto/files/pkg-message.in
+++ b/www/zenphoto/files/pkg-message.in
@@ -1,6 +1,8 @@
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+[
+{ type: install
+  message: <<EOM
 Browse http://your.host.tld/zenphoto/ to configure your gallery
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 To make zenphoto available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
@@ -12,10 +14,12 @@ that you add something like the following to httpd.conf:
         Order Deny,Allow
         Allow from all
     </Directory>
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+EOM
+}
+{ type: upgrade, maximum_version: 1.4
+  message: <<EOM
 Zenphoto 1.4 - Important Notes
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 This release includes some major internal restructuring of the object model.
 This also involves the Zenpage plugin whose categories are now objects like the
 articles and pages already were.
@@ -25,3 +29,6 @@ call the RSS feeds. Although we have added htaccess redirection so the links
 should not break (given you have mod_rewrite of course) you should inform your
 subscribers about the new links. The same applies to the sitemap-extended
 plugin.
+EOM
+}
+]
diff --git a/www/zope213/files/pkg-message.in b/www/zope213/files/pkg-message.in
index 22b0486c65ad..6925cb84b7c5 100644
--- a/www/zope213/files/pkg-message.in
+++ b/www/zope213/files/pkg-message.in
@@ -1,5 +1,6 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Zope Successfull installed.
 
 To create an instance of Zope using the default location, please run:
@@ -26,3 +27,6 @@ If Zope should get started automatically when the system starts,
 please add the following line to /etc/rc.conf:
 
 zope213_enable="YES"
+EOM
+}
+]