diff --git a/science/afni/files/pkg-message.in b/science/afni/files/pkg-message.in
index 018381c3d381..d1d9a7080fd8 100644
--- a/science/afni/files/pkg-message.in
+++ b/science/afni/files/pkg-message.in
@@ -1,4 +1,6 @@
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 For quick info, run "man afni".
 
 For AFNI configuration and usage, please visit the AFNI WEB site at
@@ -34,5 +36,6 @@ AFNI_PLUGIN_PATH should be set to %%PREFIX%%/lib/afni:%%DATADIR%%
 AFNI_GLOBAL_SESSION should be set to %%DATADIR%%.
 You can do this by sourcing %%PREFIX%%/etc/mri/afni.profiles for
 Bourne-style shells or or %%PREFIX%%/etc/mri/afni.cshrc for C-style shells.
-
-=============================================================================
+EOM
+}
+]
diff --git a/science/cdf/files/pkg-message.in b/science/cdf/files/pkg-message.in
index 9af80f64c2ac..96ebebc50be0 100644
--- a/science/cdf/files/pkg-message.in
+++ b/science/cdf/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 A set of script files named `definitions.<shell-type>' should now
 exist in the `bin' directory.
 `<shell-type>' specifies the type of shell (command interpreter)
@@ -27,3 +30,6 @@ Because aliases are not available when using the Bourne shell,
 the toolkit programs must be invoked by specifying the actual
 name of the executable file.  The script file `definitions.B'
 describes how to do this.
+EOM
+}
+]
diff --git a/science/dlpoly-classic/pkg-message b/science/dlpoly-classic/pkg-message
index bc238819dd10..1ef8cfbb50f3 100644
--- a/science/dlpoly-classic/pkg-message
+++ b/science/dlpoly-classic/pkg-message
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 This port provides both serial and parallel (MPI) binaries.  Use of
 the MPI binary is strongly recommended on any machine with multiple
 cores available.  The serial binary is provided only for testing and
@@ -9,4 +11,6 @@ To run a model on a workstation using 4 cores, use:
 	mpirun -n 4 dlpoly-classic-mpi
 
 To run on a cluster, please see the documentation for your scheduler software.
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/science/fvcom/pkg-message b/science/fvcom/pkg-message
index b0b5ea4c3fa2..386b6dcf5a31 100644
--- a/science/fvcom/pkg-message
+++ b/science/fvcom/pkg-message
@@ -1,4 +1,8 @@
------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 FVCOM has many build options that can be used in combination.  To build
 other variants, use one of the slave ports science/fvcom-*.
------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/science/gamess-us/files/pkg-message.in b/science/gamess-us/files/pkg-message.in
index 86800fa79f4d..d086bcb4ab97 100644
--- a/science/gamess-us/files/pkg-message.in
+++ b/science/gamess-us/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed GAMESS (US): General Atomic and Molecular Electronic
                            Structure System
 
@@ -12,4 +14,6 @@ computation to perform.
 
 You can use the wxmacmolplt command from science/wxmacmolplt to view
 the computation results.
-======================================================================
+EOM
+}
+]
diff --git a/science/libsvm/files/pkg-message.in b/science/libsvm/files/pkg-message.in
index 66242c832d50..e083f49347b6 100644
--- a/science/libsvm/files/pkg-message.in
+++ b/science/libsvm/files/pkg-message.in
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 Some useful tools are installed to %%DATADIR%%.
 Most of them are written in Python, please install
 lang/python before trying them.
+EOM
+}
+]
diff --git a/science/py-DendroPy/pkg-message b/science/py-DendroPy/pkg-message
index 022741e7740b..1f71993d6f73 100644
--- a/science/py-DendroPy/pkg-message
+++ b/science/py-DendroPy/pkg-message
@@ -1,8 +1,11 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 If you use this library either in whole or in part in your analysis, or
 use any code derived from it, please cite it as:
 
   Sukumaran, J. and Mark T. Holder. 2010. DendroPy: A Python library
   for phylogenetic computing. Bioinformatics 26: 1569-1571.
-
-************************************************************************
+EOM
+}
+]
diff --git a/science/py-gpaw/pkg-message b/science/py-gpaw/pkg-message
index 53cae563283e..98fbfddb7832 100644
--- a/science/py-gpaw/pkg-message
+++ b/science/py-gpaw/pkg-message
@@ -1,8 +1,12 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed GPAW, the system for DFT computations in quantum
 chemistry.
 
 In order to use this package you most likely need to also install
 science/gpaw-setups that contains data files for electronic
 configurations for many elements of the periodic table.
-======================================================================
+EOM
+}
+]
diff --git a/science/tinker/files/pkg-message.in b/science/tinker/files/pkg-message.in
index 58158ef0e8ac..42cdd3070f9f 100644
--- a/science/tinker/files/pkg-message.in
+++ b/science/tinker/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************
+[
+{ type: install
+  message: <<EOM
    The author requests that you return a license form
    to him if you find Tinker to be useful.
 
@@ -8,4 +10,6 @@
    to 'analyze_t' during installation to allow for use on
    systems where the very common hunspell package is
    installed as well.
-**********************************************************
+EOM
+}
+]
diff --git a/security/acme.sh/files/pkg-message.in b/security/acme.sh/files/pkg-message.in
index 756c364f87bc..6652629e6b01 100644
--- a/security/acme.sh/files/pkg-message.in
+++ b/security/acme.sh/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-
+[
+{ type: install
+  message: <<EOM
 This script will create the following directories if they do not exist:
 
  ~acme/.acme.sh
@@ -29,4 +30,6 @@ MAILTO=dan@example.org
 ############################################################################
 
 Change x & y to some minute and hour of the day.
-
+EOM
+}
+]
diff --git a/security/acmetool/pkg-message b/security/acmetool/pkg-message
index dac797e87792..fd73e05b11d3 100644
--- a/security/acmetool/pkg-message
+++ b/security/acmetool/pkg-message
@@ -1,5 +1,10 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 Use "acmetool quickstart" for initial configuration.
 
 See https://github.com/hlandau/acme for more details
 about how to configure and use the client.
+EOM
+}
+]
diff --git a/security/afterglow/pkg-message b/security/afterglow/pkg-message
index 5fd282bde254..6f955e08b3a9 100644
--- a/security/afterglow/pkg-message
+++ b/security/afterglow/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 AfterGlow is a collection of scripts which facilitate
 the process of generating graphs. It is the most downloaded
 security visualization tool of all times.
@@ -5,3 +8,6 @@ security visualization tool of all times.
 Afterglow documentation may be found online at
 http://afterglow.sourceforge.net/ including a FAQ, manual
 and screenshots.  Be sure to read the documentation carefully.
+EOM
+}
+]
diff --git a/security/aide/files/pkg-message.in b/security/aide/files/pkg-message.in
index 8a0ca3c22a83..0b1beb2aeae7 100644
--- a/security/aide/files/pkg-message.in
+++ b/security/aide/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 If you want to finish setting up AIDE, don't forget to customise your
 own aide.conf in %%PREFIX%%/etc/aide.conf. You will also need to run
 the following commands:
@@ -10,3 +13,6 @@ You may want to change the permissions of the /var/adm/aide/ directory tree.
 
 For your reference, a copy of the original aide.conf is supplied in
 %%PREFIX%%/etc/aide.conf.sample.
+EOM
+}
+]
diff --git a/security/amavis-stats/files/pkg-message.in b/security/amavis-stats/files/pkg-message.in
index f1872470d97b..20fb5bc1b78c 100644
--- a/security/amavis-stats/files/pkg-message.in
+++ b/security/amavis-stats/files/pkg-message.in
@@ -1,5 +1,6 @@
------
-
+[
+{ type: install
+  message: <<EOM
 To view the statistics via you browser you must:
 create a symlink, like:
 cd /usr/local/www/data ; ln -s ../amavis-stats amavis-stats
@@ -12,5 +13,6 @@ You can view then the statistics in http://your-site/amavis-stats
 To update the statistics every 5 minutes, you also
 can setup cronjob for amavis-stats by putting this line to /etc/crontab
 */5 * * * * amavis %%PREFIX%%/sbin/amavis-stats /var/log/maillog 2>&1 > /dev/null
-
------
+EOM
+}
+]
diff --git a/security/amavisd-milter/pkg-message b/security/amavisd-milter/pkg-message
index ee9313927660..a63ab60dde56 100644
--- a/security/amavisd-milter/pkg-message
+++ b/security/amavisd-milter/pkg-message
@@ -1,12 +1,11 @@
-
-*******************************************************************
-
- To configure amavisd-milter, sendmail and amavisd-new point
+[
+{ type: install
+  message: <<EOM
  your browser to http://amavisd-milter.sourceforge.net
 
  Enable amavisd-milter in /etc/rc.conf with the following line:
 
 	amavisd_milter_enable="YES"
-
-*******************************************************************
-
+EOM
+}
+]
diff --git a/security/amavisd-new/files/pkg-message.in b/security/amavisd-new/files/pkg-message.in
index e168d4af0993..ceb3bb1c24ee 100644
--- a/security/amavisd-new/files/pkg-message.in
+++ b/security/amavisd-new/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
  To use amavisd-new, you need to install at least one virus scanner.
  The following virus scanners are available in the FreeBSD ports
  collection:
@@ -38,5 +39,6 @@
  Configuration templates are available in %%PREFIX%%/etc
  as amavisd.conf.sample, amavisd.conf-default and amavisd-custom.conf.sample
  Documentation is available in %%DOCSDIR%%.
-*******************************************************************
-
+EOM
+}
+]
diff --git a/security/arpCounterattack/files/pkg-message.in b/security/arpCounterattack/files/pkg-message.in
index 1c44db265d5a..6fb0668bf9e6 100644
--- a/security/arpCounterattack/files/pkg-message.in
+++ b/security/arpCounterattack/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Before starting arpCounterattack, you should edit its configuration file,
 %%PREFIX%%/etc/arpCounterattack/arpCounterattack.conf. Then, add the following
 line to /etc/rc.conf:
@@ -8,4 +10,6 @@ arpcounterattack_enable="YES"
 Finally, to start it, run the following command:
 
 %%PREFIX%%/etc/rc.d/arpCounterattack start
-
+EOM
+}
+]
diff --git a/security/barnyard2/files/pkg-message.in b/security/barnyard2/files/pkg-message.in
index c782d838d593..40b011aa4bb9 100644
--- a/security/barnyard2/files/pkg-message.in
+++ b/security/barnyard2/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Read the notes in the barnyard2.conf file for how to configure
 %%PREFIX%%/etc/barnyard2.conf after installation.  For addtional information
 see the Securixlive FAQ at http://www.securixlive.com/barnyard2/faq.php.
@@ -12,5 +15,6 @@ the options in the startup script - in %%PREFIX%%/etc/rc.d.
 Barnyard2 can process unified2 files from snort or suricata.  It can also
 interact with snortsam firewall rules as well as the sguil-sensor. Those
 ports must be installed separately if you wish to use them.
-
-************************************************************************
+EOM
+}
+]
diff --git a/security/base-audit/pkg-message b/security/base-audit/pkg-message
index 6b68b75d2b8e..bc13d51ef98f 100644
--- a/security/base-audit/pkg-message
+++ b/security/base-audit/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Add the following lines to /etc/periodic.conf(.local) to enable periodic check
 	security_status_baseaudit_enable="YES"
 	security_status_baseaudit_quiet="NO"
@@ -13,3 +16,6 @@ for this script only.
 You can also change following variables:
 	security_status_baseaudit_period="daily"
 	security_status_baseaudit_expiry="2"
+EOM
+}
+]
diff --git a/security/base/files/pkg-message.in b/security/base/files/pkg-message.in
index c729bf48a5bd..1e7a3f915ea0 100644
--- a/security/base/files/pkg-message.in
+++ b/security/base/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Please read the README file located at:
 
 %%DOCSDIR%%/README
@@ -22,5 +23,6 @@ If you built BASE with PDF support, make sure you include the FPDF
 path in your %%LOCALBASE%%/etc/php.ini configuration file, like:
 
     include_path = ".:%%LOCALBASE%%/share/pear:%%LOCALBASE%%/share/fpdf"
-
-========================================================================
+EOM
+}
+]
diff --git a/security/bdes/pkg-message b/security/bdes/pkg-message
index 8fb669fc3842..9af923d50d27 100644
--- a/security/bdes/pkg-message
+++ b/security/bdes/pkg-message
@@ -1,4 +1,8 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! The DES cipher should no longer be considered secure.     !!
-!! Please consider using a more modern alternative.          !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+[
+{ type: install
+  message: <<EOM
+ The DES cipher should no longer be considered secure.
+ Please consider using a more modern alternative.
+EOM
+}
+]
diff --git a/security/beid/pkg-message b/security/beid/pkg-message
index 35a9465f4464..985bd9bfd182 100644
--- a/security/beid/pkg-message
+++ b/security/beid/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 WARNING:
 The private keys on the eID cards are created by the Belgian government and
 not by the citizens.  You should assume that the government can forge digital
@@ -14,3 +17,6 @@ as devel/libccid) and that pcscd is running (add pcscd_enable="YES" to
 
 To use your eID in Firefox you have to enable the "eID Belgium" extension
 in the Add-ons Manager.
+EOM
+}
+]
diff --git a/security/bro/files/pkg-message.in b/security/bro/files/pkg-message.in
index 344601bc4094..df8a5c1509a0 100644
--- a/security/bro/files/pkg-message.in
+++ b/security/bro/files/pkg-message.in
@@ -1,10 +1,12 @@
-********************PLEASE NOTE!!!***************************
-
+[
+{ type: install
+  message: <<EOM
 During deinstall of this package, the cfg files for broctl
 are not deleted if you have edited them.  Instead
 the software will create a .sample file instead and the
 edited files will remain in place when you upgrade.  If you
 want to delete them, you have to delete them and the directory,
 %%PREFIX%%/etc manually.
-
-********************PLEASE NOTE!!!***************************
+EOM
+}
+]
diff --git a/security/bruteblock/files/pkg-message.in b/security/bruteblock/files/pkg-message.in
index 9932afcc78a6..cc956b191ed5 100644
--- a/security/bruteblock/files/pkg-message.in
+++ b/security/bruteblock/files/pkg-message.in
@@ -1,5 +1,6 @@
-===>  CONFIGURATION NOTE:
-
+[
+{ type: install
+  message: <<EOM
   Configuration of the bruteblock is done via configuration files
   located at %%PREFIX%%/etc/bruteblock/
 
@@ -25,3 +26,6 @@ auth.info;authpriv.info                         |exec %%PREFIX%%/sbin/bruteblock
   and start bruteblockd: %%PREFIX%%/etc/rc.d/bruteblockd.sh start
 
 See bruteblock(8) for more details.
+EOM
+}
+]
diff --git a/security/bruteforceblocker/files/pkg-message.in b/security/bruteforceblocker/files/pkg-message.in
index d809360b671c..8543c7f4f99e 100644
--- a/security/bruteforceblocker/files/pkg-message.in
+++ b/security/bruteforceblocker/files/pkg-message.in
@@ -1,5 +1,8 @@
-===>  CONFIGURATION NOTE:
-
+[
+{ type: install
+  message: <<EOM
 Configuration of BruteForceBlocker is done via main configuration file
 located at %%PREFIX%%/etc/bruteforceblocker.conf
-
+EOM
+}
+]
diff --git a/security/bsmtrace/files/pkg-message.in b/security/bsmtrace/files/pkg-message.in
index 82e3c3dc6d95..711f3e0a2e44 100644
--- a/security/bsmtrace/files/pkg-message.in
+++ b/security/bsmtrace/files/pkg-message.in
@@ -1,6 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 Please note a sample configuration file for bsmtrace has been installed
 in %%EXAMPLESDIR%%.  This file will not be
 suitable for your own system, but can be used as a reference to get
 started.
-i
+EOM
+}
+]
diff --git a/security/ca_root_nss/files/pkg-message.in b/security/ca_root_nss/files/pkg-message.in
index 5bb89cb87e85..d937df3a0922 100644
--- a/security/ca_root_nss/files/pkg-message.in
+++ b/security/ca_root_nss/files/pkg-message.in
@@ -1,5 +1,6 @@
-********************************* WARNING *********************************
-
+[
+{ type: install
+  message: <<EOM
 FreeBSD does not, and can not warrant that the certification authorities
 whose certificates are included in this package have in any way been
 audited for trustworthiness or RFC 3647 compliance.
@@ -7,7 +8,6 @@ audited for trustworthiness or RFC 3647 compliance.
 Assessment and verification of trust is the complete responsibility of the
 system administrator.
 
-*********************************** NOTE **********************************
 
 This package installs symlinks to support root certificates discovery by
 default for software that uses OpenSSL.
@@ -21,5 +21,6 @@ either an empty file or your site-local certificate bundle.
   * /etc/ssl/cert.pem
   * %%PREFIX%%/etc/ssl/cert.pem
   * %%PREFIX%%/openssl/cert.pem
-
-***************************************************************************
+EOM
+}
+]
diff --git a/security/calife/pkg-message b/security/calife/pkg-message
index 6c58ac951906..a93d66396b80 100644
--- a/security/calife/pkg-message
+++ b/security/calife/pkg-message
@@ -1,5 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 This version supports (and encourages you to use) PAM.  A sample
 configuration file is in ${PREFIX}/etc/pam.d/calife.sample.
 Rename it to "calife" to enable PAM authentication.  It will fall
 back to the previous methods if PAM is not available.
+EOM
+}
+]
diff --git a/security/cfs/files/pkg-message.in b/security/cfs/files/pkg-message.in
index 77290788f604..11b2ce5ab5e1 100644
--- a/security/cfs/files/pkg-message.in
+++ b/security/cfs/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 Quick start instructions:
 
   - add the following entry to /etc/exports:
@@ -19,4 +21,6 @@ Quick start instructions:
 
     # service mountd start
     # service cfsd start
-===============================================================================
+EOM
+}
+]
diff --git a/security/clamav-unofficial-sigs/files/pkg-message.in b/security/clamav-unofficial-sigs/files/pkg-message.in
index fd16637b1acd..256979eae443 100644
--- a/security/clamav-unofficial-sigs/files/pkg-message.in
+++ b/security/clamav-unofficial-sigs/files/pkg-message.in
@@ -1,5 +1,6 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 In order to start using clamav-unofficial-sigs, you need to configure
 it first. Sample configuration files have been installed to:
 
@@ -21,5 +22,6 @@ obsolete configuration file:
 
 To run the script periodically by cron, you also need to add it to
 your crontab.
-
-**********************************************************************
+EOM
+}
+]
diff --git a/security/clamfs/pkg-message b/security/clamfs/pkg-message
index 6c658da014b0..4639c4e56d69 100644
--- a/security/clamfs/pkg-message
+++ b/security/clamfs/pkg-message
@@ -1,7 +1,11 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 In order to use clamfs, you should load fuse.ko module.
 
 Type "sudo kldload fuse.ko"
 
 For more info please visit http://clamfs.sourceforge.net
-**************************************************************************
+EOM
+}
+]
diff --git a/security/clamsmtp/files/pkg-message.in b/security/clamsmtp/files/pkg-message.in
index cd10b7e67719..51331c7c99b2 100644
--- a/security/clamsmtp/files/pkg-message.in
+++ b/security/clamsmtp/files/pkg-message.in
@@ -1,4 +1,6 @@
-/* ================================================================= */
+[
+{ type: install
+  message: <<EOM
 Edit /etc/rc.conf and set
 
 clamsmtpd_enable="YES"
@@ -11,4 +13,6 @@ config file.
 
 To work with postfix, See also
 http://memberwebs.com/nielsen/software/clamsmtp/postfix.html
-/* ================================================================= */
+EOM
+}
+]
diff --git a/security/courierpassd/pkg-message b/security/courierpassd/pkg-message
index 7478f1db8768..713587fec4cb 100644
--- a/security/courierpassd/pkg-message
+++ b/security/courierpassd/pkg-message
@@ -1,6 +1,6 @@
-
-##############################################################################
-
+[
+{ type: install
+  message: <<EOM
 In order to run this port, please add the following line to
 /etc/inetd.conf if not already there:
 
@@ -13,5 +13,6 @@ its value defaults to "login".
 After modifying /etc/inetd.conf, you must (as root) run:
 
 	killall -HUP inetd
-
-##############################################################################
+EOM
+}
+]
diff --git a/security/courierpasswd/pkg-message b/security/courierpasswd/pkg-message
index 7b04b6b1a0be..b5aeb40451ff 100644
--- a/security/courierpasswd/pkg-message
+++ b/security/courierpasswd/pkg-message
@@ -1,5 +1,6 @@
-
-#########################################################################
+[
+{ type: install
+  message: <<EOM
 NOTES FOR RUNNING COURIERPASSWD
 
 In order to use courierpasswd, it must be able to access the
@@ -47,5 +48,6 @@ attacks against account passwords if courierpasswd is set up this way.
 
 The location of the authdaemon domain socket is listed in the
 authdaemonrc configuration file as the parameter authdaemonvar.
-
-#########################################################################
+EOM
+}
+]
diff --git a/security/courieruserinfo/pkg-message b/security/courieruserinfo/pkg-message
index 0540fc049697..830fe4a48a49 100644
--- a/security/courieruserinfo/pkg-message
+++ b/security/courieruserinfo/pkg-message
@@ -1,5 +1,6 @@
-
-#########################################################################
+[
+{ type: install
+  message: <<EOM
 NOTES FOR RUNNING COURIERUSERINFO
 
 In order to use courieruserinfo, it must be able to access the
@@ -39,6 +40,6 @@ setgid, courieruserinfo cannot retrieve passwords.
 
 The location of the authdaemon domain socket is listed in the
 authdaemonrc configuration file as the parameter authdaemonvar.
-
-#########################################################################
-
+EOM
+}
+]
diff --git a/security/cp2fwb/pkg-message b/security/cp2fwb/pkg-message
index a6dd98d4c272..c5c38cb6c18f 100644
--- a/security/cp2fwb/pkg-message
+++ b/security/cp2fwb/pkg-message
@@ -1,5 +1,6 @@
-=======================================================
-
+[
+{ type: install
+  message: <<EOM
   In order for cp2fwb to work, you need the following
   files from your Checkpoint FW1 installation:
 
@@ -11,5 +12,6 @@
    cp2fwbuilder --objects=objects.C \
 			--rules=Rulebase.W \
 			--output_xml=Rulebase.xml
-
-=======================================================
+EOM
+}
+]
diff --git a/security/ct-submit/pkg-message b/security/ct-submit/pkg-message
index 556d2a96369e..156c75e2aaa5 100644
--- a/security/ct-submit/pkg-message
+++ b/security/ct-submit/pkg-message
@@ -1,11 +1,13 @@
-/**************************************************************************/
-/*                                                                        */
-/* To submit to a transparency log use the following command:             */
-/*                                                                        */
-/* ct-submit some.cert-transparency.log < /path/to/ssl-cert.pem > foo.sct */
-/*                                                                        */
-/* For a list of known logs, see:                                         */
-/*                                                                        */
-/* https://www.certificate-transparency.org/known-logs                    */
-/*                                                                        */
-/**************************************************************************/
+[
+{ type: install
+  message: <<EOM
+ To submit to a transparency log use the following command:
+
+ ct-submit some.cert-transparency.log < /path/to/ssl-cert.pem > foo.sct
+
+ For a list of known logs, see:
+
+ https://www.certificate-transparency.org/known-logs
+EOM
+}
+]
diff --git a/security/cyrus-sasl2-saslauthd/pkg-message b/security/cyrus-sasl2-saslauthd/pkg-message
index 6670f48e43e7..c66ed76e67b6 100644
--- a/security/cyrus-sasl2-saslauthd/pkg-message
+++ b/security/cyrus-sasl2-saslauthd/pkg-message
@@ -1,6 +1,8 @@
-****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To run saslauthd from startup, add saslauthd_enable="YES" in your
 /etc/rc.conf.
-
-****************************************************************************
+EOM
+}
+]
diff --git a/security/cyrus-sasl2/files/pkg-message.in b/security/cyrus-sasl2/files/pkg-message.in
index 0198d8319d7b..1d8901c36b12 100644
--- a/security/cyrus-sasl2/files/pkg-message.in
+++ b/security/cyrus-sasl2/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 You can use sasldb2 for authentication, to add users use:
 
 	saslpasswd2 -c username
@@ -19,4 +21,6 @@ NOTE: This port has been compiled with a default pwcheck_method of
       ports/security/cyrus-sasl2-srp.
       If you want to use LDAP auxprop plugin, install
       ports/security/cyrus-sasl2-ldapdb.
-
+EOM
+}
+]
diff --git a/security/dehydrated/files/pkg-message.in b/security/dehydrated/files/pkg-message.in
index b76d694f4608..e12265f46eb1 100644
--- a/security/dehydrated/files/pkg-message.in
+++ b/security/dehydrated/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use this script you should copy the examples in
 %%PREFIX%%/etc/%%PORTNAME%%/ and at least add a
 domain and a contact mail address.
@@ -18,4 +21,6 @@ weekly_dehydrated_deployscript="%%PREFIX%%/etc/%%PORTNAME%%/deploy.sh"
 
 Additional flags for the periodic run go into
 weekly_dehydrated_flags="-g"
-
+EOM
+}
+]
diff --git a/security/denyhosts/files/pkg-message.in b/security/denyhosts/files/pkg-message.in
index ca437a58c0fc..ea8090e1a2a8 100644
--- a/security/denyhosts/files/pkg-message.in
+++ b/security/denyhosts/files/pkg-message.in
@@ -1,19 +1,23 @@
--------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To run denyhosts from startup, add denyhosts_enable="YES"
 in your /etc/rc.conf.
 Configiration options can be found in %%PREFIX%%/etc/denyhosts.conf
--------------------------------------------------------------------------------
+
 In order to proper working of denyhosts
 1. edit your /etc/hosts.allow file and add:
 sshd : /etc/hosts.deniedssh : deny
 sshd : ALL : allow
 2. issue the following command if /etc/hosts.deniedssh does not exist yet
 touch /etc/hosts.deniedssh
--------------------------------------------------------------------------------
+
 Warning:
 
 syslogd should ideally be run with the -c option; this will ensure that
 denyhosts notices multiple repeated login attempts.
 
 To do this, add syslogd_flags="-c" to /etc/rc.conf
--------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/security/doorman/files/pkg-message.in b/security/doorman/files/pkg-message.in
index 9ea2fe44c740..3fd8127443fe 100644
--- a/security/doorman/files/pkg-message.in
+++ b/security/doorman/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-******************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To configure Doorman, please edit the files guestlist and doormand.cf found in
 %%PREFIX%%/etc/doormand.  Documentation can be found using:
 
@@ -13,5 +13,6 @@ The doormand daemon will *not* be started automatically. To allow it
 to start, put this line in /etc/rc.conf:
 
 doorman_enable="YES"
-
-******************************************************************************
+EOM
+}
+]
diff --git a/security/duo/files/pkg-message.in b/security/duo/files/pkg-message.in
index 6006546ced8b..0fc04ac58f5e 100644
--- a/security/duo/files/pkg-message.in
+++ b/security/duo/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-=================================================================
+[
+{ type: install
+  message: <<EOM
 Configuration file %%PREFIX%%/etc/login_duo.conf was created.
 You must edit it to add your Duo integration and secret keys.
 
@@ -10,5 +11,6 @@ auth	required	%%PREFIX%%/lib/security/pam_duo.so
 Additionally, you must edit %%PREFIX%%/etc/pam_duo.conf
 
 duo headers have been installed to %%PREFIX%%/include/duo
-=================================================================
-
+EOM
+}
+]
diff --git a/security/f-prot/pkg-message b/security/f-prot/pkg-message
index 769d42b23ee9..c03c5ddabdc5 100644
--- a/security/f-prot/pkg-message
+++ b/security/f-prot/pkg-message
@@ -1,5 +1,6 @@
-***************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 F-Prot Antivirus for BSD Workstations has been installed.
 
 By default fpupdate will run daily to update F-Prot's virus
@@ -7,5 +8,6 @@ definitions. If you do not want this behaviour please set the
 following in /etc/periodic.conf or /etc/periodic.conf.local:
 
 fpupdate_enable="NO"
-
-***************************************************************************
+EOM
+}
+]
diff --git a/security/fakeident/pkg-message b/security/fakeident/pkg-message
index 136651326618..9b046c1af1a1 100644
--- a/security/fakeident/pkg-message
+++ b/security/fakeident/pkg-message
@@ -1,3 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 To enable fakeidentd please add fakeidentd_enable="YES" to
 /etc/rc.conf.
+EOM
+}
+]
diff --git a/security/fpm2/files/pkg-message.in b/security/fpm2/files/pkg-message.in
index d6ff8caefa0c..66fe0dcc7809 100644
--- a/security/fpm2/files/pkg-message.in
+++ b/security/fpm2/files/pkg-message.in
@@ -1,8 +1,10 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Figaro's Password Manager 2 has been installed.
 
 Make sure you set up a few IRQ's for random generation with rndcontrol before
 expecting password generation to work well.
-
-===============================================================================
+EOM
+}
+]
diff --git a/security/fprint_demo/pkg-message b/security/fprint_demo/pkg-message
index a0d3ed506b25..53f3a53d3935 100644
--- a/security/fprint_demo/pkg-message
+++ b/security/fprint_demo/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to enroll new finger prints, you must have r/w access to the
 usb device node(s) of your finger print reader (i.e., /dev/{ugen, usb}*).
 
@@ -16,3 +19,6 @@ add path 'usb' mode 0770 group operator
 add path 'usb/*' mode 0660 group operator
 
 # /etc/rc.d/devfs restart
+EOM
+}
+]
diff --git a/security/fswatch/pkg-message b/security/fswatch/pkg-message
index 9217897ede11..a28972d1e9ee 100644
--- a/security/fswatch/pkg-message
+++ b/security/fswatch/pkg-message
@@ -1,4 +1,6 @@
------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The default fswatch.conf checks directories:
   /etc /bin /sbin /lib /libexec /usr/bin /usr/sbin /usr/lib
   /usr/libexec /usr/libdata /usr/local/etc /usr/local/bin
@@ -6,4 +8,6 @@ The default fswatch.conf checks directories:
   /usr/local/libdata
 
 See fswatch(7) for more details.
------------------------------------------------------------------
+EOM
+}
+]
diff --git a/security/fuzz/pkg-message b/security/fuzz/pkg-message
index 6e171e333e0e..7c19063f3a8d 100644
--- a/security/fuzz/pkg-message
+++ b/security/fuzz/pkg-message
@@ -1,8 +1,10 @@
-
-=========================================================================
+[
+{ type: install
+  message: <<EOM
 BEWARE!  This software bombards programs with signicant amounts of random
 input meant to cause failure.  Due to the potential havok some programs
 may cause when given untrusted input, it is recommended that programs be
 tested under a jail(8) environment.
-=========================================================================
-
+EOM
+}
+]
diff --git a/security/git-remote-gcrypt/pkg-message b/security/git-remote-gcrypt/pkg-message
index 4eef5ab72b09..0657a706de3e 100644
--- a/security/git-remote-gcrypt/pkg-message
+++ b/security/git-remote-gcrypt/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 For trying out rclone (experimental backend), please install rclone
 from net/rclone port.
+EOM
+}
+]
diff --git a/security/gnome-keyring/files/pkg-message.in b/security/gnome-keyring/files/pkg-message.in
index c59d74ec7a91..343baf52b501 100644
--- a/security/gnome-keyring/files/pkg-message.in
+++ b/security/gnome-keyring/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 Gnome-keyring uses pinentry-gnome3 for gpg interactions, please add the
 following line to your ~/.gnupg/gpg-agent.conf to enable the pinentry
 dialog.
 
 pinentry-program %%PREFIX%%/bin/pinentry-gnome3
-
+EOM
+}
+]
diff --git a/security/gnupg/files/pkg-message.in b/security/gnupg/files/pkg-message.in
index 7750064bbf58..26f67eb103cc 100644
--- a/security/gnupg/files/pkg-message.in
+++ b/security/gnupg/files/pkg-message.in
@@ -1,4 +1,6 @@
-***************************************************************************
+[
+{ type: install
+  message: <<EOM
 GnuPG, when run on hosts without IPv6 connectivity, may fail to connect to
 dual-stack hkp servers [1].  As a workaround, add
 
@@ -9,4 +11,6 @@ to
 %%PREFIX%%/etc/dirmngr.conf
 
 [1] https://dev.gnupg.org/rGecfc4db3a2f8bc2652ba4ac4de5ca1cd13bfcbec
-***************************************************************************
+EOM
+}
+]
diff --git a/security/go-cve-dictionary/files/pkg-message.in b/security/go-cve-dictionary/files/pkg-message.in
index 93125798b97d..d18c3ff39247 100644
--- a/security/go-cve-dictionary/files/pkg-message.in
+++ b/security/go-cve-dictionary/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 Congratulations, you have installed %%PORTNAME%%!
 
 %%PORTNAME%% does not ship any CVE database.
@@ -16,4 +18,6 @@ To enable %%PORTNAME%% and start:
 
 sysrc go_cve_dictionary_enable="YES"
 service %%PORTNAME%% start
-===============================================================================
+EOM
+}
+]
diff --git a/security/gost-engine/files/pkg-message.in b/security/gost-engine/files/pkg-message.in
index 9809e321bc77..f15112bebb33 100644
--- a/security/gost-engine/files/pkg-message.in
+++ b/security/gost-engine/files/pkg-message.in
@@ -1,6 +1,10 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+[
+{ type: install
+  message: <<EOM
 You should edit openssl.cnf configuration file as specified below
 to start using GOST Engine through OpenSSL.
 For details, refer to the section `How to Configure' in
 %%DOCSDIR%%/INSTALL.md
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/security/gtkpasman/files/pkg-message.in b/security/gtkpasman/files/pkg-message.in
index 299812600b11..6d2543e61068 100644
--- a/security/gtkpasman/files/pkg-message.in
+++ b/security/gtkpasman/files/pkg-message.in
@@ -1,8 +1,12 @@
-#####################################################################
+[
+{ type: install
+  message: <<EOM
 This port installs a sample password file in the following location:
 
 %%DOCSDIR%%
 
 You may find this file useful while making your own password file.
 Also note that the File->Open function is not implemented yet.
-#####################################################################
+EOM
+}
+]
diff --git a/security/hashcat/pkg-message b/security/hashcat/pkg-message
index b01821f17825..e6dee581a154 100644
--- a/security/hashcat/pkg-message
+++ b/security/hashcat/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 This port requires an OpenCL runtime.
 Please see this for information on how to obtain one:
 https://wiki.freebsd.org/Graphics/OpenCL
 
 If it is not possible to obtain an OpenCL runtime,
 please use security/hashcat-legacy instead.
+EOM
+}
+]
diff --git a/security/heimdal/pkg-message b/security/heimdal/pkg-message
index e66561acb92d..e9c263eac41b 100644
--- a/security/heimdal/pkg-message
+++ b/security/heimdal/pkg-message
@@ -1,7 +1,11 @@
-====
+[
+{ type: install
+  message: <<EOM
 heimdal-7.1.0_1 uses a new database format which is incompatible
 with Heimdal in the base system and heimdal-1.5.3_6 or prior.
 
 Please read 20161112 in /usr/ports/UPDATING carefully to upgrade
 your database.
-====
+EOM
+}
+]
diff --git a/security/hitch/pkg-message b/security/hitch/pkg-message
index ded2a0b436bf..7d796e21e2d7 100644
--- a/security/hitch/pkg-message
+++ b/security/hitch/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Don't forget to append DH params to your pem file using:
 openssl dhparam -rand - 2048 >> /path/to/cert.pem
+EOM
+}
+]
diff --git a/security/hockeypuck/pkg-message b/security/hockeypuck/pkg-message
index 943c3842eedf..35d2213b793f 100644
--- a/security/hockeypuck/pkg-message
+++ b/security/hockeypuck/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Hockeypuck needs a configuration file before it can be used.
 For more information about configuration details see:
 https://hockeypuck.github.io/configuration.html
@@ -7,3 +9,6 @@ If this hockeypuck install is to be used in the sks-keyserver.net pools
 it needs to be populated with a current dump of the keys in the network.
 For more information on populating the database see:
 https://hockeypuck.github.io/populating.html
+EOM
+}
+]
diff --git a/security/i2pd/pkg-message b/security/i2pd/pkg-message
index f5743d96de4c..3f3db51dc389 100644
--- a/security/i2pd/pkg-message
+++ b/security/i2pd/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You may want to increase default i2pd bandwidth limit by adding
 --bandwidth to i2pd_flags in /etc/rc.conf. Add the following to
 allow the highest traffic:
 
 i2pd_flags="--bandwidth X"
+EOM
+}
+]
diff --git a/security/ipfcount/files/pkg-message.in b/security/ipfcount/files/pkg-message.in
index 6dc0290082d3..c2da00cb2d2f 100644
--- a/security/ipfcount/files/pkg-message.in
+++ b/security/ipfcount/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
   To summarise ipf(8) logs in your daily security check:
 
   * Copy %%EXAMPLESDIR%%/100.ipfcount to
@@ -9,4 +11,6 @@
       daily_status_security_ipfcount_enable="YES"
 
     to /etc/periodic.conf
-
+EOM
+}
+]
diff --git a/security/ipfilter2dshield/pkg-message b/security/ipfilter2dshield/pkg-message
index ce8a02fc531c..04cdfe125fc9 100644
--- a/security/ipfilter2dshield/pkg-message
+++ b/security/ipfilter2dshield/pkg-message
@@ -1,5 +1,6 @@
-***************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Installer instructions.  This port has installed the
 %%DISTNAME%% script into %%PREFIX%%/sbin directory.
 
@@ -20,5 +21,6 @@ Also contained in the ppars-1.0 port is instructions on how to auto
 launch the scripts only when the ipfilter log is rotated by
 newsyslog, which you may find useful for launching the dshield
 script installed by this port.
-
-***************************************************************************
+EOM
+}
+]
diff --git a/security/ipfwcount/files/pkg-message.in b/security/ipfwcount/files/pkg-message.in
index 22130ffa702c..7a34f06d4015 100644
--- a/security/ipfwcount/files/pkg-message.in
+++ b/security/ipfwcount/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
   To summarise ipfw(8) logs in your daily security check:
 
   * Copy %%EXAMPLESDIR%%/100.ipfwcount to
@@ -9,4 +11,6 @@
       daily_status_security_ipfwcount_enable="YES"
 
     to /etc/periodic.conf
-
+EOM
+}
+]
diff --git a/security/kc24/pkg-message b/security/kc24/pkg-message
index 190a3bbe5b4c..173f59337945 100644
--- a/security/kc24/pkg-message
+++ b/security/kc24/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 IMPORTANT:
 kc v2.4 has introduced a new database file format that is incompatible
 with the older one (<2.4).
@@ -38,3 +41,6 @@ Save OK
 6) Remove the dump
 
 rm -P kcdump.xml
+EOM
+}
+]
diff --git a/security/keybase/pkg-message b/security/keybase/pkg-message
index befc54e42290..9d9351ceaac4 100644
--- a/security/keybase/pkg-message
+++ b/security/keybase/pkg-message
@@ -1,11 +1,11 @@
-######################################################################
-                         \!/ WARNING \!/
-
+[
+{ type: install
+  message: <<EOM
           Uploading private keys is strongly discouraged.
 
-                         \!/ WARNING \!/
 
 Notes on how to configure and mount KBFS are available on the FreeBSD wiki:
 https://wiki.FreeBSD.org/Ports/security/keybase
-
-######################################################################
+EOM
+}
+]
diff --git a/security/lastpass-cli/pkg-message b/security/lastpass-cli/pkg-message
index cf8263c12cda..c5fc064172be 100644
--- a/security/lastpass-cli/pkg-message
+++ b/security/lastpass-cli/pkg-message
@@ -1,7 +1,6 @@
-===============================================================================
-Important security considerations
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Before using the 'edit' subcommand interactively, it's recommended to set the
 SECURE_TMPDIR environment variable to a location that isn't written to disk,
 such as a tmpfs mount, ideally using encrypted swap:
@@ -13,4 +12,6 @@ locations - consider disabling these features for files matching the pattern
 lpass.* or within your $SECURE_TMPDIR.  For example, with vim:
 
 	autocmd BufRead lpass.* setlocal noundofile nowritebackup noswapfile
-
+EOM
+}
+]
diff --git a/security/lego/files/pkg-message.in b/security/lego/files/pkg-message.in
index 5b02884f4bb2..59c4cdcb26f7 100644
--- a/security/lego/files/pkg-message.in
+++ b/security/lego/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 There are example scripts in
     %%ETCDIR%%
 that you can use for renewing and deploying certificates.
@@ -33,5 +35,6 @@ Then run lego.sh with the run argument as the %%LEGO_USER%% user:
 
 Subsequent periodic runs will run with the renew argument by default, with a
 renewal interval of 30 days.
-
-
+EOM
+}
+]
diff --git a/security/logcheck/files/pkg-message.in b/security/logcheck/files/pkg-message.in
index 87b28c7a0f45..4f59a9561302 100644
--- a/security/logcheck/files/pkg-message.in
+++ b/security/logcheck/files/pkg-message.in
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Please make sure that all files listed in
 
   %%ETCDIR%%/logcheck.logfiles
@@ -9,5 +11,6 @@ or remove them from the aforementioned logcheck configuration file.
 For information on how to write local rulesets see
 
   %%DOCSDIR%%/README.logcheck-database
-
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/security/lxqt-openssh-askpass/pkg-message b/security/lxqt-openssh-askpass/pkg-message
index fe2fbcd67642..0e9a6ee0c3e3 100644
--- a/security/lxqt-openssh-askpass/pkg-message
+++ b/security/lxqt-openssh-askpass/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 *** Note ssh-add will NOT use GUI tools like lxqt-openssh-askpass 
 *** when it is attached to a terminal. 
 
@@ -8,3 +11,6 @@ ssh-agent -a "/tmp/${USER}-ssh-agent"
 SSH_ASKPASS=lxqt-openssh-askpass
 SSH_AUTH_SOCK=<SOCKET_PATH>
 then run ssh-add from lxqt-runner or a .desktop entry
+EOM
+}
+]
diff --git a/security/lxqt-sudo/pkg-message b/security/lxqt-sudo/pkg-message
index 59b4551144f8..e6d8f9b4e221 100644
--- a/security/lxqt-sudo/pkg-message
+++ b/security/lxqt-sudo/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 * You must be in the sudoers file in order to use lxqt-sudo 
 * You must be in the the wheel group in order to use lxsu
+EOM
+}
+]
diff --git a/security/maia/files/pkg-message.in b/security/maia/files/pkg-message.in
index 7f94915a442b..6fd7689896ec 100644
--- a/security/maia/files/pkg-message.in
+++ b/security/maia/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
  To use Maia-Mailguard, you need to install at least one virus scanner.
  The following virus scanners are available in the FreeBSD ports
  collection:
@@ -14,10 +15,11 @@
 
  Configuration templates are available in %%ETCDIR%%
  as maia.conf.dist and maiad.conf.dist.
-*******************************************************************
+
 
  Please note that Maia Mailguard no longer supports "mysql" but has
  moved forward to using "mysqli" instead. So, please check your
  %%WWWDIR%%/config.php file and make any appropriate changes.
-*******************************************************************
-
+EOM
+}
+]
diff --git a/security/mailzu/files/pkg-message.in b/security/mailzu/files/pkg-message.in
index 729b83ef388a..7a59acf86e62 100644
--- a/security/mailzu/files/pkg-message.in
+++ b/security/mailzu/files/pkg-message.in
@@ -1,10 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 MailZu has been installed into:
 
 	%%WWWDIR%%
 
-****************************************************
 Please read: %%DOCSDIR%%/INSTALL
-****************************************************
 
 Then, edit %%WWWDIR%%/config/config.php
 
@@ -25,3 +26,6 @@ Alias /mailzu/ "%%WWWDIR%%/"
     Deny from all
     Allow from 127.0.0.1 .example.org
 </Directory>
+EOM
+}
+]
diff --git a/security/md4coll/pkg-message b/security/md4coll/pkg-message
index 40d6398f33e5..91cefce11f21 100644
--- a/security/md4coll/pkg-message
+++ b/security/md4coll/pkg-message
@@ -1,4 +1,8 @@
----------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Please check http://www.stachliu.com/collisions.html for instructions
 on how to use this application.
----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/security/meek/files/pkg-message.in b/security/meek/files/pkg-message.in
index f776f47aea6a..65e286afc031 100644
--- a/security/meek/files/pkg-message.in
+++ b/security/meek/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 If you are using meek with tor, here are some instructions:
 
 As a client, add the following to %%PREFIX%%/etc/tor/torrc:
@@ -9,5 +11,6 @@ As a client, add the following to %%PREFIX%%/etc/tor/torrc:
 	  --url=https://meek-reflect.example.com \
 	  --front=www.example.com \
 	  --log meek-client.log
-
-================================================================================
+EOM
+}
+]
diff --git a/security/morphis/files/pkg-message.in b/security/morphis/files/pkg-message.in
index e8108e73a944..7673ea9de9ff 100644
--- a/security/morphis/files/pkg-message.in
+++ b/security/morphis/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed MORPHiS: Secure decentralized data store and mail.
 
 It is recommended to run MORPHiS as a service:
@@ -10,4 +12,6 @@ http://localhost:4251
 
 You can also run MORPHiS manually (not recommended) with the command:
 # su -m %%USER%% -c morphis
-======================================================================
+EOM
+}
+]
diff --git a/security/obfs4proxy-tor/files/pkg-message.in b/security/obfs4proxy-tor/files/pkg-message.in
index 3d9f05f143da..4fd22749b74a 100644
--- a/security/obfs4proxy-tor/files/pkg-message.in
+++ b/security/obfs4proxy-tor/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use obfs4 as a Bridge Client, please add the following configuration
 to your 'torrc' config file:
 
@@ -22,5 +23,6 @@ config file to fit your needs. It's compatible with ScrambleSuit in client mode.
 
 For more information, please consult the official wiki page at 
 https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy
-
-======================================================================
+EOM
+}
+]
diff --git a/security/opencryptoki/files/pkg-message.in b/security/opencryptoki/files/pkg-message.in
index ff30709c9e40..68deee69c0fa 100644
--- a/security/opencryptoki/files/pkg-message.in
+++ b/security/opencryptoki/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run pkcsslotd automatically, add the following line to /etc/rc.conf
 
 pkcsslotd_enable="YES"
@@ -5,3 +8,6 @@ pkcsslotd_enable="YES"
 To use PKCS#11 token, add your_account to '%%GROUPS%%':
 
 # pw groupmod %%GROUPS%% -m your_account
+EOM
+}
+]
diff --git a/security/openct/pkg-message b/security/openct/pkg-message
index 2cab6b7679c7..4dd2f2a3e832 100644
--- a/security/openct/pkg-message
+++ b/security/openct/pkg-message
@@ -1,4 +1,6 @@
-********************************************************
+[
+{ type: install
+  message: <<EOM
 Before using OpenCT, you should create the configuration
 file, by copying the installed sample.
 
@@ -6,4 +8,6 @@ To enable hot-plug support for your USB reader/token,
 you need a devd enabled system. A configuration sample
 for the Aladdin eToken PRO crypto token has been put
 in the examples directory.
-********************************************************
+EOM
+}
+]
diff --git a/security/openscep/files/pkg-message.in b/security/openscep/files/pkg-message.in
index d8c4dd67b9b0..4c68a3e7d0c4 100644
--- a/security/openscep/files/pkg-message.in
+++ b/security/openscep/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You now need to add an alias to apache's httpd.conf pointing to
 %%PREFIX%%/www/openscep in order to access openscep from
 your web browser, or create a VirtualHost with DocumentRoot set
@@ -11,4 +13,6 @@ into your slapd config (sample of this is at
 Furthermore, you should add your ldap directory information from
 %%PREFIX%%/etc/openscep/openscep.ldif and edit DN specific information
 there before doing ldapadd.
-======================================================================
+EOM
+}
+]
diff --git a/security/openssh-portable/pkg-message b/security/openssh-portable/pkg-message
index 9a781cb053ea..0349c92792f1 100644
--- a/security/openssh-portable/pkg-message
+++ b/security/openssh-portable/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable this port, add openssh_enable="YES" in your rc.conf. To
 prevent conflict with openssh in the base system add sshd_enable="NO"
 in your rc.conf. Also you can configure openssh at another TCP port (via
@@ -14,3 +17,6 @@ Users are encouraged to create single-purpose users with ssh keys, disable
 Password authentication by setting 'PasswordAuthentication no' and
 'ChallengeResponseAuthentication no', and to define very narrow sudo
 privileges instead of using root for automated tasks.
+EOM
+}
+]
diff --git a/security/openssl-unsafe/files/pkg-message.in b/security/openssl-unsafe/files/pkg-message.in
index faa27e6e382d..c19b0d5785ef 100644
--- a/security/openssl-unsafe/files/pkg-message.in
+++ b/security/openssl-unsafe/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 /!\ ================================ /!\ ============================== /!\
 /!\                                                                     /!\
 /!\ This openssl version is for security testing/scanning purposes only /!\
@@ -5,4 +8,6 @@
 /!\                   DO NOT USE FOR PRODUCTION PURPOSES                /!\
 /!\                                                                     /!\
 /!\ ================================ /!\ ============================== /!\
-
+EOM
+}
+]
diff --git a/security/openssl/files/pkg-message.in b/security/openssl/files/pkg-message.in
index 967964da852a..cb9b9987ed6c 100644
--- a/security/openssl/files/pkg-message.in
+++ b/security/openssl/files/pkg-message.in
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Edit %%PREFIX%%/openssl/openssl.cnf to fit your needs.
+EOM
+}
+]
diff --git a/security/openssl111/files/pkg-message.in b/security/openssl111/files/pkg-message.in
index f2dbef6b33f9..0cae95bfd9f1 100644
--- a/security/openssl111/files/pkg-message.in
+++ b/security/openssl111/files/pkg-message.in
@@ -1,4 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 Copy %%PREFIX%%/openssl/openssl.cnf.sample to %%PREFIX%%/openssl/openssl.cnf
 and edit it to fit your needs.
-
+EOM
+}
+]
diff --git a/security/openssl_tpm_engine/files/pkg-message.in b/security/openssl_tpm_engine/files/pkg-message.in
index c2aa43e7a6dd..991b707e091f 100644
--- a/security/openssl_tpm_engine/files/pkg-message.in
+++ b/security/openssl_tpm_engine/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 A sample configuration which has to be added into /etc/ssl/openssl.cnf
 to enable "tpm" engine in OpenSSL can be found at
 %%EXAMPLESDIR%%/openssl.cnf.sample.
@@ -9,3 +12,6 @@ you might get the following error messages:
  | 65738:error:260B806D:engine routines:ENGINE_TABLE_REGISTER:init failed:/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/engine/eng_table.c:161:
  | 65738:error:260BC065:engine routines:INT_ENGINE_CONFIGURE:engine configuration error:/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/engine/eng_cnf.c:204:section=tpm_section, name=default_algorithms, value=ALL
  | 65738:error:0E07606D:configuration file routines:MODULE_RUN:module initialization error:/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/conf/conf_mod.c:235:module=engines, value=engine_section, retcode=-1
+EOM
+}
+]
diff --git a/security/openvas8/files/pkg-message.in b/security/openvas8/files/pkg-message.in
index 9014c6839b3e..54454209b0a9 100644
--- a/security/openvas8/files/pkg-message.in
+++ b/security/openvas8/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 OpenVAS 8 ports were installed
 
 1) Redis  is a dependency of OpenVAS. Please, configure redis-server for 
@@ -53,5 +54,6 @@ OpenVAS 8 ports were installed
    It will install 1G of data
 
 9) Enjoy it
-
-###############################################################################
+EOM
+}
+]
diff --git a/security/openvas9/files/pkg-message.in b/security/openvas9/files/pkg-message.in
index 71130aa8195d..e46934f699a7 100644
--- a/security/openvas9/files/pkg-message.in
+++ b/security/openvas9/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 OpenVAS 9 ports were installed
 
 1) Redis  is a dependency of OpenVAS. Please, configure redis-server for 
@@ -51,5 +52,6 @@ OpenVAS 9 ports were installed
    It will install 1G of data
 
 9) Enjoy it
-
-###############################################################################
+EOM
+}
+]
diff --git a/security/openvpn-devel/files/pkg-message.in b/security/openvpn-devel/files/pkg-message.in
index 8c1eaa14b3b2..30a09c41c615 100644
--- a/security/openvpn-devel/files/pkg-message.in
+++ b/security/openvpn-devel/files/pkg-message.in
@@ -1,11 +1,15 @@
-### ------------------------------------------------------------------------
-###  Edit /etc/rc.conf[.local] to start OpenVPN automatically at system
-###  startup. See %%PREFIX%%/etc/rc.d/openvpn for details.
-### ------------------------------------------------------------------------
-###  Connect to VPN server as a client with this command to include
-###  the client.up/down scripts in the initialization:
-###  openvpn-client <spec>.ovpn
-### ------------------------------------------------------------------------
-###  For compatibility notes when interoperating with older OpenVPN
-###  versions, please, see <http://openvpn.net/relnotes.html>
-### ------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
+  Edit /etc/rc.conf[.local] to start OpenVPN automatically at system
+  startup. See %%PREFIX%%/etc/rc.d/openvpn for details.
+
+  Connect to VPN server as a client with this command to include
+  the client.up/down scripts in the initialization:
+  openvpn-client <spec>.ovpn
+
+  For compatibility notes when interoperating with older OpenVPN
+  versions, please, see <http://openvpn.net/relnotes.html>
+EOM
+}
+]
diff --git a/security/openvpn/files/pkg-message.in b/security/openvpn/files/pkg-message.in
index ff37ba1b92fb..29d37b360f3c 100644
--- a/security/openvpn/files/pkg-message.in
+++ b/security/openvpn/files/pkg-message.in
@@ -1,13 +1,17 @@
-### ------------------------------------------------------------------------
-###  Edit /etc/rc.conf[.local] to start OpenVPN automatically at system
-###  startup. See %%PREFIX%%/etc/rc.d/openvpn for details.
-### ------------------------------------------------------------------------
-###  Connect to VPN server as a client with this command to include
-###  the client.up/down scripts in the initialization:
-###  openvpn-client <spec>.ovpn
-### ------------------------------------------------------------------------
-###  For compatibility notes when interoperating with older OpenVPN
-###  versions, please see <http://openvpn.net/relnotes.html>
-### ------------------------------------------------------------------------
-###  Note that OpenVPN does not officially support LibreSSL.
-### ------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
+  Edit /etc/rc.conf[.local] to start OpenVPN automatically at system
+  startup. See %%PREFIX%%/etc/rc.d/openvpn for details.
+
+  Connect to VPN server as a client with this command to include
+  the client.up/down scripts in the initialization:
+  openvpn-client <spec>.ovpn
+
+  For compatibility notes when interoperating with older OpenVPN
+  versions, please see <http://openvpn.net/relnotes.html>
+
+  Note that OpenVPN does not officially support LibreSSL.
+EOM
+}
+]
diff --git a/security/ophcrack/pkg-message b/security/ophcrack/pkg-message
index 6cb950d7c180..fb21a746510b 100644
--- a/security/ophcrack/pkg-message
+++ b/security/ophcrack/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
    Free rainbow tables (for Windows XP and Vista/7) can be downloaded from
    http://ophcrack.sourceforge.net/tables.php; professional versions are
    available for purchase.
+EOM
+}
+]
diff --git a/security/orthrus/pkg-message b/security/orthrus/pkg-message
index 9b2f477a63e8..4ce495b1f18f 100644
--- a/security/orthrus/pkg-message
+++ b/security/orthrus/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Manually edit pam.d/* files as needed and add in the required auth line and
 remove any undesired fallback lines. Also ensure you arent already using opie!"
 
@@ -7,3 +10,6 @@ auth            sufficient      pam_orthrus.so
 
 Please remember to delete any such entry BEFORE deinstalling this port or you
 could lock yourself out !!
+EOM
+}
+]
diff --git a/security/osiris/pkg-message b/security/osiris/pkg-message
index 16059221e537..c3df57c6f72b 100644
--- a/security/osiris/pkg-message
+++ b/security/osiris/pkg-message
@@ -1,6 +1,6 @@
-
-###############################################################
-
+[
+{ type: install
+  message: <<EOM
 To start the osiris daemons at system boot, add:
 
 osirisd_enable="YES"
@@ -10,6 +10,6 @@ and/or
 osirismd_enable="YES"
 
 to /etc/rc.conf.
-
-###############################################################
-
+EOM
+}
+]
diff --git a/security/p5-openxpki/files/pkg-message.in b/security/p5-openxpki/files/pkg-message.in
index 8d72122a75b4..c58d1fc83bb5 100644
--- a/security/p5-openxpki/files/pkg-message.in
+++ b/security/p5-openxpki/files/pkg-message.in
@@ -1,4 +1,6 @@
-=================================================================
+[
+{ type: install
+  message: <<EOM
 - Universal server building block (OpenXPKI) for arbitrary PKI: installed.
 - SCEP prerequisite binary and i18n tools for UI: installed.
 - Enable utf8 locale (e.g. en_US.utf8) for the translation staff to operate
@@ -48,8 +50,13 @@ install -m 660 -o www -g www /dev/null /var/log/openxpki/soap.log
     /var/openxpki/session: session files.
     /var/log/openxpki: server log files.
     /var/tmp: temporary directory.
-==================================================================
+EOM
+}
+{ type: upgrade
+  message: <<EOM
 If you update existing installation, please check if extra handwork 
 is needed in your case:
 http://openxpki.readthedocs.io/en/latest/upgrading.html
-==================================================================
+EOM
+}
+]
diff --git a/security/pam-mysql/files/pkg-message.in b/security/pam-mysql/files/pkg-message.in
index c43019f1d6fb..c908f2d7c8b5 100644
--- a/security/pam-mysql/files/pkg-message.in
+++ b/security/pam-mysql/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Read files in %%DOCSDIR%% for info on how to set up.
 
 The PAM subsystem only looks for modules in /usr/lib: to use any pam module
@@ -9,5 +10,6 @@ from the ports, either specify the full pathname in your pam.d config file
 
 Example:
 ln -sf %%PREFIX%%/lib/pam_mysql.so /usr/lib/pam_mysql.so
-
-*****************************************************************************
+EOM
+}
+]
diff --git a/security/pam-pgsql/files/pkg-message.in b/security/pam-pgsql/files/pkg-message.in
index f6a92946faa8..2e1a549da23a 100644
--- a/security/pam-pgsql/files/pkg-message.in
+++ b/security/pam-pgsql/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Follow the instructions in the
 
  %%PREFIX%%/share/doc/pam-pgsql/README
@@ -6,3 +8,6 @@ Follow the instructions in the
 to use this module. Note, that unlike most other ports, this port
 installs a file into /usr/lib directly (/usr/lib/pam_pgsql.so),
 because PAM requires that.
+EOM
+}
+]
diff --git a/security/pam_fprint/files/pkg-message.in b/security/pam_fprint/files/pkg-message.in
index 65b776e6a820..02f9724698bd 100644
--- a/security/pam_fprint/files/pkg-message.in
+++ b/security/pam_fprint/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The security/fprint_demo port contains the graphical `fprint_demo'
 application that allows you to manage your finger prints in a comfortable
 way.
@@ -11,3 +14,6 @@ auth            sufficient      %%PREFIX%%/lib/pam_fprint.so
 
 /etc/pam.d/system is used for system-wide defaults,
 /etc/pam.d/{gdm, kde} are used by the GDM/KDM login managers.
+EOM
+}
+]
diff --git a/security/pam_jail/files/pkg-message.in b/security/pam_jail/files/pkg-message.in
index ac09a82e5655..2b11d7702c45 100644
--- a/security/pam_jail/files/pkg-message.in
+++ b/security/pam_jail/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You may want to add something like this to your /etc/pam.d/login
 or /etc/pam.d/sshd ( when you've configured ssh with PAM )
 file to use this module:
 
 session         required       %%PREFIX%%/lib/pam_jail.so
-
+EOM
+}
+]
diff --git a/security/pam_ldap/pkg-message b/security/pam_ldap/pkg-message
index 9d18006dbfec..8a3e8885e17b 100644
--- a/security/pam_ldap/pkg-message
+++ b/security/pam_ldap/pkg-message
@@ -1,8 +1,12 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 Copy %%PREFIX%%/etc/ldap.conf.dist to %%PREFIX%%/etc/ldap.conf, then edit
 %%PREFIX%%/etc/ldap.conf in order to use this module.  Add a line similar to
 the following to /etc/pam.conf on 4.X, or create an /etc/pam.d/ldap
 on 5.X and higher with a line similar to the following:
 
 login	auth	sufficient	%%PREFIX%%/lib/pam_ldap.so
-================================================================================
+EOM
+}
+]
diff --git a/security/pam_mkhomedir/files/pkg-message.in b/security/pam_mkhomedir/files/pkg-message.in
index 11743e4057a0..c462c2eda084 100644
--- a/security/pam_mkhomedir/files/pkg-message.in
+++ b/security/pam_mkhomedir/files/pkg-message.in
@@ -1,9 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You may want to add something like this to your /etc/pam.d/login
 or /etc/pam.d/sshd ( when you've configured ssh with PAM )
 file to use this module:
 
 session         required       %%PREFIX%%/lib/pam_mkhomedir.so
-
-
-
+EOM
+}
+]
diff --git a/security/pam_yubico/files/pkg-message.in b/security/pam_yubico/files/pkg-message.in
index 7dac75712e5f..6434cd717e42 100644
--- a/security/pam_yubico/files/pkg-message.in
+++ b/security/pam_yubico/files/pkg-message.in
@@ -1,6 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 For setup instructions on authenticating with your YubiKey, see:
 %%DOCSDIR%%/README
 or
 https://github.com/Yubico/yubico-pam/blob/master/README
-
+EOM
+}
+]
diff --git a/security/passivedns/files/pkg-message.in b/security/passivedns/files/pkg-message.in
index c3417abca644..d67fec10cc31 100644
--- a/security/passivedns/files/pkg-message.in
+++ b/security/passivedns/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 A startup script 'passivedns' was installed in %%PREFIX%%/etc/rc.d/.
 
 Type "passivedns -h" on the commandline for usage instructions.
+EOM
+}
+]
diff --git a/security/peda/files/pkg-message.in b/security/peda/files/pkg-message.in
index f42fc40bfda7..61266c6ab8c4 100644
--- a/security/peda/files/pkg-message.in
+++ b/security/peda/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Now that PEDA is installed it can be used with gdb(1).
 
 Run the following command in the gdb prompt to load the plugin:
@@ -14,3 +17,6 @@ echo "source %%LIBEXECDIR%%/%%UTILITY_NAME%%" >> ~/.gdbinit
 ```
 
 Keep in mind that PEDA requires at least GDB 7.0 to work.
+EOM
+}
+]
diff --git a/security/pks/files/pkg-message.in b/security/pks/files/pkg-message.in
index ed4799c2179f..feb4dbff8c2d 100644
--- a/security/pks/files/pkg-message.in
+++ b/security/pks/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable this service:
 
  pksd_enable (bool):           Set to NO by default.
@@ -16,7 +19,7 @@ Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable this ser
  pksd_queue_delay (int):       Periodically process incoming mail.
                                Set to 60 seconds by default.
 
-        #############################################
+
 
           To enable adding keys via the web interface
           please create a configuration file at:
@@ -33,6 +36,6 @@ Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable this ser
           do that refer to:
 
             man 8 pksclient
-
-        #############################################
-
+EOM
+}
+]
diff --git a/security/pktsuckers/pkg-message b/security/pktsuckers/pkg-message
index 162386c5df71..2779da08d75d 100644
--- a/security/pktsuckers/pkg-message
+++ b/security/pktsuckers/pkg-message
@@ -1,3 +1,7 @@
-
+[
+{ type: install
+  message: <<EOM
 You need to edit your inetd.conf to enable the suckers
-
+EOM
+}
+]
diff --git a/security/portsentry/pkg-message b/security/portsentry/pkg-message
index be9ea7931718..72917af430e7 100644
--- a/security/portsentry/pkg-message
+++ b/security/portsentry/pkg-message
@@ -1,12 +1,14 @@
-
-
+[
+{ type: install
+  message: <<EOM
        Edit ${PREFIX}/etc/portsentry.conf and change
        your settings if you haven't already. (route, etc)
 
-       ***************************************************
-       * IGNORE stealth mode.  It is for Linux only.     *
-       * The author hopes to have a platform independent *
-       * version at some time.  So don't even bother     *
-       * trying it now.                                  *
-       ***************************************************
 
+       IGNORE stealth mode.  It is for Linux only.
+       The author hopes to have a platform independent
+       version at some time.  So don't even bother
+       trying it now.
+EOM
+}
+]
diff --git a/security/ppars/pkg-message b/security/ppars/pkg-message
index 327b6a8f28b3..dedbce170eb8 100644
--- a/security/ppars/pkg-message
+++ b/security/ppars/pkg-message
@@ -1,11 +1,10 @@
-
-***************************************************************************
-
-Installer instructions.
-
+[
+{ type: install
+  message: <<EOM
 First issue rehash command and then run  abuse.Reporting.system.pl
 it contains an overview of how the system works and how to setup the
 ipfilter log so when it's rotated all the abuse scripts will be auto
 launched.
-
-***************************************************************************
+EOM
+}
+]
diff --git a/security/pulledpork/files/pkg-message.in b/security/pulledpork/files/pkg-message.in
index f8796afa5036..92ba0a01d6d6 100644
--- a/security/pulledpork/files/pkg-message.in
+++ b/security/pulledpork/files/pkg-message.in
@@ -1,5 +1,6 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 In order to use pulled pork, adjust the config files located in
 %%ETCDIR%%
 
@@ -16,5 +17,6 @@ for your version of Snort.
 The new versioning mechanism will require a four digit version in the
 file name. To get the new download naming schema visit snort.org,
 and look at 'My Account' -> 'Subscriptions and Oinkcodes'
-
-=====================================================================
+EOM
+}
+]
diff --git a/security/pwned-check/files/pkg-message.in b/security/pwned-check/files/pkg-message.in
index 14baaa982e9f..e12280d612c2 100644
--- a/security/pwned-check/files/pkg-message.in
+++ b/security/pwned-check/files/pkg-message.in
@@ -1,4 +1,6 @@
--------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 This port needs a password hash database that is to be downloaded with
 the following command:
 
@@ -10,4 +12,6 @@ This directory can be changed in %%PREFIX%%/etc/pwned-check.conf.
 The installation procedure will fetch 6 GB of compressed data and will
 temporarily need 18 GB of free space in that directory and 13 GB when
 the installation is complete.
--------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/security/py-PF/files/pkg-message.in b/security/py-PF/files/pkg-message.in
index 12f4734d6c74..c9613725dd93 100644
--- a/security/py-PF/files/pkg-message.in
+++ b/security/py-PF/files/pkg-message.in
@@ -1,8 +1,12 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 py-pF is installed.
 
 For a quick start:
     - import pf for using this module
     - read http://www.kernel-panic.it/programming/py-pf/
     - you need to be root for using this module
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/security/py-acme-tiny/files/pkg-message.in b/security/py-acme-tiny/files/pkg-message.in
index 328b19380520..354fb590dd8f 100644
--- a/security/py-acme-tiny/files/pkg-message.in
+++ b/security/py-acme-tiny/files/pkg-message.in
@@ -1,6 +1,8 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Have a look at the README.md file in the documentation directory:
 %%DOCSDIR%%
-
-===========================================================================
+EOM
+}
+]
diff --git a/security/py-certbot/pkg-message b/security/py-certbot/pkg-message
index 00a87b19d6bc..f064e8dc54cb 100644
--- a/security/py-certbot/pkg-message
+++ b/security/py-certbot/pkg-message
@@ -1,5 +1,6 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 This port installs the "standalone" client only, which does not use and
 is not the certbot-auto bootstrap/wrapper script.
 
@@ -23,5 +24,6 @@ will be made available in the following ports:
 
  * Apache plugin: security/py-certbot-apache
  * Nginx plugin: security/py-certbot-nginx
-
-===========================================================================
+EOM
+}
+]
diff --git a/security/py-fail2ban/pkg-message b/security/py-fail2ban/pkg-message
index a7007ff790c4..0513a2e53aa9 100644
--- a/security/py-fail2ban/pkg-message
+++ b/security/py-fail2ban/pkg-message
@@ -1,6 +1,6 @@
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+[
+{ type: install
+  message: <<EOM
 Please do not edit the fail2ban.conf, jail.conf, or any other 
 files in the distributen as they will be overwritten upon each 
 upgrade of the port. Instead, create new files named *.local e.g. 
@@ -16,5 +16,6 @@ Users of pf: please read the notes in action.d/pf.conf and the
 discussion at https://github.com/fail2ban/fail2ban/pull/1925
 Please note that fail2ban will put curly braces '{}' around the
 ports in the action so you shouldn't do it yourself.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+EOM
+}
+]
diff --git a/security/py-first-server/pkg-message b/security/py-first-server/pkg-message
index b25e9a5a55d4..3c0ebefa87b8 100644
--- a/security/py-first-server/pkg-message
+++ b/security/py-first-server/pkg-message
@@ -1,7 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 As of version 0.0.2, FIRST no longer requires these packages:
 
 * distorm3
 * mongoengine
 
 You may want to remove them.
+EOM
+}
+]
diff --git a/security/py-gnupg/pkg-message b/security/py-gnupg/pkg-message
index 7749e9d57b95..6e5a46a895f3 100644
--- a/security/py-gnupg/pkg-message
+++ b/security/py-gnupg/pkg-message
@@ -1,6 +1,9 @@
-*****************************************************************************
+[
+{ type: install
+  message: <<EOM
 To import this module, use
 
 >>> import pretty_bad_protocol
-
-*****************************************************************************
+EOM
+}
+]
diff --git a/security/py-keystone/files/pkg-message.in b/security/py-keystone/files/pkg-message.in
index 2e8bf99e7284..36d16daf0137 100644
--- a/security/py-keystone/files/pkg-message.in
+++ b/security/py-keystone/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 ==================
  1. Prerequisites
 ==================
@@ -122,5 +123,6 @@ $ openstack --os-auth-url http://HOSTNAME:35357/v3 \
 $ openstack --os-auth-url http://HOSTNAME:5000/v3 \
   --os-project-domain-name Default --os-user-domain-name Default \
   --os-project-name demo --os-username demo token issue
-
-================================================================================
+EOM
+}
+]
diff --git a/security/py-muacrypt/pkg-message b/security/py-muacrypt/pkg-message
index 515b9e7c9be1..26f149a6967d 100644
--- a/security/py-muacrypt/pkg-message
+++ b/security/py-muacrypt/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Should you installed the py36 flavor of this package and are presented to
 the following error:
 
@@ -15,3 +18,6 @@ running muacrypt again:
   # muacrypt
 
 Read https://click.palletsprojects.com/en/7.x/python3/ for more details.
+EOM
+}
+]
diff --git a/security/py-obfsproxy-tor/files/pkg-message.in b/security/py-obfsproxy-tor/files/pkg-message.in
index 171730a6ca30..7750b422edd4 100644
--- a/security/py-obfsproxy-tor/files/pkg-message.in
+++ b/security/py-obfsproxy-tor/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 If you are using obfsproxy with tor, here are some instructions:
 
 As a client, add the following to %%PREFIX%%/etc/tor/torrc:
@@ -19,4 +21,6 @@ As a bridge, add the following to %%PREFIX%%/etc/tor/torrc:
 
 (Then, get the respective port numbers for the two proxies from your tor log
 file and make sure you open them in your firewall.)
-================================================================================
+EOM
+}
+]
diff --git a/security/py-rekall-core/pkg-message b/security/py-rekall-core/pkg-message
index 85a58717ddd7..bb5888a2cb58 100644
--- a/security/py-rekall-core/pkg-message
+++ b/security/py-rekall-core/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 If you want to use online profile repositories using https, make sure that root
 certificates from certificate authorities are installed (via ca_root_nss for
 instance).
+EOM
+}
+]
diff --git a/security/py-zkg/pkg-message b/security/py-zkg/pkg-message
index f778edb38f49..05f451a6be58 100644
--- a/security/py-zkg/pkg-message
+++ b/security/py-zkg/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Run the following to configure zkg:
 
 zkg autoconfig
@@ -9,5 +10,6 @@ NOTE:
 The previous command "bro-pkg" can also be used intermittently for a
 while but its usage is deprecated and may be removed in a future
 release.
-
-======================================================================
+EOM
+}
+]
diff --git a/security/quantis-kmod/pkg-message b/security/quantis-kmod/pkg-message
index fe487ef1871d..932fb0f77b1b 100644
--- a/security/quantis-kmod/pkg-message
+++ b/security/quantis-kmod/pkg-message
@@ -1,6 +1,8 @@
-*******************************************************
-
+[
+{ type: install
+  message: <<EOM
 Add quantis_load="YES" to /boot/loader.conf to load the
 kernel module automatically.
-
-*******************************************************
+EOM
+}
+]
diff --git a/security/razorback-dispatcher/files/pkg-message.in b/security/razorback-dispatcher/files/pkg-message.in
index bc1ae3ef74fd..c6bf4c996793 100644
--- a/security/razorback-dispatcher/files/pkg-message.in
+++ b/security/razorback-dispatcher/files/pkg-message.in
@@ -1,8 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 This port requires additional configuration before it can be used.
 
 The MySQL database schema must be loaded:
-==================================================================
+
 cd %%PREFIX%%/share/razorback/
 mysql
 create database razorback;
@@ -16,7 +18,7 @@ edit the activemq.xml file %%ACTIVEMQ_LOCATION%%
 %%ACTIVEMQ_CONFIG%%
 
 ActiveMQ's configuration must be updated:
-==================================================================
+
 In the transportConnectors property, the entry needs to look like
 the following:
 
@@ -31,7 +33,10 @@ it is advised that you use 127.0.0.1 instead of 0.0.0.0.
 
 The razorback dispatcher's configuration must be created and
 customized:
-==================================================================
+
 cp rzb.conf.sample rzb.conf
 cp magic.sample magic
 cp dispatcher.conf.sample dispatcher.conf
+EOM
+}
+]
diff --git a/security/razorback-yaraNugget/pkg-message b/security/razorback-yaraNugget/pkg-message
index 498ac9913048..c608927f42ba 100644
--- a/security/razorback-yaraNugget/pkg-message
+++ b/security/razorback-yaraNugget/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 After this port has been installed, you will need to copy and edit the
 sample configuration (rzb_yara.conf.sample) to rzb_yara.conf.
 
 Additionally, you will need to provide rules for yara.  The rules should be
 placed in the directory specified in the rzb_yara.conf file.  The rules may
 be placed in subdirectories or symlinked.
+EOM
+}
+]
diff --git a/security/rkhunter/pkg-message b/security/rkhunter/pkg-message
index e07f93a8dbcc..ee7fe15bd879 100644
--- a/security/rkhunter/pkg-message
+++ b/security/rkhunter/pkg-message
@@ -1,6 +1,6 @@
-
-******************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You should keep your rkhunter database up-to-date.
 This can be done automatically by putting this line to periodic.conf(5) files:
 
@@ -12,5 +12,6 @@ putting this line to periodic.conf(5) files:
 
 daily_rkhunter_check_enable="YES"
 daily_rkhunter_check_flags="--checkall --nocolors --skip-keypress"
-
-******************************************************************************
+EOM
+}
+]
diff --git a/security/ruby-bitwarden/files/pkg-message.in b/security/ruby-bitwarden/files/pkg-message.in
index c477066b8328..7c8c255da2c5 100644
--- a/security/ruby-bitwarden/files/pkg-message.in
+++ b/security/ruby-bitwarden/files/pkg-message.in
@@ -1,9 +1,10 @@
-*************************************************************************
-
+[
+{ type: install
+  message: <<EOM
       After installation of this port you have to install the necessary
       rubygem dependencies.
 
       Follow the instructions in %%WWWDIR%%/README.md
-
-*************************************************************************
-
+EOM
+}
+]
diff --git a/security/s2n/files/pkg-message.in b/security/s2n/files/pkg-message.in
index a9b05fb84945..d6d0872edfc8 100644
--- a/security/s2n/files/pkg-message.in
+++ b/security/s2n/files/pkg-message.in
@@ -1,7 +1,9 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 If s2n fails due mlock(2) syscall try to increase vm.max_wired.
 Example:
  - sysctl vm.max_wired=1572864
-
-======================================================================
+EOM
+}
+]
diff --git a/security/samhain/pkg-message b/security/samhain/pkg-message
index 75a2751de0f0..a6ed9de6219d 100644
--- a/security/samhain/pkg-message
+++ b/security/samhain/pkg-message
@@ -1,6 +1,6 @@
-
-###############################################################
-
+[
+{ type: install
+  message: <<EOM
 To start the samhain daemon at system boot, add:
 
 samhain_enable="YES"
@@ -10,5 +10,6 @@ and/or
 yule_enable="YES"
 
 to /etc/rc.conf.
-
-###############################################################
+EOM
+}
+]
diff --git a/security/sancp/files/pkg-message.in b/security/sancp/files/pkg-message.in
index eea9f74280bf..14a3b13137d5 100644
--- a/security/sancp/files/pkg-message.in
+++ b/security/sancp/files/pkg-message.in
@@ -1,7 +1,6 @@
-	***********************************
-	* !!!!!!!!!!! WARNING !!!!!!!!!!! *
-	***********************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script was installed in %%PREFIX%%/etc/rc.d/.  Enable the script
 in /etc/rc.conf using the usual rc.subr syntax.  See rc.conf(5) or go to
 http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/configtuning-rcng.html
@@ -16,3 +15,6 @@ the one that came with sguil in %%PREFIX%%/etc/sguil-sensor directory.
 
 If you're running sguil, you probably want to use at least the following flags:
 sancp_flags="-D -P -R -u sancp -g sancp -d /var/log/sancp -c %%PREFIX%%/etc/sguil-sensor/sancp.conf"
+EOM
+}
+]
diff --git a/security/scamp/files/pkg-message.in b/security/scamp/files/pkg-message.in
index 476f030341f0..2b8193e86cc1 100644
--- a/security/scamp/files/pkg-message.in
+++ b/security/scamp/files/pkg-message.in
@@ -1,28 +1,28 @@
+[
+{ type: install
+  message: <<EOM
+ Please read the README file before running "scamp.sh"
+ If updating from a version earlier than 5.2j, it is suggested
+ that you first run: "scamp.sh -D" to delete all old configurations.
+ Then, running "scamp.sh" will cause the script to create a new
+ configuration file.
 
-************************************************************************
-*                            ** WARNING **                             *
-*                                                                      *
-* Please read the README file before running "scamp.sh"                *
-* If updating from a version earlier than 5.2j, it is suggested        *
-* that you first run: "scamp.sh -D" to delete all old configurations.  *
-* Then, running "scamp.sh" will cause the script to create a new       *
-* configuration file.                                                  *
-*                                                                      *
-* Check the "README" or "man scamp" for further information.           *
-*                                                                      *
-* The new versions of "scamp" can download definition files not        *
-* previously available in the older versions.                          *
-*                                                                      *
-* You will also have to recreate any other additional configuration    *
-* files you might have used previously.                                *
-*                                                                      *
-* I apologize for this inconvenience; however, it is the only feasible *
-* way to insure that you have the most up-to-date configuration.       *
-*                                                                      *
-* You will need to manually create any additional configuration files. *
-* Read the README or type "man scamp" for further assistance.          *
-*                                                                      *
-* To completely remove "scamp" from your system, delete the config     *
-* directory -- usually "/usr/local/etc/scamp"                          *
-*                                                                      *
-************************************************************************
+ Check the "README" or "man scamp" for further information.
+
+ The new versions of "scamp" can download definition files not
+ previously available in the older versions.
+
+ You will also have to recreate any other additional configuration
+ files you might have used previously.
+
+ I apologize for this inconvenience; however, it is the only feasible
+ way to insure that you have the most up-to-date configuration.
+
+ You will need to manually create any additional configuration files.
+ Read the README or type "man scamp" for further assistance.
+
+ To completely remove "scamp" from your system, delete the config
+ directory -- usually "/usr/local/etc/scamp"
+EOM
+}
+]
diff --git a/security/secure_delete/files/pkg-message.in b/security/secure_delete/files/pkg-message.in
index 670278343ea3..8f5e46635ea7 100644
--- a/security/secure_delete/files/pkg-message.in
+++ b/security/secure_delete/files/pkg-message.in
@@ -1,3 +1,7 @@
-#############################################################################
+[
+{ type: install
+  message: <<EOM
   Installed additional documentation in: %%DOCSDIR%%
-#############################################################################
+EOM
+}
+]
diff --git a/security/shishi/files/pkg-message.in b/security/shishi/files/pkg-message.in
index 5d95ed023563..3c611c84ec43 100644
--- a/security/shishi/files/pkg-message.in
+++ b/security/shishi/files/pkg-message.in
@@ -1,6 +1,10 @@
-=================================================================
+[
+{ type: install
+  message: <<EOM
 NOTE: To finish installing this port, you need to execute the
 following command:
 
 # %%PREFIX%%/bin/shisa -a > %%PREFIX%%/etc/shishi/shishi.keys
-=================================================================
+EOM
+}
+]
diff --git a/security/sks/files/pkg-message.in b/security/sks/files/pkg-message.in
index a63f80d53966..d6c5fffa4a3a 100644
--- a/security/sks/files/pkg-message.in
+++ b/security/sks/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 => When updating from a previous sks version be aware that the PGP key
 => database files are not compatible. You should run db_recover-5.
 => See %%DOCSDIR%%/UPGRADING for details.
@@ -16,3 +18,6 @@ When installing for the first time, you will need to obtain a PGP
 key database dump from somewhere and build database files from this.
 See %%DOCSDIR%%/README.md for details.
 More information is available online at http://www.keysigning.org/sks/
+EOM
+}
+]
diff --git a/security/snort/files/pkg-message.in b/security/snort/files/pkg-message.in
index 152b7d79a356..dddb3e522265 100644
--- a/security/snort/files/pkg-message.in
+++ b/security/snort/files/pkg-message.in
@@ -1,4 +1,6 @@
-=========================================================================
+[
+{ type: install
+  message: <<EOM
 Snort uses rcNG startup script and must be enabled via /etc/rc.conf
 Please see %%PREFIX%%/etc/rc.d/snort
 for list of available variables and their description.
@@ -10,4 +12,6 @@ Stream5 target-based reassembly.  It is recommended to disable LRO, if
 your card supports it.
 
 This can be done by appending '-lro' to your ifconfig_ line in rc.conf.
-=========================================================================
+EOM
+}
+]
diff --git a/security/snortsam/files/pkg-message.in b/security/snortsam/files/pkg-message.in
index 339b10621b44..fca0b844340d 100644
--- a/security/snortsam/files/pkg-message.in
+++ b/security/snortsam/files/pkg-message.in
@@ -1,5 +1,7 @@
-================================================================
-NOTE:   SNORT have to be build with OPTION SNORTSAM.
+[
+{ type: install
+  message: <<EOM
+        SNORT have to be build with OPTION SNORTSAM.
 
 	To enable snortsam as output plugin for snort a config
 	line like the following should be present in snort.conf
@@ -13,6 +15,6 @@ NOTE:   SNORT have to be build with OPTION SNORTSAM.
         files in %%DOCSDIR%%
 
         Additional consolidate http://snortsam.net
-
-==============================================================
-
+EOM
+}
+]
diff --git a/security/softether-devel/files/pkg-message.in b/security/softether-devel/files/pkg-message.in
index ff57ac2ef91f..2daccabd9f27 100644
--- a/security/softether-devel/files/pkg-message.in
+++ b/security/softether-devel/files/pkg-message.in
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To run softether vpn client from startup, run
 sysrc softether_client_enable=yes
 
@@ -19,5 +20,6 @@ When removing SoftEther VPN without the desire to reinstall, please
 ensure to remove the following dirctories as well:
 - %%SE_DBDIR%%
 - %%SE_LOGDIR%%
-
-**************************************************************************
+EOM
+}
+]
diff --git a/security/softether/files/pkg-message.in b/security/softether/files/pkg-message.in
index ff57ac2ef91f..2daccabd9f27 100644
--- a/security/softether/files/pkg-message.in
+++ b/security/softether/files/pkg-message.in
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To run softether vpn client from startup, run
 sysrc softether_client_enable=yes
 
@@ -19,5 +20,6 @@ When removing SoftEther VPN without the desire to reinstall, please
 ensure to remove the following dirctories as well:
 - %%SE_DBDIR%%
 - %%SE_LOGDIR%%
-
-**************************************************************************
+EOM
+}
+]
diff --git a/security/softether5/files/pkg-message.in b/security/softether5/files/pkg-message.in
index ff57ac2ef91f..2daccabd9f27 100644
--- a/security/softether5/files/pkg-message.in
+++ b/security/softether5/files/pkg-message.in
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To run softether vpn client from startup, run
 sysrc softether_client_enable=yes
 
@@ -19,5 +20,6 @@ When removing SoftEther VPN without the desire to reinstall, please
 ensure to remove the following dirctories as well:
 - %%SE_DBDIR%%
 - %%SE_LOGDIR%%
-
-**************************************************************************
+EOM
+}
+]
diff --git a/security/softhsm2/files/pkg-message.in b/security/softhsm2/files/pkg-message.in
index 858608871a17..2d1e3a031e93 100644
--- a/security/softhsm2/files/pkg-message.in
+++ b/security/softhsm2/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: upgrade, maximum_version: 2.3.0_1
+  message: <<EOM
 As of version 2.3.0_1, the storage directory for softhsm has changed from
 /usr/local/var/lib/softhsm to /var/lib/softhsm
+EOM
+}
+]
diff --git a/security/sshblock/files/pkg-message.in b/security/sshblock/files/pkg-message.in
index ad13d219486b..ab5acfaa6ccb 100644
--- a/security/sshblock/files/pkg-message.in
+++ b/security/sshblock/files/pkg-message.in
@@ -1,5 +1,6 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To enable and use the sshblock daemon, use the following in /etc/rc.conf or
 /etc/rc.conf.local:
 
@@ -12,5 +13,6 @@ sshblock_flags="<flags>"
 See %%PREFIX%%/sbin/sshblock -h for possible command line options.
 
 Use %%PREFIX%%/etc/rc.d/sshblock to stop and start it.
-
-===========================================================================
+EOM
+}
+]
diff --git a/security/sshguard/files/pkg-message.in b/security/sshguard/files/pkg-message.in
index 6ec069d3fcca..2a3ccb896692 100644
--- a/security/sshguard/files/pkg-message.in
+++ b/security/sshguard/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable SSHGuard at startup, add the following line to your 'rc.conf':
 sshguard_enable="YES"
 
@@ -12,3 +15,6 @@ better reflect the documentation:
 sshguard_safety_thresh -> sshguard_danger_thresh
 sshguard_pardon_min_interval -> sshguard_release_interval
 sshguard_prescribe_interval -> sshguard_reset_interval
+EOM
+}
+]
diff --git a/security/ssl-admin/files/pkg-message.in b/security/ssl-admin/files/pkg-message.in
index 7791df000f76..4bf76827d569 100644
--- a/security/ssl-admin/files/pkg-message.in
+++ b/security/ssl-admin/files/pkg-message.in
@@ -1,6 +1,10 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+[
+{ type: install
+  message: <<EOM
 Please edit the configuration file %%PREFIX%%/etc/ssl-admin/ssl-admin.conf
 before running ssl-admin for the first time.
 
 You're now ready to manage your SSL certificates.
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/security/sssd/files/pkg-message.in b/security/sssd/files/pkg-message.in
index 1b06ff5ba86b..43614925c6c1 100644
--- a/security/sssd/files/pkg-message.in
+++ b/security/sssd/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 Copy %%PREFIX%%/etc/sssd/sssd.conf.sample to %%PREFIX%%/etc/sssd/sssd.conf
 and edit %%PREFIX%%/etc/sssd/sssd.conf (see man sssd.conf for details)
 
@@ -18,4 +20,6 @@ For additional details, please see the man pages for pam.conf and nsswitch.conf
 
 An sssd HOWTO is also available:
 https://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2
-================================================================================
+EOM
+}
+]
diff --git a/security/stunnel/pkg-message b/security/stunnel/pkg-message
index 3787f3e71e97..e1d4aacdb880 100644
--- a/security/stunnel/pkg-message
+++ b/security/stunnel/pkg-message
@@ -1,3 +1,7 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Don't forget to check out the FAQ at http://www.stunnel.org/
-************************************************************
+EOM
+}
+]
diff --git a/security/suricata/files/pkg-message.in b/security/suricata/files/pkg-message.in
index 39976024324e..60c8ede06848 100644
--- a/security/suricata/files/pkg-message.in
+++ b/security/suricata/files/pkg-message.in
@@ -1,5 +1,6 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you want to run Suricata in IDS mode, add to /etc/rc.conf:
 
 	suricata_enable="YES"
@@ -40,5 +41,6 @@ You may want to try BPF in zerocopy mode to test performance improvements:
 	sysctl -w net.bpf.zerocopy_enable=1
 
 Don't forget to add net.bpf.zerocopy_enable=1 to /etc/sysctl.conf
-
-===========================================================================
+EOM
+}
+]
diff --git a/security/symbion-sslproxy/files/pkg-message.in b/security/symbion-sslproxy/files/pkg-message.in
index 971890034a37..127058547e32 100644
--- a/security/symbion-sslproxy/files/pkg-message.in
+++ b/security/symbion-sslproxy/files/pkg-message.in
@@ -1,5 +1,9 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 This software doesn't have a configuration file.
 You can see the usage information with the -h command line option
 and in %%DOCSDIR%%/README.
-===============================================================================
+EOM
+}
+]
diff --git a/security/teleport/files/pkg-message.in b/security/teleport/files/pkg-message.in
index fef94af6d618..2a874bdc7840 100644
--- a/security/teleport/files/pkg-message.in
+++ b/security/teleport/files/pkg-message.in
@@ -1,4 +1,6 @@
-====
+[
+{ type: install
+  message: <<EOM
 Quick getting started guide:
 
 1. Read through the Quick Start Guide (see below).
@@ -19,4 +21,6 @@ Admin Manual:	https://gravitational.com/teleport/docs/admin-guide/
 User Manual:	https://gravitational.com/teleport/docs/user-manual/
 Architecture:	https://gravitational.com/teleport/docs/architecture/
 FAQ:		https://gravitational.com/teleport/docs/faq/
-====
+EOM
+}
+]
diff --git a/security/tor-devel/files/pkg-message.in b/security/tor-devel/files/pkg-message.in
index 52f931c64717..b2e391ffc96d 100644
--- a/security/tor-devel/files/pkg-message.in
+++ b/security/tor-devel/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 To enable the tor server, set tor_enable="YES" in your /etc/rc.conf
 and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the
 %%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc
@@ -19,4 +21,6 @@ corresponding additional configuration files %%PREFIX%%/etc/tor/torrc@inst1, ...
 Alternatively, you can use the extended instance definition to specify all
 instance parameteres explicitly:
 inst_name{:inst_conf:inst_user:inst_group:inst_pidfile:inst_data_dir}
-================================================================================
+EOM
+}
+]
diff --git a/security/tor/files/pkg-message.in b/security/tor/files/pkg-message.in
index 52f931c64717..b2e391ffc96d 100644
--- a/security/tor/files/pkg-message.in
+++ b/security/tor/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 To enable the tor server, set tor_enable="YES" in your /etc/rc.conf
 and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the
 %%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc
@@ -19,4 +21,6 @@ corresponding additional configuration files %%PREFIX%%/etc/tor/torrc@inst1, ...
 Alternatively, you can use the extended instance definition to specify all
 instance parameteres explicitly:
 inst_name{:inst_conf:inst_user:inst_group:inst_pidfile:inst_data_dir}
-================================================================================
+EOM
+}
+]
diff --git a/security/trousers/files/pkg-message.in b/security/trousers/files/pkg-message.in
index 581a98cdd241..a142de8319f4 100644
--- a/security/trousers/files/pkg-message.in
+++ b/security/trousers/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run tcsd automatically, add the following line to /etc/rc.conf:
 
 tcsd_enable="YES"
@@ -14,3 +17,6 @@ tpmd_enable="YES"
 To use TPM, add your_account to '%%GROUPS%%' group like following:
 
 # pw groupmod %%GROUPS%% -m your_account
+EOM
+}
+]
diff --git a/security/truecrypt/pkg-message b/security/truecrypt/pkg-message
index 2b8c1e89ea4a..bd6e236c0e4c 100644
--- a/security/truecrypt/pkg-message
+++ b/security/truecrypt/pkg-message
@@ -1,6 +1,6 @@
-===========================================================
-*** WARNING ***
-
+[
+{ type: install
+  message: <<EOM
 TrueCrypt is not offically supported under FreeBSD, however
 it does seem to function fine under certain conditions.
 
@@ -11,4 +11,6 @@ cites that system instability is possible.
 Please ensure that the fusefs kmod is loaded prior to use.
 
 WWW: http://www.truecrypt.org/misc/freebsd
-===========================================================
+EOM
+}
+]
diff --git a/security/u2f-devd/files/pkg-message.in b/security/u2f-devd/files/pkg-message.in
index 4972d0b25bdd..0f6d8b04e800 100644
--- a/security/u2f-devd/files/pkg-message.in
+++ b/security/u2f-devd/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 U2F authentication requires read/write access to USB devices. To
 facilitate such access it comes with a devd.conf(5) file, but you
 still need to restart devd(8), add the desired users to "u2f" group
@@ -10,5 +11,6 @@ and log those out of the current session. For example:
 $ exit
 
 For details, see %%PREFIX%%/etc/devd/u2f.conf
-
-======================================================================
+EOM
+}
+]
diff --git a/security/unicornscan/files/pkg-message.in b/security/unicornscan/files/pkg-message.in
index 815060540593..ffc091002b1e 100644
--- a/security/unicornscan/files/pkg-message.in
+++ b/security/unicornscan/files/pkg-message.in
@@ -1,7 +1,11 @@
-Unicornscan has been successfully installed!
-
+[
+{ type: install
+  message: <<EOM
 Check the sample configuration files under
 
 	%%PREFIX%%/etc/unicornscan
 
 and rename or copy without the .sample suffix.
+EOM
+}
+]
diff --git a/security/vault/files/pkg-message.in b/security/vault/files/pkg-message.in
index e9d8e0b29b30..c12329436e5c 100644
--- a/security/vault/files/pkg-message.in
+++ b/security/vault/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The vault user created by the vault package is now a member of the daemon
 class, which will allow it to use mlock() when started by the rc script. This
 will not be reflected in systems where the user already exists. Please add the
@@ -17,3 +20,6 @@ Or to disable mlock, add:
 disable_mlock = 1
 
 to %%PREFIX%%/etc/vault.hcl
+EOM
+}
+]
diff --git a/security/veracrypt/files/pkg-message.in b/security/veracrypt/files/pkg-message.in
index e801c11fa125..81309dbcef08 100644
--- a/security/veracrypt/files/pkg-message.in
+++ b/security/veracrypt/files/pkg-message.in
@@ -1,7 +1,6 @@
-###############################################################################
-
-Veracrypt was installed
-
+[
+{ type: install
+  message: <<EOM
 1) Veracrypt needs security/sudo port to mount disk volumes. You must modify 
    %%PREFIX%%/etc/sudoers file to add Veracrypt user(s). Don't use root user
 
@@ -14,5 +13,6 @@ If you want load fuse.ko on boot time, please add the following to /boot/loader.
 fuse_load="YES"
 
 3) Enjoy it
-
-###############################################################################
+EOM
+}
+]
diff --git a/security/vm-to-tor/files/pkg-message.in b/security/vm-to-tor/files/pkg-message.in
index 33a555956723..dd9e7cfed665 100644
--- a/security/vm-to-tor/files/pkg-message.in
+++ b/security/vm-to-tor/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed vm-to-tor: framework that allows to connect virtual
 machines to the tor network.
 
@@ -39,4 +41,6 @@ security reasons. Machine is isolated from the host environment, and
 is not host-aware. Besides the optional NFS connection, all
 communication initiated by the virtual machine happens only through
 tor.
-======================================================================
+EOM
+}
+]
diff --git a/security/vnccrack/files/pkg-message.in b/security/vnccrack/files/pkg-message.in
index 1efde53c11b4..4a5d182bfc40 100644
--- a/security/vnccrack/files/pkg-message.in
+++ b/security/vnccrack/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Additional info on program usage can be found in this file:
 %%DOCSDIR%%/readme.txt
+EOM
+}
+]
diff --git a/security/vuls/pkg-message b/security/vuls/pkg-message
index f30dca9b970d..fc357a1321c9 100644
--- a/security/vuls/pkg-message
+++ b/security/vuls/pkg-message
@@ -1,5 +1,7 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Vuls requires the cve.sqlite3 database provided by go-cve-dictionary
-
-===============================================================================
+EOM
+}
+]
diff --git a/security/webfwlog/files/pkg-message.in b/security/webfwlog/files/pkg-message.in
index af416a62b4a6..3e107d7600f4 100644
--- a/security/webfwlog/files/pkg-message.in
+++ b/security/webfwlog/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Webfwlog-%%VERSION%% has been installed in %%WWWDIR%%.
 
 You should update your web server's configuration to provide access to
@@ -8,3 +11,6 @@ You should also read the README in the mysql or pgsql directoy in
 PostgreSQL server for use with webfwlog, and edit the webfwlog.conf file in
 %%ETCDIR%% and adjust it to your installation.  This file is
 well-commented.
+EOM
+}
+]
diff --git a/security/wpa_supplicant/files/pkg-message.in b/security/wpa_supplicant/files/pkg-message.in
index 01ba729e55f3..e7b8d25b652d 100644
--- a/security/wpa_supplicant/files/pkg-message.in
+++ b/security/wpa_supplicant/files/pkg-message.in
@@ -1,6 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 To use the ports version of WPA Supplicant instead of the base, add:
 
     wpa_supplicant_program="%%PREFIX%%/sbin/wpa_supplicant"
 
 to /etc/rc.conf
-
+EOM
+}
+]
diff --git a/security/yafic/pkg-message b/security/yafic/pkg-message
index 424f61a13993..e9f03fd18c57 100644
--- a/security/yafic/pkg-message
+++ b/security/yafic/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 A sample configuration file has be installed in
 @@PREFIX@@/share/examples/yafic
+EOM
+}
+]
diff --git a/security/zeronet/files/pkg-message.in b/security/zeronet/files/pkg-message.in
index 57663ad1f595..1b99cb4e001e 100644
--- a/security/zeronet/files/pkg-message.in
+++ b/security/zeronet/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed ZeroNet: Decentralized websites using Bitcoin crypto.
 
 It is recommended to run ZeroNet as a service:
@@ -29,4 +31,6 @@ has either UPnP enabled, or port 15441 open.
 
 For more details please see the ZeroNet documentation here:
 http://zeronet.readthedocs.io/en/latest
-======================================================================
+EOM
+}
+]
diff --git a/shells/ammonite/pkg-message b/shells/ammonite/pkg-message
index 7a2a2d6a2e47..eda1d943cdce 100644
--- a/shells/ammonite/pkg-message
+++ b/shells/ammonite/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use ammonite as a shell you must(!) setup a configuration file
 ~/.ammonite/predef.sc with a least the following minimal content:
 
@@ -17,3 +20,6 @@ import shellSession._
 import ammonite.ops._
 import ammonite.shell._
 ammonite.shell.Configure(interp, repl, wd)
+EOM
+}
+]
diff --git a/shells/bash-completion/files/pkg-message.in b/shells/bash-completion/files/pkg-message.in
index f5c3c0203fd3..b9445fa231f7 100644
--- a/shells/bash-completion/files/pkg-message.in
+++ b/shells/bash-completion/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 To enable the bash completion library, add the following to
 your .bashrc file:
 
@@ -8,6 +8,6 @@ your .bashrc file:
 	source %%RUNFILE%%
 
 See %%DOCSDIR%%/README.md for more information.
-
-=====================================================================
-
+EOM
+}
+]
diff --git a/shells/bash/files/pkg-message.in b/shells/bash/files/pkg-message.in
index 14dfcfe895f7..e0e633447e95 100644
--- a/shells/bash/files/pkg-message.in
+++ b/shells/bash/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 bash requires fdescfs(5) mounted on /dev/fd
 
 If you have not done it yet, please do the following:
@@ -9,5 +10,6 @@ If you have not done it yet, please do the following:
 To make it permanent, you need the following lines in /etc/fstab:
 
 	fdescfs	/dev/fd		fdescfs		rw,late	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/shells/fd/pkg-message b/shells/fd/pkg-message
index 6bf477081987..ce16ded61689 100644
--- a/shells/fd/pkg-message
+++ b/shells/fd/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Read the document files in /usr/local/share/doc/fd, and use the
 example fd2rc files in /usr/local/etc.
+EOM
+}
+]
diff --git a/shells/flash/files/pkg-message.in b/shells/flash/files/pkg-message.in
index a5f713b325ce..18ea19433bdf 100644
--- a/shells/flash/files/pkg-message.in
+++ b/shells/flash/files/pkg-message.in
@@ -1,5 +1,9 @@
-  ------------------------ WARNING ------------------------
+[
+{ type: install
+  message: <<EOM
 This software is not yet ready-to-go on your system. You need
 to configure flash in %%PREFIX%%/lib/flash in order for it to
 work properly.
-  ---------------------------------------------------------
+EOM
+}
+]
diff --git a/shells/ibsh/files/pkg-message.in b/shells/ibsh/files/pkg-message.in
index 00278e259d6d..df3ce975c54c 100644
--- a/shells/ibsh/files/pkg-message.in
+++ b/shells/ibsh/files/pkg-message.in
@@ -1,9 +1,11 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use the shell:
 
 # echo %%PREFIX%%/bin/ibsh >> /etc/shells
 
 Also check %%PREFIX%%/etc/ibsh
-
-==========================================================================
+EOM
+}
+]
diff --git a/shells/zsh-antigen/files/pkg-message.in b/shells/zsh-antigen/files/pkg-message.in
index 7f44543fee12..4c196b8f9e56 100644
--- a/shells/zsh-antigen/files/pkg-message.in
+++ b/shells/zsh-antigen/files/pkg-message.in
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Antigen can be found at %%DATADIR%%/antigen.zsh
+EOM
+}
+]
diff --git a/shells/zsh-autosuggestions/files/pkg-message.in b/shells/zsh-autosuggestions/files/pkg-message.in
index b478ca7d39e5..1eb1a4a8fe16 100644
--- a/shells/zsh-autosuggestions/files/pkg-message.in
+++ b/shells/zsh-autosuggestions/files/pkg-message.in
@@ -1,5 +1,9 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 Add the line below to your .zshrc to enable auto suggestions.
 
 source %%DATADIR%%/zsh-autosuggestions.zsh
-================================================================================
+EOM
+}
+]
diff --git a/shells/zsh-navigation-tools/files/pkg-message.in b/shells/zsh-navigation-tools/files/pkg-message.in
index a563f75df2ea..2d6a014c6c8f 100644
--- a/shells/zsh-navigation-tools/files/pkg-message.in
+++ b/shells/zsh-navigation-tools/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To enable zsh-navigation-tools, add the following to your zshrc:
 source %%DATADIR%%/zsh-navigation-tools.plugin.zsh
+EOM
+}
+]
diff --git a/shells/zsh-syntax-highlighting/files/pkg-message.in b/shells/zsh-syntax-highlighting/files/pkg-message.in
index 2f718de92b61..8aba248b0fac 100644
--- a/shells/zsh-syntax-highlighting/files/pkg-message.in
+++ b/shells/zsh-syntax-highlighting/files/pkg-message.in
@@ -1,5 +1,9 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 Add the line below to *the end of* your .zshrc to enable highlighting.
 
 source %%DATADIR%%/zsh-syntax-highlighting.zsh
-================================================================================
+EOM
+}
+]
diff --git a/sysutils/3dm/files/pkg-message.in b/sysutils/3dm/files/pkg-message.in
index 9dbf4c3f18f0..e3b3f5c34f3e 100644
--- a/sysutils/3dm/files/pkg-message.in
+++ b/sysutils/3dm/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 3DM2 includes an rc.d script to control a daemon mode.
 
 You can start the daemon with these commands:
@@ -6,3 +9,6 @@ You can start the daemon with these commands:
 
 Do not forget to edit '%%PREFIX%%/etc/3dm2/3dm2.conf'
 Visit https://localhost:888/
+EOM
+}
+]
diff --git a/sysutils/DTraceToolkit/pkg-message b/sysutils/DTraceToolkit/pkg-message
index 321b9d46fafd..76c13f83a97a 100644
--- a/sysutils/DTraceToolkit/pkg-message
+++ b/sysutils/DTraceToolkit/pkg-message
@@ -1,6 +1,10 @@
-**************************************************************
-* At this point it is prudent to remind you that DTrace      *
-* support in FreeBSD is incomplete and experimental. Many of *
-* these scripts will not work as they are either too Solaris *
-* specific or use probes which are unsupported at this time. *
-**************************************************************
+[
+{ type: install
+  message: <<EOM
+ At this point it is prudent to remind you that DTrace
+ support in FreeBSD is incomplete and experimental. Many of
+ these scripts will not work as they are either too Solaris
+ specific or use probes which are unsupported at this time.
+EOM
+}
+]
diff --git a/sysutils/LPRng/files/pkg-message.in b/sysutils/LPRng/files/pkg-message.in
index fa5bade03d3f..60af551b0970 100644
--- a/sysutils/LPRng/files/pkg-message.in
+++ b/sysutils/LPRng/files/pkg-message.in
@@ -1,5 +1,6 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To enable LPRng, put the following lines in /etc/rc.conf
 
 lpd_enable="NO"
@@ -19,4 +20,6 @@ papowell@astart.com            6741 Convoy Court
 Network and System             San Diego, CA 92111
   Consulting                   858-874-6543 FAX 858-751-2435
 LPRng - Print Spooler (http://www.lprng.com)
-**********************************************************************
+EOM
+}
+]
diff --git a/sysutils/acerhdf-kmod/pkg-message b/sysutils/acerhdf-kmod/pkg-message
index 630ed3713d94..ae57ecd980ac 100644
--- a/sysutils/acerhdf-kmod/pkg-message
+++ b/sysutils/acerhdf-kmod/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The acerhdf fan control is disabled by default.  To enable it add the
 following settings to /boot/loader.conf
 
@@ -9,3 +12,6 @@ and to /etc/sysctl.conf
 
 Refer to acerhdf(4) for additonal settings.  Choose wisely and be
 careful that your system does not overheat!
+EOM
+}
+]
diff --git a/sysutils/afbinit/pkg-message b/sysutils/afbinit/pkg-message
index e9aa02e76061..63798e11fe51 100644
--- a/sysutils/afbinit/pkg-message
+++ b/sysutils/afbinit/pkg-message
@@ -1,8 +1,10 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 In order to automatically load the microcode during boot add the following
 line to to /etc/rc.conf or /etc/rc.conf.local:
 
 afbinit_enable="YES"
-
-===========================================================================
+EOM
+}
+]
diff --git a/sysutils/afio/files/pkg-message.in b/sysutils/afio/files/pkg-message.in
index 4058c152c6fc..4103958e56ea 100644
--- a/sysutils/afio/files/pkg-message.in
+++ b/sysutils/afio/files/pkg-message.in
@@ -1,5 +1,6 @@
-* WARNING * WARNING * WARNING * WARNING * WARNING * WARNING *
-
+[
+{ type: install
+  message: <<EOM
     THERE ARE POTENTIAL ISSUES YOU SHOULD BE AWARE OF PRIOR
     TO THE USE OF AFIO
 
@@ -8,5 +9,6 @@
    %%PREFIX%%/share/doc/afio/README
 
    for details.
-
-* WARNING * WARNING * WARNING * WARNING * WARNING * WARNING *
+EOM
+}
+]
diff --git a/sysutils/anacron/files/pkg-message.in b/sysutils/anacron/files/pkg-message.in
index 6f7659674cae..77c5d61d0db1 100644
--- a/sysutils/anacron/files/pkg-message.in
+++ b/sysutils/anacron/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Configuration hints:
 - Edit %%PREFIX%%/etc/anacrontab
 - Deactivate the 'periodic' commands in /etc/crontab
@@ -6,3 +8,6 @@ Configuration hints:
   0  0  *  *  *    root    %%PREFIX%%/sbin/anacron
 - Add anacron_enable="YES" to /etc/rc.conf
 - Read anacron(8) and anacrontab(5)
+EOM
+}
+]
diff --git a/sysutils/anvil/files/pkg-message.in b/sysutils/anvil/files/pkg-message.in
index a4086721a2fc..42f6d5cc3ad2 100644
--- a/sysutils/anvil/files/pkg-message.in
+++ b/sysutils/anvil/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 After installing anvil, this is a short checklist of things to do, depending
 on which tools are using.
 
@@ -43,6 +43,6 @@ MAILTO=you@example.org
 
 19 20 * * * /usr/local/bin/cert-shifter
 ###
-
-****************************************************************************
-
+EOM
+}
+]
diff --git a/sysutils/apcpwr/files/pkg-message.in b/sysutils/apcpwr/files/pkg-message.in
index 44320d5c8b2e..571ca8f551a8 100644
--- a/sysutils/apcpwr/files/pkg-message.in
+++ b/sysutils/apcpwr/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please copy the file
 %%PREFIX%%/etc/apcpwr.conf.dist
 to
@@ -11,3 +14,6 @@ WARNING: WARNING WARNING WARNING WARNING WARNING WARNING
 
 This port is usable only by root unless the perl utility
 program /usr/bin/suidperl is installed with setuid permissions.
+EOM
+}
+]
diff --git a/sysutils/apcupsd/files/pkg-message.in b/sysutils/apcupsd/files/pkg-message.in
index 112896765704..6af80aada141 100644
--- a/sysutils/apcupsd/files/pkg-message.in
+++ b/sysutils/apcupsd/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 Read the manual: http://www.apcupsd.org/manual/manual.html
                  http://www.apcupsd.org/manual/manual.pdf
 
@@ -26,5 +28,6 @@ line:
   test -f /var/run/powerfail && /usr/local/sbin/apcupsd --hibernate
   or
   test -f /var/run/powerfail && /usr/local/sbin/apcupsd --power-off
-
-**********************************************************************
+EOM
+}
+]
diff --git a/sysutils/archivemount/files/pkg-message.in b/sysutils/archivemount/files/pkg-message.in
index 467d62ec0c3d..7abb21443b2d 100644
--- a/sysutils/archivemount/files/pkg-message.in
+++ b/sysutils/archivemount/files/pkg-message.in
@@ -1,8 +1,10 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+[
+{ type: install
+  message: <<EOM
 Make sure you have fuse.ko loaded then use archivemount
 or mount_archive command or add an entry to the /etc/fstab such as:
 
 /path/to/archive /mnt/path fusefs ro,late,mountprog=%%PREFIX%%/sbin/mount_archive 0 0
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/sysutils/asfsm/files/pkg-message.in b/sysutils/asfsm/files/pkg-message.in
index 1c7ee9dd8012..521e989dd384 100644
--- a/sysutils/asfsm/files/pkg-message.in
+++ b/sysutils/asfsm/files/pkg-message.in
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 If you would like to be able to mount and umount file systems
 using asfsm, as root, type \`chmod 4555 %%PREFIX%%/bin/asfsm\`
 NOTE: This opens a SECURITY HOLE as ALL users will have this ability.
+EOM
+}
+]
diff --git a/sysutils/asusoled/files/pkg-message.in b/sysutils/asusoled/files/pkg-message.in
index 97ecadca7711..0eb1cddd28b6 100644
--- a/sysutils/asusoled/files/pkg-message.in
+++ b/sysutils/asusoled/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please note this utility requires ugen(4).  Try:
 
 	kldstat -m uhub/ugen
@@ -44,3 +47,6 @@ Similarly, you can enable or test 'oled_clock', of course. :-)
 Enjoy!
 
 Jung-uk Kim <jkim@FreeBSD.org>
+EOM
+}
+]
diff --git a/sysutils/atop/files/pkg-message.in b/sysutils/atop/files/pkg-message.in
index d3d983bb98af..0f0053e150df 100644
--- a/sysutils/atop/files/pkg-message.in
+++ b/sysutils/atop/files/pkg-message.in
@@ -1,5 +1,6 @@
-****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 atop succesfully installed. To run in interactive mode use "atop" command.
 
 To run the atop in collecting mode from startup, add
@@ -17,5 +18,6 @@ variable in your /etc/rc.conf file.
 
 To change default (10 seconds) interval use atop_inteval (e.g. atop_interval=5)
 in /etc/rc.conf
-
-****************************************************************************
+EOM
+}
+]
diff --git a/sysutils/autojump/pkg-message b/sysutils/autojump/pkg-message
index 651d03afefe1..1da40217e040 100644
--- a/sysutils/autojump/pkg-message
+++ b/sysutils/autojump/pkg-message
@@ -1,6 +1,10 @@
-**************************************************************
-* AutoJump installed
-**************************************************************
-* Note: Your /etc/profile was changed for this installation.
-* changes will be reverted when you un-install the package.
-**************************************************************
+[
+{ type: install
+  message: <<EOM
+ AutoJump installed
+
+ Note: Your /etc/profile was changed for this installation.
+ changes will be reverted when you un-install the package.
+EOM
+}
+]
diff --git a/sysutils/autopsy/pkg-message b/sysutils/autopsy/pkg-message
index 8ac4a41713dc..485846fe25f5 100644
--- a/sysutils/autopsy/pkg-message
+++ b/sysutils/autopsy/pkg-message
@@ -1,9 +1,9 @@
-
----------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 Default autopsy configuration file is /usr/local/lib/autopsy/conf.pl
 
----------------------------------------------------------------
+
 
 The NIST National Software Reference Library (NSRL) contains
 hash values of known good and bad files.
@@ -18,17 +18,18 @@ The index file NSRLFile.txt-md5.idx must be in the same directory.
 If it does not exist it may be created with the TSK hfind command:
    hfind -i nsrl-md5 /path/to/NSRLFile.txt
 
----------------------------------------------------------------
+
 
 Autopsy saves configuration files, audit logs, and output to the
 Evidence Locker directory. You MUST specify this with the LOCKDIR
 configuration entry before running Autopsy:
    LOCKDIR = /path/to/locker
 
----------------------------------------------------------------
+
 
 WARNING: The cross-platform version of Autopsy is no longer actively
          developed. This port is retained mainly to allow users with
          saved data to migrate to another forensic tool.
-
----------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/azure-agent/pkg-message b/sysutils/azure-agent/pkg-message
index 0260b514832a..d4f2c5ab9760 100644
--- a/sysutils/azure-agent/pkg-message
+++ b/sysutils/azure-agent/pkg-message
@@ -1,7 +1,11 @@
-==========================================================
+[
+{ type: install
+  message: <<EOM
 To enable waagent, add the following line to rc.conf:
 
 waagent_enable="YES"
 
 This will make sure waagent is started at boot.
-==========================================================
+EOM
+}
+]
diff --git a/sysutils/backuppc-devel/files/pkg-message.in b/sysutils/backuppc-devel/files/pkg-message.in
index 2efac6d40d07..4631b55a9a03 100644
--- a/sysutils/backuppc-devel/files/pkg-message.in
+++ b/sysutils/backuppc-devel/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
  - If this is a new installation or version upgrade,
     to create/update configuration you should run
 
@@ -24,4 +26,6 @@
     restore command to 5 ('-d 5') in the main configuration, for instance
 
      $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -';
-==========================================================================
+EOM
+}
+]
diff --git a/sysutils/backuppc/files/pkg-message.in b/sysutils/backuppc/files/pkg-message.in
index e7e9247a8361..0adeb746f93f 100644
--- a/sysutils/backuppc/files/pkg-message.in
+++ b/sysutils/backuppc/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
  - If this is a new installation or version upgrade,
     to create/update configuration you should run
 
@@ -18,4 +20,6 @@
     restore command to 5 ('-d 5') in the main configuration, for instance
 
      $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -';
-==========================================================================
+EOM
+}
+]
diff --git a/sysutils/backuppc4/files/pkg-message.in b/sysutils/backuppc4/files/pkg-message.in
index 2efac6d40d07..4631b55a9a03 100644
--- a/sysutils/backuppc4/files/pkg-message.in
+++ b/sysutils/backuppc4/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
  - If this is a new installation or version upgrade,
     to create/update configuration you should run
 
@@ -24,4 +26,6 @@
     restore command to 5 ('-d 5') in the main configuration, for instance
 
      $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -';
-==========================================================================
+EOM
+}
+]
diff --git a/sysutils/bacula9-server/files/pkg-message.client.in b/sysutils/bacula9-server/files/pkg-message.client.in
index c4041a26df11..cf425148025f 100644
--- a/sysutils/bacula9-server/files/pkg-message.client.in
+++ b/sysutils/bacula9-server/files/pkg-message.client.in
@@ -1,8 +1,10 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
 NOTE:
 Sample files are installed in %%PREFIX%%/etc/bacula:
 
   bconsole.conf.sample, bacula-fd.conf.sample
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bacula9-server/files/pkg-message.server.in b/sysutils/bacula9-server/files/pkg-message.server.in
index d694599140fc..fe6259186583 100644
--- a/sysutils/bacula9-server/files/pkg-message.server.in
+++ b/sysutils/bacula9-server/files/pkg-message.server.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bacula server was installed
 
 A database upgrade is required if upgrading from Bacula < 9.0.
@@ -53,5 +54,6 @@ ReleaseNotes
 
 If you are using sqlite you need to run the make_sqlite_tables script as
 the bacula user. Do this using 'sudo su -m bacula'.
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bareos-server/files/pkg-message.client.in b/sysutils/bareos-server/files/pkg-message.client.in
index c2d12358cf68..b3e2d5825e13 100644
--- a/sysutils/bareos-server/files/pkg-message.client.in
+++ b/sysutils/bareos-server/files/pkg-message.client.in
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos client was installed
 
 1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and 
@@ -11,5 +12,6 @@ bareos client was installed
    to /etc/rc.conf
 
   bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bareos-server/files/pkg-message.server.in b/sysutils/bareos-server/files/pkg-message.server.in
index 836127358d83..3bb0ef535ce1 100644
--- a/sysutils/bareos-server/files/pkg-message.server.in
+++ b/sysutils/bareos-server/files/pkg-message.server.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos server was installed
 
 1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and
@@ -68,5 +69,6 @@ database update procedure.
 
 If you are using sqlite you need to run the make_sqlite_tables script as
 the bareos user. Do this using 'sudo su -m bareos'.
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bareos16-server/files/pkg-message.client.in b/sysutils/bareos16-server/files/pkg-message.client.in
index c2d12358cf68..b3e2d5825e13 100644
--- a/sysutils/bareos16-server/files/pkg-message.client.in
+++ b/sysutils/bareos16-server/files/pkg-message.client.in
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos client was installed
 
 1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and 
@@ -11,5 +12,6 @@ bareos client was installed
    to /etc/rc.conf
 
   bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bareos16-server/files/pkg-message.server.in b/sysutils/bareos16-server/files/pkg-message.server.in
index 836127358d83..3bb0ef535ce1 100644
--- a/sysutils/bareos16-server/files/pkg-message.server.in
+++ b/sysutils/bareos16-server/files/pkg-message.server.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos server was installed
 
 1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and
@@ -68,5 +69,6 @@ database update procedure.
 
 If you are using sqlite you need to run the make_sqlite_tables script as
 the bareos user. Do this using 'sudo su -m bareos'.
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bareos17-server/files/pkg-message.client.in b/sysutils/bareos17-server/files/pkg-message.client.in
index c2d12358cf68..b3e2d5825e13 100644
--- a/sysutils/bareos17-server/files/pkg-message.client.in
+++ b/sysutils/bareos17-server/files/pkg-message.client.in
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos client was installed
 
 1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and 
@@ -11,5 +12,6 @@ bareos client was installed
    to /etc/rc.conf
 
   bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bareos17-server/files/pkg-message.server.in b/sysutils/bareos17-server/files/pkg-message.server.in
index 836127358d83..3bb0ef535ce1 100644
--- a/sysutils/bareos17-server/files/pkg-message.server.in
+++ b/sysutils/bareos17-server/files/pkg-message.server.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 bareos server was installed
 
 1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and
@@ -68,5 +69,6 @@ database update procedure.
 
 If you are using sqlite you need to run the make_sqlite_tables script as
 the bareos user. Do this using 'sudo su -m bareos'.
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/bhyve-rc/pkg-message b/sysutils/bhyve-rc/pkg-message
index 61d059421d10..174f50b25e59 100644
--- a/sysutils/bhyve-rc/pkg-message
+++ b/sysutils/bhyve-rc/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Configuration is done completely though rc.conf.
 The rc script won't touch any devices for you (neither disk, nor tap)
 so you need to make sure all of those have been initialized properly.
@@ -53,3 +56,6 @@ service bhyve stop virt2 # stop individual
 service bhyve stop # stop all
 
 (by default ctrl-b d detaches from tmux).
+EOM
+}
+]
diff --git a/sysutils/boxbackup-devel/files/pkg-message.client b/sysutils/boxbackup-devel/files/pkg-message.client
index e804b44d94b9..2547d7d4cc05 100644
--- a/sysutils/boxbackup-devel/files/pkg-message.client
+++ b/sysutils/boxbackup-devel/files/pkg-message.client
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 To run bbackupd at startup, add bbackupd_enable="YES" to /etc/rc.conf
 Please see http://www.boxbackup.org/client.html for client configuration
 options
+EOM
+}
+]
diff --git a/sysutils/boxbackup-devel/files/pkg-message.server b/sysutils/boxbackup-devel/files/pkg-message.server
index 872c82bf5ed8..5820d067bfe1 100644
--- a/sysutils/boxbackup-devel/files/pkg-message.server
+++ b/sysutils/boxbackup-devel/files/pkg-message.server
@@ -1,4 +1,9 @@
-
+[
+{ type: install
+  message: <<EOM
 To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf
 Please see http://www.boxbackup.org/server.html for server configuration
 options
+EOM
+}
+]
diff --git a/sysutils/bsd-splash-changer/files/pkg-message.in b/sysutils/bsd-splash-changer/files/pkg-message.in
index 5d2ff729f441..28218645b28c 100644
--- a/sysutils/bsd-splash-changer/files/pkg-message.in
+++ b/sysutils/bsd-splash-changer/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use the port you need to perform the following steps:
 
 1) Place your image files into %%DATADIR%%.
@@ -14,5 +15,6 @@ To use the port you need to perform the following steps:
 
 Also, be careful if you already have a file "/boot/splash" because it will be
 replaced when the script is executed.
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/bsdstats/files/pkg-message.in b/sysutils/bsdstats/files/pkg-message.in
index 6742a7658f4f..7c9c0da60ce5 100644
--- a/sysutils/bsdstats/files/pkg-message.in
+++ b/sysutils/bsdstats/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed BSDstats: script reporting statistics about your machine
 
 To disable monthly reporting, add this line to /etc/periodic.conf:
@@ -18,4 +20,6 @@ To view current statistics, go to:
 	http://www.bsdstats.org/
 
 @@TOR_MESSAGE@@
-======================================================================
+EOM
+}
+]
diff --git a/sysutils/btsixad/pkg-message b/sysutils/btsixad/pkg-message
index b6fb92cb0313..5aa92f8222c5 100644
--- a/sysutils/btsixad/pkg-message
+++ b/sysutils/btsixad/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 1) A devd(8) configuration file has been installed. Please restart devd:
 
     # service devd restart
 
 2) Add btsixad_enable=YES to /etc/rc.conf. See btsixad(8) for other options.
+EOM
+}
+]
diff --git a/sysutils/byobu/pkg-message b/sysutils/byobu/pkg-message
index b63f67574096..9b5cb832d96f 100644
--- a/sysutils/byobu/pkg-message
+++ b/sysutils/byobu/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 byobu requires linprocfs(5) mounted on /compat/linux/proc
 
 If you have not done it yet, please do the following:
@@ -10,5 +11,6 @@ If you have not done it yet, please do the following:
 To make it permanent, you need the following line in /etc/fstab:
 
 	linproc  /compat/linux/proc  linprocfs  rw,late  0 0
-
-======================================================================
+EOM
+}
+]
diff --git a/sysutils/cbsd/files/pkg-message.in b/sysutils/cbsd/files/pkg-message.in
index 1d8dd6814113..e1ddcadd7bf4 100644
--- a/sysutils/cbsd/files/pkg-message.in
+++ b/sysutils/cbsd/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 cbsd is now installed, but requires additional setup steps:
 
 Upon initial installation, run:
@@ -11,5 +12,6 @@ Where /path is the path to the cbsd workdir, e.g.: /usr/jails
 For upgrading an existing installation, run:
 
   cbsd initenv
-
-===============================================================================
+EOM
+}
+]
diff --git a/sysutils/cdrtools-devel/files/pkg-message.in b/sysutils/cdrtools-devel/files/pkg-message.in
index 2e93701dd3dc..48b73aede39f 100644
--- a/sysutils/cdrtools-devel/files/pkg-message.in
+++ b/sysutils/cdrtools-devel/files/pkg-message.in
@@ -1,5 +1,6 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Note: The location of the cdrtools `defaults' files has been set to
 
 	%%PREFIX%%/etc
@@ -9,5 +10,6 @@ standard location, which is /etc/default.
 
 The reason for this is that FreeBSD ports and packages should not use
 configuration files outside of %%PREFIX%%.
-
-===========================================================================
+EOM
+}
+]
diff --git a/sysutils/cdrtools/files/pkg-message.in b/sysutils/cdrtools/files/pkg-message.in
index 2e93701dd3dc..48b73aede39f 100644
--- a/sysutils/cdrtools/files/pkg-message.in
+++ b/sysutils/cdrtools/files/pkg-message.in
@@ -1,5 +1,6 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Note: The location of the cdrtools `defaults' files has been set to
 
 	%%PREFIX%%/etc
@@ -9,5 +10,6 @@ standard location, which is /etc/default.
 
 The reason for this is that FreeBSD ports and packages should not use
 configuration files outside of %%PREFIX%%.
-
-===========================================================================
+EOM
+}
+]
diff --git a/sysutils/clockspeed/files/pkg-message.in b/sysutils/clockspeed/files/pkg-message.in
index bb371d57c28d..d1aa37bbafd6 100644
--- a/sysutils/clockspeed/files/pkg-message.in
+++ b/sysutils/clockspeed/files/pkg-message.in
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 Please make sure that you read %%PREFIX%%/share/doc/clockspeed/INSTALL.
 It contains important information about testing and configuring
 clockspeed, and finally installing it in your system.
@@ -48,3 +49,6 @@ A port to non-i386 platforms was done using the clock_gettime(2)
 function. Since this is somewhat experimental, there might be some
 tiny precision differences from the i386 platform versions. You
 have been warned!
+EOM
+}
+]
diff --git a/sysutils/clonehdd/pkg-message b/sysutils/clonehdd/pkg-message
index 45ee669257b4..112ec5670598 100644
--- a/sysutils/clonehdd/pkg-message
+++ b/sysutils/clonehdd/pkg-message
@@ -1,9 +1,11 @@
-----------------------------------------------------------------------
-## ATTENTION! ## ATTENTION! ## ATTENTION! ##
-
+[
+{ type: install
+  message: <<EOM
 This tool can damage your data if you will use it without
 understanding how it works!
 Please, run "man clonehdd" or read README file.
 
 All questions you can ask on http://sourceforge.net/projects/clonehdd
-----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/clsync/files/pkg-message.in b/sysutils/clsync/files/pkg-message.in
index b282da39ed9f..ab1dc7ba0288 100644
--- a/sysutils/clsync/files/pkg-message.in
+++ b/sysutils/clsync/files/pkg-message.in
@@ -1,8 +1,10 @@
-------------------------------------------------------------------------------
-Author: Dmtiry Yu Okunev; e-mail: dyokunev@ut.mephi.ru; PGP: 0x8E30679C
+[
+{ type: install
+  message: <<EOM
 What's left:
 	1. Edit %%PREFIX%%/etc/clsync/clsync.conf
 	2. Set clsync_enable="YES" in /etc/rc.conf
 Start the program:  %%PREFIX%%/etc/rc.d/clsync start
-------------------------------------------------------------------------------
-
+EOM
+}
+]
diff --git a/sysutils/cmocka/pkg-message b/sysutils/cmocka/pkg-message
index fc61d55c82fc..ae189ecaac60 100644
--- a/sysutils/cmocka/pkg-message
+++ b/sysutils/cmocka/pkg-message
@@ -1,5 +1,7 @@
-=================================================================
-
+[
+{ type: install
+  message: <<EOM
 For more information on using cmocka, see https://api.cmocka.org
-
-=================================================================
+EOM
+}
+]
diff --git a/sysutils/cmockery2/pkg-message b/sysutils/cmockery2/pkg-message
index 0cc6380c87bb..aaf7c06b330a 100644
--- a/sysutils/cmockery2/pkg-message
+++ b/sysutils/cmockery2/pkg-message
@@ -1,6 +1,8 @@
-=================================================================
-
+[
+{ type: install
+  message: <<EOM
 For more information on cmockery2, documentation is available at
 https://github.com/lpabon/cmockery2/blob/master/doc/usage.md
-
-=================================================================
+EOM
+}
+]
diff --git a/sysutils/colorize/files/pkg-message.in b/sysutils/colorize/files/pkg-message.in
index ffb1c97cddcf..552f03a42c58 100644
--- a/sysutils/colorize/files/pkg-message.in
+++ b/sysutils/colorize/files/pkg-message.in
@@ -1,5 +1,9 @@
----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To customize the colorize utility, you can make changes to
     %%PREFIX%%/etc/colorizerc
 or user-specific changes in ~/.colorizerc
----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/condor/files/pkg-message.in b/sysutils/condor/files/pkg-message.in
index 66822d93c1ac..d4d63544720d 100644
--- a/sysutils/condor/files/pkg-message.in
+++ b/sysutils/condor/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Edit %%PREFIX%%/etc/condor_config.local to taste to get started.
 
 Settings in condor_config.local override the defaults in condor_config.
@@ -15,4 +17,6 @@ To start the condor daemons, add 'condor_enable="YES"' to
 and run
 
 	service condor start
-
+EOM
+}
+]
diff --git a/sysutils/cpupdate/files/pkg-message.in b/sysutils/cpupdate/files/pkg-message.in
index 7f13dead3a38..c1b400fd6afc 100644
--- a/sysutils/cpupdate/files/pkg-message.in
+++ b/sysutils/cpupdate/files/pkg-message.in
@@ -1,4 +1,6 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+[
+{ type: install
+  message: <<EOM
 NOTE: The following directories
 
 %%CPM_DIR%%
@@ -9,7 +11,9 @@ if you have just built the port with corresponding CPM/INTEL option(s) enabled.
 In this case you can run "make install-microcodes" to install them to
 
 %%DATADIR%%
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 Suspend/resume sequence clears microcode update, so make sure your system runs
 "service cpupdate start" again on resume.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/sysutils/debootstrap/pkg-message b/sysutils/debootstrap/pkg-message
index 697d07996ac4..3bc006c5700f 100644
--- a/sysutils/debootstrap/pkg-message
+++ b/sysutils/debootstrap/pkg-message
@@ -1,5 +1,10 @@
-*** NOTE ***
+[
+{ type: install
+  message: <<EOM
 To successfully create an installation of Debian GNU/kFreeBSD
 debootstrap requires the following kernel modules loaded:
 
 fdescfs linprocfs linsysfs tmpfs
+EOM
+}
+]
diff --git a/sysutils/devcpu-data/pkg-message b/sysutils/devcpu-data/pkg-message
index e896ac222ec1..b645f50bc138 100644
--- a/sysutils/devcpu-data/pkg-message
+++ b/sysutils/devcpu-data/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Installing this port will allow host startup to update the CPU microcode on 
 a FreeBSD system automatically.  There are two methods for updating CPU
 microcode: the first methods loads and applies the update before the kernel
@@ -38,3 +41,6 @@ Updating CPU Microcode...
 /usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl4 from rev 0x17 to rev 0x22... done.
 /usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl6 from rev 0x17 to rev 0x22... done.
 Done.
+EOM
+}
+]
diff --git a/sysutils/docker-freebsd/pkg-message b/sysutils/docker-freebsd/pkg-message
index bd81519739ec..2d66be114f9b 100644
--- a/sysutils/docker-freebsd/pkg-message
+++ b/sysutils/docker-freebsd/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Docker requires a bit of setup before usage.
 
 You will need to create a ZFS dataset on /usr/docker
@@ -19,3 +21,6 @@ Where $iface is the default NIC on the system, or the value
 of $docker_nat_iface. This is for network connectivity to docker
 containers in this early port. This should not be needed in future
 versions of docker.
+EOM
+}
+]
diff --git a/sysutils/docker/pkg-message b/sysutils/docker/pkg-message
index 9af3fe6fd0e6..ceaa00075c1f 100644
--- a/sysutils/docker/pkg-message
+++ b/sysutils/docker/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 This port contains Docker client only.
 For Docker server support, install docker-machine.
+EOM
+}
+]
diff --git a/sysutils/doinkd/pkg-message b/sysutils/doinkd/pkg-message
index 4b30e9e37261..92517369d900 100644
--- a/sysutils/doinkd/pkg-message
+++ b/sysutils/doinkd/pkg-message
@@ -1,8 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Idled Copyright (c) 1995-1996  Mike Crider (crider@cs.hope.edu)
 All rights reserved.
 
-*****************************************************************
-*****************************************************************
 
 REDISTRIBUTION AND USE IN SOURCE AND BINARY FORMS FOR NON-PROFIT
 USE ARE PERMITTED PROVIDED THAT:
@@ -33,6 +34,6 @@ requests for modification of this program, please contact:
 
       Mike Crider
       crider@cs.hope.edu
-
-*****************************************************************
-*****************************************************************
+EOM
+}
+]
diff --git a/sysutils/downtimed/pkg-message b/sysutils/downtimed/pkg-message
index d4d726da55a7..8445866c2450 100644
--- a/sysutils/downtimed/pkg-message
+++ b/sysutils/downtimed/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ===> IMPORTANT NOTE:
 
     To set up downtimed, you need to edit one of the following
@@ -11,3 +14,6 @@
 
     Add the following line to change the default options, see downtimed(8):
         downtimed_flags="<set as needed>"
+EOM
+}
+]
diff --git a/sysutils/dsbbatmon/pkg-message b/sysutils/dsbbatmon/pkg-message
index 685e3b4b128b..ca7e7c7ada3d 100644
--- a/sysutils/dsbbatmon/pkg-message
+++ b/sysutils/dsbbatmon/pkg-message
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 In order to be able to execute shutdown as regular user, you can either
 use sudo(8) (see below), or you can add your username to the operator
 group:
@@ -14,5 +15,6 @@ to ${PREFIX}/etc/sudoers.
 
 NOTE: On FreeBSD >= 12, members of the operator group are allowed to
       suspend the system via acpiconf(8). Using sudo(8) is not necessary.
-
-**************************************************************************
+EOM
+}
+]
diff --git a/sysutils/dsblogoutmgr/pkg-message b/sysutils/dsblogoutmgr/pkg-message
index 5c7097e36ae7..1432a58903b9 100644
--- a/sysutils/dsblogoutmgr/pkg-message
+++ b/sysutils/dsblogoutmgr/pkg-message
@@ -1,6 +1,8 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please read the manual page (man dsblogoutmgr) to learn how to configure
 DSBLogoutmgr.
-
-**************************************************************************
+EOM
+}
+]
diff --git a/sysutils/duplicity/pkg-message b/sysutils/duplicity/pkg-message
index 4f191389c897..18762697c34c 100644
--- a/sysutils/duplicity/pkg-message
+++ b/sysutils/duplicity/pkg-message
@@ -1,26 +1,29 @@
-*************************************************************************
-* The following backends are supported by duplicity itself, but will    *
-* require manual installation of their respective dependencies because  *
-* they are not yet available in the ports tree:                         *
-*                                                                       *
-*   - The Dropbox backend                                               *
-*   - The HSI backend                                                   *
-*   - The mega backend for mega.co.nz                                   *
-*   - The swift backend for OpenStack Object Storage                    *
-*   - The tahoe backend for Tahoe-LAFS                                  *
-*                                                                       *
-* Please refer to upstream duplicity documentation for information on   *
-* the use of these backends.                                            *
-*************************************************************************
-*                                                                       *
-* For gnupg 2 insert "pinentry-mode loopback" into ~/.gnupg/gpg.conf    *
-* and "allow-loopback-pinentry" into ~/.gnupg/gpg-agent.conf            *
-*                                                                       *
-*************************************************************************
-*                                                                       *
-* Some fixes related to gnupg handling were made in v0.7.12.            *
-*                                                                       *
-* Please visit the following URL for more information:                  *
-* http://duplicity.nongnu.org/CHANGELOG                                 *
-*                                                                       *
-*************************************************************************
+[
+{ type: install
+  message: <<EOM
+ The following backends are supported by duplicity itself, but will
+ require manual installation of their respective dependencies because
+ they are not yet available in the ports tree:
+
+   - The Dropbox backend
+   - The HSI backend
+   - The mega backend for mega.co.nz
+   - The swift backend for OpenStack Object Storage
+   - The tahoe backend for Tahoe-LAFS
+
+ Please refer to upstream duplicity documentation for information on
+ the use of these backends.
+
+
+ For gnupg 2 insert "pinentry-mode loopback" into ~/.gnupg/gpg.conf
+ and "allow-loopback-pinentry" into ~/.gnupg/gpg-agent.conf
+
+
+
+ Some fixes related to gnupg handling were made in v0.7.12.
+
+ Please visit the following URL for more information:
+ http://duplicity.nongnu.org/CHANGELOG
+EOM
+}
+]
diff --git a/sysutils/duply/files/pkg-message.in b/sysutils/duply/files/pkg-message.in
index fe1966a2edd6..7630554d4ff9 100644
--- a/sysutils/duply/files/pkg-message.in
+++ b/sysutils/duply/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 	To run duply periodically you can add these options to your
 	/etc/periodic.conf or /etc/periodic.conf.local
 
@@ -23,3 +25,6 @@
 
 	Add these lines to your /etc/crontab
 	10	3	*	*	*	root	periodic backup
+EOM
+}
+]
diff --git a/sysutils/dvdisaster/files/pkg-message.in b/sysutils/dvdisaster/files/pkg-message.in
index 29dbe67a15bb..78d475d8d7cd 100644
--- a/sysutils/dvdisaster/files/pkg-message.in
+++ b/sysutils/dvdisaster/files/pkg-message.in
@@ -1,8 +1,12 @@
-----------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 If there are problems detecting optical drives, please see the files
 DEVICES.md or DEVICES.html in the directory:
 	 %%DOCSDIR%%
 
 Note that the documentation option (DOCS) must be selected for these
 files to be installed.
-----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/e2fsprogs/pkg-message b/sysutils/e2fsprogs/pkg-message
index fb054e0f5c00..8bc2492b8c54 100644
--- a/sysutils/e2fsprogs/pkg-message
+++ b/sysutils/e2fsprogs/pkg-message
@@ -1,5 +1,9 @@
-===========================================================================
+[
+{ type: install
+  message: <<EOM
 Note: this is a modified version of the e2fsprogs package, not the official
 package. Report all building and run-time trouble that originates in the
 package to the port maintainer, mandree@FreeBSD.org.
-===========================================================================
+EOM
+}
+]
diff --git a/sysutils/eject/pkg-message b/sysutils/eject/pkg-message
index 991dd8dacc0a..bc2c89c180ce 100644
--- a/sysutils/eject/pkg-message
+++ b/sysutils/eject/pkg-message
@@ -1,8 +1,12 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 NOTE: This port is no longer installed with SETUID, because it allows
 non-privileged users to unmount a filesystem. To enable your users to
 eject the CD-ROM, install security/sudo and enter the following line in
 /usr/local/etc/sudoers:
 
 %users ALL=/usr/local/sbin/eject /dev/acd0
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/env4801/files/pkg-message.in b/sysutils/env4801/files/pkg-message.in
index 0df42d546ea4..dc63b757516a 100644
--- a/sysutils/env4801/files/pkg-message.in
+++ b/sysutils/env4801/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-================================================================
+[
+{ type: install
+  message: <<EOM
 This port installed %%PREFIX%%/etc/rc.d/env4801.sh to initialize
 the hardware at boot time. The env4801 utility will only run on
 a Soekris Engineering Net4801 device. See pkg-descr for more
@@ -7,4 +8,6 @@ information as currently there is no manpage.
 
 Make sure you have /dev/io enabled by putting io_load="YES" in
 /boot/loader.conf or device io in your kernel config file.
-================================================================
+EOM
+}
+]
diff --git a/sysutils/fcron/files/pkg-message.in b/sysutils/fcron/files/pkg-message.in
index 04257be00f2b..6003e2a9841c 100644
--- a/sysutils/fcron/files/pkg-message.in
+++ b/sysutils/fcron/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 To enable fcron, and disable the default system cron, add the following lines
 to your /etc/rc.conf:
 
@@ -11,4 +13,6 @@ and move any jobs in /etc/crontab to the root fcrontab(5) file. See:
 
 for a translation of the default FreeBSD /etc/crontab, and for sample PAM
 configuration files.
-===============================================================================
+EOM
+}
+]
diff --git a/sysutils/feather/files/pkg-message.in b/sysutils/feather/files/pkg-message.in
index ce9455a7c3c4..8156116881aa 100644
--- a/sysutils/feather/files/pkg-message.in
+++ b/sysutils/feather/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Feather is designed to be run from cron like this:
 
     */5 * * * * %%PREFIX%%/bin/feather %%PREFIX%%/etc/feather.yaml
@@ -7,5 +8,6 @@ Feather is designed to be run from cron like this:
 If installed, please check the contents of %%DOCSDIR%%/README
 for the syntax of the YAML file, as well as the sample file at
 %%PREFIX%%/etc/feather.yaml.dist.
-
-*****************************************************************
+EOM
+}
+]
diff --git a/sysutils/filewatcherd/files/pkg-message.in b/sysutils/filewatcherd/files/pkg-message.in
index ea28c51c6d98..fd9493e7c84e 100644
--- a/sysutils/filewatcherd/files/pkg-message.in
+++ b/sysutils/filewatcherd/files/pkg-message.in
@@ -1,4 +1,6 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 filwatcherd configuration files were installed in the following directory:
 
 	%%PREFIX%%
@@ -22,4 +24,6 @@ following steps:
 Then you can start filewatcherd by issuing the following command:
 
 	service filewatcherd start
-========================================================================
+EOM
+}
+]
diff --git a/sysutils/flexbackup/files/pkg-message.in b/sysutils/flexbackup/files/pkg-message.in
index a1dd3d0a7898..1f28d3a9c3be 100644
--- a/sysutils/flexbackup/files/pkg-message.in
+++ b/sysutils/flexbackup/files/pkg-message.in
@@ -1,5 +1,6 @@
---------------- Flexbackup Configuration Information ---------------
-
+[
+{ type: install
+  message: <<EOM
 Flexbackup needs to have its configuration file placed in
 %%PREFIX%%/etc.  A template copy of this configuration file
 has been installed into
@@ -17,13 +18,9 @@ NOTE: The flexbackup.conf file will not be removed or overwritten
       by future package removals or upgrades once you have
       customized it.
 
-***************************************************************
-**   Changes have occurred in this file up to and including  **
-**   version 1.2.0!                                          **
-***************************************************************
-
 Also see %%PREFIX%%/share/doc/flexbackup/README
 for more information on how to use flexbackup. Man pages have
 also been written and included in this version of the port!
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/freebsd-snapshot/files/pkg-message.in b/sysutils/freebsd-snapshot/files/pkg-message.in
index 73e95f3a4732..a98d6b65f5ad 100644
--- a/sysutils/freebsd-snapshot/files/pkg-message.in
+++ b/sysutils/freebsd-snapshot/files/pkg-message.in
@@ -1,6 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 Using periodic for flexible snapshot backup creation
-----------------------------------------------------
+
 
 Edit your crontab and include this:
 
@@ -15,13 +17,16 @@ and edit your periodic.conf and include this:
 snapshot_enable="YES"
 snapshot_schedule="/,/usr:2:1:0 /var:0:2:4 /home:2:6:8@8,12,16,20"
 
-----
+
 
 Using auto-mount for easy access to snapshot data
---------------------------------------------------
+
 
 Edit your rc.conf and include this:
 
 # UFS2/ZFS Snapshot Access
 amd_enable="YES"
 amd_flags="-a /.am -c 1800 -w 60 -l syslog /snap %%PREFIX%%/etc/amd.map.snap"
+EOM
+}
+]
diff --git a/sysutils/freesbie/pkg-message b/sysutils/freesbie/pkg-message
index 59d7fa4cb857..d7cbe07d92a7 100644
--- a/sysutils/freesbie/pkg-message
+++ b/sysutils/freesbie/pkg-message
@@ -1,5 +1,9 @@
-===========================================================================
+[
+{ type: install
+  message: <<EOM
 Note that the FreeSBIE project is not actively maintained. There were no
 upstream releases since 2007. If you are a regular user of this port,
 please consider adopting the upstream project.
-===========================================================================
+EOM
+}
+]
diff --git a/sysutils/froxlor/files/pkg-message.in b/sysutils/froxlor/files/pkg-message.in
index fa216ec580ba..e9a078a56589 100644
--- a/sysutils/froxlor/files/pkg-message.in
+++ b/sysutils/froxlor/files/pkg-message.in
@@ -1,6 +1,6 @@
-
--------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 Please visit froxlor's website for more information.
 
 You will want to check and eventually modify some of
@@ -14,4 +14,6 @@ for more information.
 Froxlor has been installed to the following location:
 
   %%WWWDIR%%
--------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/fusefs-afuse/files/pkg-message.in b/sysutils/fusefs-afuse/files/pkg-message.in
index c5e420f09692..bf89bc245d9b 100644
--- a/sysutils/fusefs-afuse/files/pkg-message.in
+++ b/sysutils/fusefs-afuse/files/pkg-message.in
@@ -1,7 +1,8 @@
-
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Additional info about program usage can be found at
 %%DOCSDIR%%/README.
-
-===============================================================================
+EOM
+}
+]
diff --git a/sysutils/fusefs-ext4fuse/pkg-message b/sysutils/fusefs-ext4fuse/pkg-message
index 7450c30f7720..91876b9b8025 100644
--- a/sysutils/fusefs-ext4fuse/pkg-message
+++ b/sysutils/fusefs-ext4fuse/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Please note that that this port only supports ext4 in read-only mode.
 You might want to consider using sysutils/fusefs-ext2 which supports
 ext2, ext3 and ext4 with read write support.
+EOM
+}
+]
diff --git a/sysutils/fusefs-ifuse/pkg-message b/sysutils/fusefs-ifuse/pkg-message
index 687c92fa9261..d0087f79ebe9 100644
--- a/sysutils/fusefs-ifuse/pkg-message
+++ b/sysutils/fusefs-ifuse/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 To mount your iGadget you first need to launch usbmuxd; see...
 
 $ usbmuxd --help
@@ -10,5 +11,6 @@ $ usbmuxd --help
 
 After that, you'll be able to reach its files and use, e.g., gtkpod to
 add/delete music/pictures.
-
-======================================================================
+EOM
+}
+]
diff --git a/sysutils/fusefs-libs/pkg-message b/sysutils/fusefs-libs/pkg-message
index 13b7f2ee9224..d40be03aa3ab 100644
--- a/sysutils/fusefs-libs/pkg-message
+++ b/sysutils/fusefs-libs/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Install the fuse kernel module to use this port.
+EOM
+}
+]
diff --git a/sysutils/fusefs-libs3/pkg-message b/sysutils/fusefs-libs3/pkg-message
index 13b7f2ee9224..d40be03aa3ab 100644
--- a/sysutils/fusefs-libs3/pkg-message
+++ b/sysutils/fusefs-libs3/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Install the fuse kernel module to use this port.
+EOM
+}
+]
diff --git a/sysutils/fusefs-ntfs/files/pkg-message.in b/sysutils/fusefs-ntfs/files/pkg-message.in
index 8294b7a9c301..35df9fe32ec7 100644
--- a/sysutils/fusefs-ntfs/files/pkg-message.in
+++ b/sysutils/fusefs-ntfs/files/pkg-message.in
@@ -1,10 +1,12 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 NTFS-3G has been installed, for information, known issues and how to report
 bugs see the FreeBSD README:
 
 %%DOCSDIR%%/README.FreeBSD
 
 Also see the official README (but has some Linux specific parts).
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/fusefs-s3fs/pkg-message b/sysutils/fusefs-s3fs/pkg-message
index 062705179678..3a5515ed080d 100644
--- a/sysutils/fusefs-s3fs/pkg-message
+++ b/sysutils/fusefs-s3fs/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 The usage of s3fs can be found at http://code.google.com/p/s3fs/wiki/FuseOverAmazon if you want to understand it.
+EOM
+}
+]
diff --git a/sysutils/fusefs-sandboxfs/pkg-message b/sysutils/fusefs-sandboxfs/pkg-message
index d4c535d32842..7ec584f0028f 100644
--- a/sysutils/fusefs-sandboxfs/pkg-message
+++ b/sysutils/fusefs-sandboxfs/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 WARNING: The interaction points with sandboxfs are subject to change
 at this point.  In particular, the command-line interface and the
 data format used to reconfigure sandboxfs while it's running will
 most certainly change.
+EOM
+}
+]
diff --git a/sysutils/fusefs-smbnetfs/files/pkg-message.in b/sysutils/fusefs-smbnetfs/files/pkg-message.in
index 6bcdb286390b..e538fe6f2207 100644
--- a/sysutils/fusefs-smbnetfs/files/pkg-message.in
+++ b/sysutils/fusefs-smbnetfs/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ===>  Basic Instructions:
 
 After kldload fuse.ko and setting
@@ -19,3 +22,6 @@ Now you can get access to smb shares in your network, for example:
 
 XXX Note, use of Gnome keyring was replaced in version 0.6.1 with
 XXX libsecret, which this port does not enable by default.
+EOM
+}
+]
diff --git a/sysutils/fusefs-sqlfs/pkg-message b/sysutils/fusefs-sqlfs/pkg-message
index dacb37bc338c..7d5fccea8529 100644
--- a/sysutils/fusefs-sqlfs/pkg-message
+++ b/sysutils/fusefs-sqlfs/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Now sqlfs filesystem is installed.
 You can mount it by issuing
 % sqlfs -o /path/to/sqlite/database /path/to/mountpoint
@@ -7,5 +8,6 @@ You can mount it by issuing
 Alternatively you can supply database name via SQLFS_DBNAME env variable
 
 For additional information see supplied documentation.
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/fusefs-sshfs/pkg-message b/sysutils/fusefs-sshfs/pkg-message
index c5859c9bfd66..187edabe7faf 100644
--- a/sysutils/fusefs-sshfs/pkg-message
+++ b/sysutils/fusefs-sshfs/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Basic Instructions:
 There are three ways to do this:
 
@@ -18,3 +21,6 @@ or
 % mount_fusefs /dev/fuse0 /path/to/mount/point
 
 For further options see ``sshfs -h''.
+EOM
+}
+]
diff --git a/sysutils/fusefs-unionfs/files/pkg-message.in b/sysutils/fusefs-unionfs/files/pkg-message.in
index 69e13810a121..4859a839c805 100644
--- a/sysutils/fusefs-unionfs/files/pkg-message.in
+++ b/sysutils/fusefs-unionfs/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You will need to load the kernel module 'fuse' to use this package. To load
 this at boot time, add the following line to /boot/loader.conf:
 
@@ -12,3 +15,6 @@ You can enable them immediately with:
 
 kldload fuse
 sysctl vfs.usermount=1
+EOM
+}
+]
diff --git a/sysutils/fusefs-webdavfs/files/pkg-message.in b/sysutils/fusefs-webdavfs/files/pkg-message.in
index 9ac1287a1145..8e9299bcae14 100644
--- a/sysutils/fusefs-webdavfs/files/pkg-message.in
+++ b/sysutils/fusefs-webdavfs/files/pkg-message.in
@@ -1,8 +1,10 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+[
+{ type: install
+  message: <<EOM
 Make sure you have fuse.ko loaded then use mount.webdavfs command
 or add an entry to the /etc/fstab such as:
 
 https://webdav.server.net/path /mnt/path fusefs rw,late,mountprog=%%PREFIX%%/sbin/mount_webdavfs,username=login,password=pass,-F=/var/tmp/trace.log,-T=webdav,-T=httpreq,-T=httphdr 0 0
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/sysutils/fvcool/files/pkg-message.in b/sysutils/fvcool/files/pkg-message.in
index b825562157ae..0dc7c44013fe 100644
--- a/sysutils/fvcool/files/pkg-message.in
+++ b/sysutils/fvcool/files/pkg-message.in
@@ -1,5 +1,6 @@
-===> How to enable the %%PORTNAME%% package
-
+[
+{ type: install
+  message: <<EOM
     If you want to invoke %%PORTNAME%% automatically on system startup,
     add the following line to /etc/rc.conf:
 
@@ -19,3 +20,6 @@
     Also note that this software is supposed to be used with AMD
     Athlon (XP) an AMD Duron processors only.
 
+EOM
+}
+]
diff --git a/sysutils/ganglia-monitor-core/files/pkg-message.in b/sysutils/ganglia-monitor-core/files/pkg-message.in
index 98a3fae964c4..98cdf28ab2c7 100644
--- a/sysutils/ganglia-monitor-core/files/pkg-message.in
+++ b/sysutils/ganglia-monitor-core/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 First-time configuration:
 
 Edit %%PREFIX%%/etc/gmond.conf
@@ -9,5 +9,6 @@ to suit your network.
 
 To enable services, set gmond_enable/gmond_flags and/or
 gmetad_enable/gmetad_flags in /etc/rc.conf.
-
-======================================================================
+EOM
+}
+]
diff --git a/sysutils/ganglia-webfrontend/files/pkg-message.in b/sysutils/ganglia-webfrontend/files/pkg-message.in
index ba1b586774d5..0132fd030991 100644
--- a/sysutils/ganglia-webfrontend/files/pkg-message.in
+++ b/sysutils/ganglia-webfrontend/files/pkg-message.in
@@ -1,5 +1,6 @@
-****************************************************************
-
+[
+{ type: install
+  message: <<EOM
 The Ganglia Web Frontend has been installed in the directory
 %%WWWDIR%%.
 
@@ -37,5 +38,6 @@ The default configuration is stored in
 %%WWWDIR%%/conf_default.php.
 If you want to customize the configuration make customizations to
 %%WWWDIR%%/conf.php .
-
-****************************************************************
+EOM
+}
+]
diff --git a/sysutils/gapcmon/files/pkg-message.in b/sysutils/gapcmon/files/pkg-message.in
index 55e18d3e111c..d5e0aa1b97fb 100644
--- a/sysutils/gapcmon/files/pkg-message.in
+++ b/sysutils/gapcmon/files/pkg-message.in
@@ -1,7 +1,11 @@
-*******************************************************************************
+[
+{ type: install
+  message: <<EOM
  GapcMon requires apcupsd's Network Information Service (NIS) even for local
  installations.  You may enable apcupsd's NIS by adding the following line
  to your %%LOCALBASE%%/etc/apcupsd/apcupsd.conf:
 
  NETSERVER on
-*******************************************************************************
+EOM
+}
+]
diff --git a/sysutils/gather/files/pkg-message.in b/sysutils/gather/files/pkg-message.in
index 55248905978c..a9ba63018cc8 100644
--- a/sysutils/gather/files/pkg-message.in
+++ b/sysutils/gather/files/pkg-message.in
@@ -1,5 +1,6 @@
-**********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To setup statistics gathering you could e.g. add something like this
 to /etc/crontab:
 
@@ -19,5 +20,6 @@ After setting cron up, you can check if gathering works running:
   gather show -t 1h grep . uptime
 
 See gather(1) and %%DOCSDIR%%/README for more details.
-
-**********************************************************************
+EOM
+}
+]
diff --git a/sysutils/gdisk/pkg-message b/sysutils/gdisk/pkg-message
index 739ff4381059..2cdfec886b5a 100644
--- a/sysutils/gdisk/pkg-message
+++ b/sysutils/gdisk/pkg-message
@@ -1,6 +1,6 @@
-###############################################################
-!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!
-
+[
+{ type: install
+  message: <<EOM
         PLEASE, READ DOCUMENTATION BEFORE USE
 
 See `man gdisk' , `man cgdisk', `man sgdisk', `man fixparts'.
@@ -9,5 +9,6 @@ Any errors in usage gdisk (cgdisk, sgdisk, fixparts) or
 not understanding of that you do, can call loss of your data.
 Make a backup copy of all data of a disk before you use
 these programs for its processing.
-
-###############################################################
+EOM
+}
+]
diff --git a/sysutils/geomWatch/files/pkg-message.in b/sysutils/geomWatch/files/pkg-message.in
index 467d51193c8b..346e572a274c 100644
--- a/sysutils/geomWatch/files/pkg-message.in
+++ b/sysutils/geomWatch/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Before starting geomWatch, you should edit its configuration file,
 %%PREFIX%%/etc/geomWatch.conf. Then, add the following line to /etc/rc.conf:
 
@@ -11,4 +13,6 @@ Finally, to start it, run the following command:
 You can also test your SMTP configuration by running the following command:
 
 %%PREFIX%%/sbin/geomWatch -t
-
+EOM
+}
+]
diff --git a/sysutils/getdelta/files/pkg-message.in b/sysutils/getdelta/files/pkg-message.in
index 8403e319b8d8..96e451a0eda7 100644
--- a/sysutils/getdelta/files/pkg-message.in
+++ b/sysutils/getdelta/files/pkg-message.in
@@ -1,8 +1,11 @@
-=========================================================================================
-ATTENTION!
+[
+{ type: install
+  message: <<EOM
 To use Getdelta for upgrading ports you need to add the following string into /etc/make.conf:
 FETCH_CMD=%%PREFIX%%/bin/getdelta.sh
 
 To do this you can simply run the following command:
 echo "FETCH_CMD=%%PREFIX%%/bin/getdelta.sh" >> /etc/make.conf
-=========================================================================================
+EOM
+}
+]
diff --git a/sysutils/gkrelltop/pkg-message b/sysutils/gkrelltop/pkg-message
index 5d8acb93f443..cbaf87d0fc40 100644
--- a/sysutils/gkrelltop/pkg-message
+++ b/sysutils/gkrelltop/pkg-message
@@ -1,8 +1,12 @@
-*
-* This port requires /proc to be mounted,
-* if it is not already please add the following to fstab:
-*
-* proc            /proc   procfs  rw 0 0
-*
-* and mount /proc.
-*
+[
+{ type: install
+  message: <<EOM
+ This port requires /proc to be mounted,
+ if it is not already please add the following to fstab:
+
+ proc            /proc   procfs  rw 0 0
+
+ and mount /proc.
+EOM
+}
+]
diff --git a/sysutils/goss/pkg-message b/sysutils/goss/pkg-message
index a589e5a2571d..7d6dcd5a22f7 100644
--- a/sysutils/goss/pkg-message
+++ b/sysutils/goss/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 WARNING: goss is not yet fully functional on FreeBSD.
 See https://github.com/aelsabbahy/goss/issues/26 for details.
+EOM
+}
+]
diff --git a/sysutils/graylog/files/pkg-message.in b/sysutils/graylog/files/pkg-message.in
index 34d9075945f7..19d08ac1d41d 100644
--- a/sysutils/graylog/files/pkg-message.in
+++ b/sysutils/graylog/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 Please see %%ETCDIR%% for sample versions of graylog.conf, log4j.xml, and
 and adjust them for your configuration.
 
@@ -17,3 +18,6 @@ And ensure that the elasticsearch cluster name matches that used by graylog.
 
 The locations for configuration files have changed to match upstream
 versions in 3.0 of this port, refer to UPDATING for migration steps.
+EOM
+}
+]
diff --git a/sysutils/grub2/pkg-message b/sysutils/grub2/pkg-message
index 29a352b80b6e..81092db7f468 100644
--- a/sysutils/grub2/pkg-message
+++ b/sysutils/grub2/pkg-message
@@ -1,4 +1,6 @@
-#############################################################
+[
+{ type: install
+  message: <<EOM
 To install GRUB on the master boot record of your hard drive
 use 'grub-install <drive-to-install>' command.
 
@@ -8,4 +10,6 @@ menuentry "FreeBSD" {
 	kfreebsd /boot/loader
 }
 Or use grub-mkconfig to create the config file.
-#############################################################
+EOM
+}
+]
diff --git a/sysutils/gsh/files/pkg-message.in b/sysutils/gsh/files/pkg-message.in
index c2010f23b944..2d7a59873905 100644
--- a/sysutils/gsh/files/pkg-message.in
+++ b/sysutils/gsh/files/pkg-message.in
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 To use gsh
 
 %%ETCDIR%%/ghosts
@@ -6,4 +8,6 @@ To use gsh
 should be created.
 
 Refer to ghosts(1).
-============================================================
+EOM
+}
+]
diff --git a/sysutils/healthd/files/pkg-message.in b/sysutils/healthd/files/pkg-message.in
index 97c669ec0602..e280d7b21080 100644
--- a/sysutils/healthd/files/pkg-message.in
+++ b/sysutils/healthd/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 It is recommended to edit %%PREFIX%%/etc/healthd.conf
 so it match the monitored system before running the program.
+EOM
+}
+]
diff --git a/sysutils/heartbeat/files/pkg-message.in b/sysutils/heartbeat/files/pkg-message.in
index c4758d608e70..e2fd4e86b48c 100644
--- a/sysutils/heartbeat/files/pkg-message.in
+++ b/sysutils/heartbeat/files/pkg-message.in
@@ -1,12 +1,6 @@
-
-#                                                      #
-##                                                    ##
-###                                                  ###
-########################################################
-###                                                  ###
-##                                                    ##
-#                                                      #
-
+[
+{ type: install
+  message: <<EOM
     CONFIGURATION:
     - Please read the below site for configuration
       changes between version 1 and 2.
@@ -21,12 +15,6 @@
     CAVEATS:
     - bcast is not available on FreeBSD.
     - BasicSanityCheck is not available on FreeBSD.
-
-#                                                      #
-##                                                    ##
-###                                                  ###
-########################################################
-###                                                  ###
-##                                                    ##
-#                                                      #
-
+EOM
+}
+]
diff --git a/sysutils/helm/pkg-message b/sysutils/helm/pkg-message
index 5195aaa9f0fe..76175cd7e248 100644
--- a/sysutils/helm/pkg-message
+++ b/sysutils/helm/pkg-message
@@ -1 +1,7 @@
-If you are upgrading, be sure to upgrade Tiller with 'helm init --upgrade'.
+[
+{ type: upgrade
+  message: <<EOM
+Be sure to upgrade Tiller with 'helm init --upgrade'.
+EOM
+}
+]
diff --git a/sysutils/hfm/pkg-message b/sysutils/hfm/pkg-message
index d56d78df9890..075e2e3d7ba4 100644
--- a/sysutils/hfm/pkg-message
+++ b/sysutils/hfm/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 hfm includes an rc.d script to control a daemon mode.  Use:
 
 sysrc hfm_enable=yes
 
 to enable.
+EOM
+}
+]
diff --git a/sysutils/hilite/pkg-message b/sysutils/hilite/pkg-message
index aa01f53f0d7c..403de002904d 100644
--- a/sysutils/hilite/pkg-message
+++ b/sysutils/hilite/pkg-message
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 You might want to put something like
 
 .if defined(HILITE)
@@ -7,4 +9,6 @@ CXX=	hilite c++
 .endif
 
 in your /etc/make.conf
-===============================================================================
+EOM
+}
+]
diff --git a/sysutils/intel-nvmupdate/pkg-message b/sysutils/intel-nvmupdate/pkg-message
index e435dd50c597..a5d27582fc82 100644
--- a/sysutils/intel-nvmupdate/pkg-message
+++ b/sysutils/intel-nvmupdate/pkg-message
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 THIS PACKAGE INSTALLS THE NEWER VERSION OF THE SOFTWARE WHICH CAN CAUSE SYSTEM
 INSTABILITY WHILE USED. USE THE UPDATED VERSION ONLY IF YOU EXPERIENCE
 PROBLEMS WITH THE PRESENT NVM IMAGE VERSION
@@ -23,5 +24,6 @@ Usage:
 
 Getting help:
 # nvmupdate -h
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/intel-qcu/pkg-message b/sysutils/intel-qcu/pkg-message
index 808f88a27e60..b278501d7f2c 100644
--- a/sysutils/intel-qcu/pkg-message
+++ b/sysutils/intel-qcu/pkg-message
@@ -1,9 +1,11 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 For the package to function properly please make sure you have latest ixl driver
 installed. If necessary - install the updated version from net/intel-ixl-kmod
 
 Getting help:
 # qcu /?
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/ipad_charge/files/pkg-message.in b/sysutils/ipad_charge/files/pkg-message.in
index 2d6b51f67973..11519f61ceaf 100644
--- a/sysutils/ipad_charge/files/pkg-message.in
+++ b/sysutils/ipad_charge/files/pkg-message.in
@@ -1,4 +1,6 @@
-*********************************************************************
+[
+{ type: install
+  message: <<EOM
 1) add ipad_charge_enable="YES" and optionally
    ipad_charge_action="ON" (default) or "OFF" .
 
@@ -7,5 +9,6 @@ to your /etc/rc.conf
 2) Please restart devd as the configuration changed
 
 	# service devd restart
-
-*********************************************************************
+EOM
+}
+]
diff --git a/sysutils/isc-cron/files/pkg-message.in b/sysutils/isc-cron/files/pkg-message.in
index e837c2b50c48..2a945cbb21a6 100644
--- a/sysutils/isc-cron/files/pkg-message.in
+++ b/sysutils/isc-cron/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please add
 
 	cron_program="%%PREFIX%%/sbin/cron"
@@ -6,3 +9,6 @@ to your /etc/rc.conf to enable the ISC cron instead of the base
 Vixie cron.
 
 Please use %%PREFIX%%/bin/crontab to edit the users crontab.
+EOM
+}
+]
diff --git a/sysutils/istatserver/files/pkg-message.in b/sysutils/istatserver/files/pkg-message.in
index f181f859262e..e2600e7bb77e 100644
--- a/sysutils/istatserver/files/pkg-message.in
+++ b/sysutils/istatserver/files/pkg-message.in
@@ -1,7 +1,9 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 %%PREFIX%%/etc/istatserver/istatserver.conf is the daemon's configuration file.
 Please edit the "server_code" framework with a unique numeric code for your
 server.
-
-================================================================================
+EOM
+}
+]
diff --git a/sysutils/jail-primer/pkg-message b/sysutils/jail-primer/pkg-message
index 09beaf7bfa12..6f9bc050a2c3 100644
--- a/sysutils/jail-primer/pkg-message
+++ b/sysutils/jail-primer/pkg-message
@@ -1,10 +1,8 @@
-#
-#
-
+[
+{ type: install
+  message: <<EOM
 First issue "rehash" command to enable the jail-primer scripts (if using csh).
 Then issue "man jail-primer" to read about jail-primer usage.
-
-Note: Be sure you are at 10.0-RELEASE-p2
-
-#
-#
+EOM
+}
+]
diff --git a/sysutils/jstest-gtk/pkg-message b/sysutils/jstest-gtk/pkg-message
index ed441254b284..810d2216e331 100644
--- a/sysutils/jstest-gtk/pkg-message
+++ b/sysutils/jstest-gtk/pkg-message
@@ -1,7 +1,8 @@
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+[
+{ type: install
+  message: <<EOM
 Do not forget install webcamd with joystick support and run it,
 /dev/input/js* device is required.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/sysutils/k3b/pkg-message b/sysutils/k3b/pkg-message
index ebce8911437d..1c59ae898ea7 100644
--- a/sysutils/k3b/pkg-message
+++ b/sysutils/k3b/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 1. The FreeBSD k3b port supports SCSI drives only. If you have IDE CD or DVD
    drives, use them through the cam system. See Chapter 17.5.1 of the handbook
    (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html)
@@ -39,4 +42,6 @@
    a. Either use the (default) HAL backend, and enable HAL in /etc/rc.conf via
       # sysrc hald_enable="YES"
    b. *or* use the (experimental) BSDISKS backend.
-
+EOM
+}
+]
diff --git a/sysutils/lcdproc/files/pkg-message.in b/sysutils/lcdproc/files/pkg-message.in
index a347d773dc65..f5c105b1a22b 100644
--- a/sysutils/lcdproc/files/pkg-message.in
+++ b/sysutils/lcdproc/files/pkg-message.in
@@ -1,8 +1,12 @@
-==============================================================
+[
+{ type: install
+  message: <<EOM
 The default configuration files have been installed as
 %%PREFIX%%/etc/LCDd.conf.sample
 %%PREFIX%%/etc/lcdproc.conf.sample
 %%PREFIX%%/etc/lcdexec.conf.sample
 
 Copy and edit them as needed.
-==============================================================
+EOM
+}
+]
diff --git a/sysutils/linux-crashplan/pkg-message b/sysutils/linux-crashplan/pkg-message
index bab3ee9879e4..137dfe1d8f79 100644
--- a/sysutils/linux-crashplan/pkg-message
+++ b/sysutils/linux-crashplan/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For users upgrading from previous versions of CrashPlan, note that the headless
 mode configuration has been changed significantly and older clients will no
 longer connect. Please check the Code42 website for up to date instructions on
@@ -5,3 +8,6 @@ setting up a headless CrashPlan server.
 
 On FreeBSD, the authentication token file can be found in
 /compat/linux/var/lib/CrashPlan/.ui_info
+EOM
+}
+]
diff --git a/sysutils/lmon/pkg-message b/sysutils/lmon/pkg-message
index 0e41e32b3086..5827edfca7f8 100644
--- a/sysutils/lmon/pkg-message
+++ b/sysutils/lmon/pkg-message
@@ -1,7 +1,9 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 LMon is now installed in /usr/local/lmon. You need to create configuration and
 rulesets. See documentation under /usr/local/share/doc/lmon and examples under
 /usr/local/share/examples/lmon.
-
-================================================================================
+EOM
+}
+]
diff --git a/sysutils/log-courier/files/pkg-message.in b/sysutils/log-courier/files/pkg-message.in
index 4cf27894e619..e450c91b0eca 100644
--- a/sysutils/log-courier/files/pkg-message.in
+++ b/sysutils/log-courier/files/pkg-message.in
@@ -1,4 +1,6 @@
-=========================================================================
+[
+{ type: install
+  message: <<EOM
 If you want to run log-courier, add to /etc/rc.conf
 
 	log_courier_enable="YES"
@@ -6,4 +8,6 @@ If you want to run log-courier, add to /etc/rc.conf
 Do not forget to edit your configuration file:
 
 	Default: ${PREFIX}/etc/log-courier.conf
-=========================================================================
+EOM
+}
+]
diff --git a/sysutils/logstash-forwarder/files/pkg-message.in b/sysutils/logstash-forwarder/files/pkg-message.in
index cc32aa0a2f10..4912585315e8 100644
--- a/sysutils/logstash-forwarder/files/pkg-message.in
+++ b/sysutils/logstash-forwarder/files/pkg-message.in
@@ -1,4 +1,6 @@
-=========================================================================
+[
+{ type: install
+  message: <<EOM
 If you want to run logstash-forwarder, add to /etc/rc.conf
 
 	logstash_forwarder_enable="YES"
@@ -28,4 +30,6 @@ logstash-forwarder as well as the logstash instances receiving logs will
 require these files on disk to verify the authenticity of messages.
 
 PROTECT YOUR KEYS!
-=========================================================================
+EOM
+}
+]
diff --git a/sysutils/logstash5/pkg-message b/sysutils/logstash5/pkg-message
index 4add4e93a4c7..99c33f7ab57f 100644
--- a/sysutils/logstash5/pkg-message
+++ b/sysutils/logstash5/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To start logstash as an agent during startup, add
 
     logstash_enable="YES"
@@ -12,3 +15,6 @@ distribution.
 
 NOTE: Since version 2, logstash does not support an embedded
 ElasticSearch instance.
+EOM
+}
+]
diff --git a/sysutils/logstash6/pkg-message b/sysutils/logstash6/pkg-message
index 5bdbbef04281..e3329624980a 100644
--- a/sysutils/logstash6/pkg-message
+++ b/sysutils/logstash6/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To start logstash as an agent during startup, add
 
     logstash_enable="YES"
@@ -5,3 +8,6 @@ To start logstash as an agent during startup, add
 to your /etc/rc.conf.
 
 Extra options can be found in startup script.
+EOM
+}
+]
diff --git a/sysutils/logtool/pkg-message b/sysutils/logtool/pkg-message
index 9f37310c2a0a..cb54f27bcfce 100644
--- a/sysutils/logtool/pkg-message
+++ b/sysutils/logtool/pkg-message
@@ -1,9 +1,11 @@
-###########################################################################
-#
-# Sample configuration files are installed in
-#
-# 	PREFIX/share/examples/logtool
-#
-# Please copy them to PREFIX/etc/logtool and edit to suit your needs.
-#
-###########################################################################
+[
+{ type: install
+  message: <<EOM
+ Sample configuration files are installed in
+
+ 	PREFIX/share/examples/logtool
+
+ Please copy them to PREFIX/etc/logtool and edit to suit your needs.
+EOM
+}
+]
diff --git a/sysutils/ltfs/pkg-message b/sysutils/ltfs/pkg-message
index dc5227b9a931..e8afac043d3d 100644
--- a/sysutils/ltfs/pkg-message
+++ b/sysutils/ltfs/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This only works with IBM-branded LTO-5 or newer tape drives, although there is
 a file backend for simulation purposes.
 
@@ -7,3 +10,6 @@ recompile/reinstall to allow reading and writing tapes up to the maximum LTFS
 blocksize of 1MB:
 
 options MAXPHYS=(1024*1056)
+EOM
+}
+]
diff --git a/sysutils/lxtask/pkg-message b/sysutils/lxtask/pkg-message
index 8be9eb26e2f0..62d6968c7190 100644
--- a/sysutils/lxtask/pkg-message
+++ b/sysutils/lxtask/pkg-message
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
 This program will attempt to obtain some system information by accessing files
 in linprocfs. You must mount linprocfs filesystem for this to work correctly.
 This can be accomplished by adding the following line to your /etc/fstab file:
@@ -10,5 +11,6 @@ linprocfs               /compat/linux/proc      linprocfs       rw      0
 and then, as root, executing the command:
 
 mount linprocfs
-
-################################################################################
+EOM
+}
+]
diff --git a/sysutils/mcelog/pkg-message b/sysutils/mcelog/pkg-message
index 35c5d5d52aa1..7ace6791d7d9 100644
--- a/sysutils/mcelog/pkg-message
+++ b/sysutils/mcelog/pkg-message
@@ -1,4 +1,6 @@
-======================================================
+[
+{ type: install
+  message: <<EOM
 You can decode MCE output from the FreeBSD kernel by
 using the following command:
 
@@ -8,5 +10,6 @@ Or if you wish to paste the MCE via stdin:
 
   mcelog --no-dmi --ascii
   {...paste MCE and send EOF/press Ctrl-D...}
-
-======================================================
+EOM
+}
+]
diff --git a/sysutils/mcollective-actionpolicy-auth/files/pkg-message.in b/sysutils/mcollective-actionpolicy-auth/files/pkg-message.in
index 46351464a02b..fdd8847e011d 100644
--- a/sysutils/mcollective-actionpolicy-auth/files/pkg-message.in
+++ b/sysutils/mcollective-actionpolicy-auth/files/pkg-message.in
@@ -1,7 +1,11 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 Add the following lines to %%PREFIX%%/etc/mcollective/server.cfg to
 enable the mcollective-actionpolicy-auth plugin:
 
 rpcauthorization = 1
 rpcauthprovider = action_policy
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/mcweject/files/pkg-message.in b/sysutils/mcweject/files/pkg-message.in
index bba35f963ae1..f77f6e740400 100644
--- a/sysutils/mcweject/files/pkg-message.in
+++ b/sysutils/mcweject/files/pkg-message.in
@@ -1,6 +1,10 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 The file eject.allow has been installed in %%PREFIX%%/share/examples/.
 
 Copy this file to %%PREFIX%%/etc/eject.allow, and edit to reflect
 the devices you wish to be ejectable.
-========================================================================
+EOM
+}
+]
diff --git a/sysutils/memfetch/pkg-message b/sysutils/memfetch/pkg-message
index e69b5f0b1d85..d85a28ddc413 100644
--- a/sysutils/memfetch/pkg-message
+++ b/sysutils/memfetch/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
     This port requires procfs(5) filesystem mounted under /proc.
     Please note that this can pose a security risk.
+EOM
+}
+]
diff --git a/sysutils/memtest86+/files/pkg-message.in b/sysutils/memtest86+/files/pkg-message.in
index 06a329da8fc3..bc75e15330c2 100644
--- a/sysutils/memtest86+/files/pkg-message.in
+++ b/sysutils/memtest86+/files/pkg-message.in
@@ -1,4 +1,6 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 This port has installed ELF image of memtest86+ to
 %%BOOT_DIR%%/memtest86+.  You can load it from from boot prompt by
 interrupting boot process and entering
@@ -16,4 +18,6 @@ it and entering the following commands:
 	boot
 
 As already advised, see loader(8) for details.
-========================================================================
+EOM
+}
+]
diff --git a/sysutils/memtest86/files/pkg-message.in b/sysutils/memtest86/files/pkg-message.in
index 47f40c82338a..cc084157f4bb 100644
--- a/sysutils/memtest86/files/pkg-message.in
+++ b/sysutils/memtest86/files/pkg-message.in
@@ -1,19 +1,23 @@
-*
-* Usage:
-*
-* USB:
-* 1) Insert memstick
-* 2)	dd if=%%DATADIR%%/memtest86-usb.img \
-	of=/dev/daN bs=1m conv=sync
-* 3) Boot the memstick
-*
-* CD-ROM:
-* 1) Insert blank cd-rom
-* 2)	cdrecord dev=<device> %%DATADIR%%/memtest86-cdrom.iso
-* 3) Boot the memstick
-*
-* FLOPPY:
-* 1) Insert blank floppy
-* 2)	dd if=%%DATADIR%%/memtest86-floppy.img of=/dev/fd0
-* 3) Boot the floppy
-*
+[
+{ type: install
+  message: <<EOM
+ Usage:
+
+ USB:
+ 1) Insert memstick
+ 2)	dd if=%%DATADIR%%/memtest86-usb.img \
+       of=/dev/daN bs=1m conv=sync
+ 3) Boot the memstick
+
+ CD-ROM:
+ 1) Insert blank cd-rom
+ 2)	cdrecord dev=<device> %%DATADIR%%/memtest86-cdrom.iso
+ 3) Boot the memstick
+
+ FLOPPY:
+ 1) Insert blank floppy
+ 2)	dd if=%%DATADIR%%/memtest86-floppy.img of=/dev/fd0
+ 3) Boot the floppy
+EOM
+}
+]
diff --git a/sysutils/mfid/pkg-message b/sysutils/mfid/pkg-message
index d7f2439e3f79..a65f64d0b117 100644
--- a/sysutils/mfid/pkg-message
+++ b/sysutils/mfid/pkg-message
@@ -1,33 +1,35 @@
-! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
-!                                                                     !
-!  Please note that a previous version of mfid disabled the RAID      !
-!  controller's Patrol Reads. The original mfid implementation was    !
-!  used in a high performance environment without the need for the    !
-!  data safety and integrity features that Patrol Reads provide.      !
-!                                                                     !
-!  If you value data safety and integrity over performance,           !
-!  you should re-enable Patrol Reads.                                 !
-!                                                                     !
-!  Check if patrol is disabled:                                       !
-!                                                                     !
-!  # /usr/sbin/mfiutil -u 0 show patrol                               !
-!  Operation Mode: disabled                                           !
-!  Runs Completed: 0                                                  !
-!  Current State: stopped                                             !
-!                                                                     !
-!                                                                     !
-!  Turn patrol back on:                                               !
-!                                                                     !
-!  # /usr/sbin/mfiutil -u 0 patrol auto                               !
-!                                                                     !
-!                                                                     !
-!  Confirm patrol status:                                             !
-!                                                                     !
-!  # /usr/sbin/mfiutil -u 0 show patrol                               !
-!  Operation Mode: auto                                               !
-!  Next Run Starts: Sat Apr 30 02:58:41 2016                          !
-!  Runs Start Every 604800 seconds                                    !
-!  Runs Completed: 0                                                  !
-!  Current State: stopped                                             !
-!                                                                     !
-! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
+[
+{ type: install
+  message: <<EOM
+  Please note that a previous version of mfid disabled the RAID
+  controller's Patrol Reads. The original mfid implementation was
+  used in a high performance environment without the need for the
+  data safety and integrity features that Patrol Reads provide.
+
+  If you value data safety and integrity over performance,
+  you should re-enable Patrol Reads.
+
+  Check if patrol is disabled:
+
+  # /usr/sbin/mfiutil -u 0 show patrol
+  Operation Mode: disabled
+  Runs Completed: 0
+  Current State: stopped
+
+
+  Turn patrol back on:
+
+  # /usr/sbin/mfiutil -u 0 patrol auto
+
+
+  Confirm patrol status:
+
+  # /usr/sbin/mfiutil -u 0 show patrol
+  Operation Mode: auto
+  Next Run Starts: Sat Apr 30 02:58:41 2016
+  Runs Start Every 604800 seconds
+  Runs Completed: 0
+  Current State: stopped
+EOM
+}
+]
diff --git a/sysutils/mgeupsd/files/pkg-message.in b/sysutils/mgeupsd/files/pkg-message.in
index cb1d3f3f0bb2..65e76ff30e7c 100644
--- a/sysutils/mgeupsd/files/pkg-message.in
+++ b/sysutils/mgeupsd/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 A configuration file has been installed in %%PREFIX%%/etc/rc.d/mgeupsd.sh.
 Examine it to make sure it is suitable for your system.
 
 A sample script that handles the various power messages has been placed in
 %%PREFIX%%/sbin/powerhandler.  You will probably want to edit it to suit
 your particular needs.
+EOM
+}
+]
diff --git a/sysutils/minikube/files/pkg-message.in b/sysutils/minikube/files/pkg-message.in
index 9ff84489fff6..6279810364b1 100644
--- a/sysutils/minikube/files/pkg-message.in
+++ b/sysutils/minikube/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To use Minikube you need to install emulators/virtualbox-ose or emulators/virtualbox-ose-nox11.
 
 Just VirtualBox is supported on FreeBSD (--vm-driver=virtualbox).
+EOM
+}
+]
diff --git a/sysutils/minimunin/files/pkg-message.in b/sysutils/minimunin/files/pkg-message.in
index a9ab3440e93e..f04d052524da 100644
--- a/sysutils/minimunin/files/pkg-message.in
+++ b/sysutils/minimunin/files/pkg-message.in
@@ -1,4 +1,6 @@
-*****************************************************************
+[
+{ type: install
+  message: <<EOM
 To activate minimunin, add the line
 
     munin stream tcp nowait nobody /usr/libexec/tcpd %%PREFIX%%/bin/minimunin
@@ -19,5 +21,6 @@ in your /etc/rc.conf and restart inetd with the
 
 command. You may also want to restrict access to your munin node via the
 /etc/hosts.allow and /etc/hosts.deny configuration files.
-
-*****************************************************************
+EOM
+}
+]
diff --git a/sysutils/monit/files/pkg-message.in b/sysutils/monit/files/pkg-message.in
index 87525937c7bb..93305049e389 100644
--- a/sysutils/monit/files/pkg-message.in
+++ b/sysutils/monit/files/pkg-message.in
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 USAGE:
 
 To enable monit you need to add monit_enable="YES" to rc.conf file.
@@ -7,5 +8,6 @@ Before running monit you have to configure monitrc file. There is
 example configuration file monitrc.sample.
 
 %%PREFIX%%/etc/monitrc.sample
-
-**************************************************************************
+EOM
+}
+]
diff --git a/sysutils/monitord/pkg-message b/sysutils/monitord/pkg-message
index f22635ee9c2a..116aab6fe682 100644
--- a/sysutils/monitord/pkg-message
+++ b/sysutils/monitord/pkg-message
@@ -1,4 +1,8 @@
-=============================================================
+[
+{ type: install
+  message: <<EOM
 Monitord requires procfs(5). Add this line to your fstab(5):
 proc /proc procfs rw 0 0
-=============================================================
+EOM
+}
+]
diff --git a/sysutils/monitorix/files/pkg-message.in b/sysutils/monitorix/files/pkg-message.in
index ba86895649f5..46ff558bba97 100644
--- a/sysutils/monitorix/files/pkg-message.in
+++ b/sysutils/monitorix/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================
-
+[
+{ type: install
+  message: <<EOM
  The port has a generic default config, please adjust your
  settings in file: %%PREFIX%%/etc/monitorix.conf
 
@@ -12,5 +13,6 @@
      %%PREFIX%%/etc/monitorix.conf
 
  and have a look at the new configuration file options.
-
-================================================================
+EOM
+}
+]
diff --git a/sysutils/mono-kmod/files/pkg-message.in b/sysutils/mono-kmod/files/pkg-message.in
index 2c3edd7ac331..fc370e642bd3 100644
--- a/sysutils/mono-kmod/files/pkg-message.in
+++ b/sysutils/mono-kmod/files/pkg-message.in
@@ -1,5 +1,6 @@
-############################################################################
-
+[
+{ type: install
+  message: <<EOM
 Add mono_load="YES" to /boot/loader.conf to load the kernel module
 automatically.
 
@@ -7,5 +8,6 @@ The default path of Mono is %%LOCALBASE%%/bin/mono. You can specify an
 alternate path by adding a line to /etc/sysctl.conf:
 
   kern.mono.path=/path/to/mono
-
-############################################################################
+EOM
+}
+]
diff --git a/sysutils/moosefs2-master/files/pkg-message-cgiserv.in b/sysutils/moosefs2-master/files/pkg-message-cgiserv.in
index fd0285475f85..b93e90eb8847 100644
--- a/sysutils/moosefs2-master/files/pkg-message-cgiserv.in
+++ b/sysutils/moosefs2-master/files/pkg-message-cgiserv.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfscgiserv
@@ -8,5 +9,6 @@ Use it to start/stop the mfscgiserv service after you have added
 the following line to your rc.conf file:
 
 mfscgiserv_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs2-master/files/pkg-message-chunkserver.in b/sysutils/moosefs2-master/files/pkg-message-chunkserver.in
index 6d3bc8159647..5ad0ee1a4388 100644
--- a/sysutils/moosefs2-master/files/pkg-message-chunkserver.in
+++ b/sysutils/moosefs2-master/files/pkg-message-chunkserver.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfschunkserver
@@ -8,5 +9,6 @@ Use it to start/stop the mfschunkserver service after you have added
 the following line to your rc.conf file:
 
 mfschunkserver_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs2-master/files/pkg-message-master.in b/sysutils/moosefs2-master/files/pkg-message-master.in
index 4cbf687c6f33..748bcc9eee7a 100644
--- a/sysutils/moosefs2-master/files/pkg-message-master.in
+++ b/sysutils/moosefs2-master/files/pkg-message-master.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfsmaster
@@ -8,5 +9,6 @@ Use it to start/stop the mfsmaster service after you have added
 the following line to your rc.conf file:
 
 mfsmaster_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs2-master/files/pkg-message-metalogger.in b/sysutils/moosefs2-master/files/pkg-message-metalogger.in
index af42c5fdd3a9..0a294c00bc0c 100644
--- a/sysutils/moosefs2-master/files/pkg-message-metalogger.in
+++ b/sysutils/moosefs2-master/files/pkg-message-metalogger.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfsmetalogger
@@ -8,5 +9,6 @@ Use it to start/stop the mfsmetalogger service after you have added
 the following line to your rc.conf file:
 
 mfsmetalogger_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs3-master/files/pkg-message-cgiserv.in b/sysutils/moosefs3-master/files/pkg-message-cgiserv.in
index fd0285475f85..b93e90eb8847 100644
--- a/sysutils/moosefs3-master/files/pkg-message-cgiserv.in
+++ b/sysutils/moosefs3-master/files/pkg-message-cgiserv.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfscgiserv
@@ -8,5 +9,6 @@ Use it to start/stop the mfscgiserv service after you have added
 the following line to your rc.conf file:
 
 mfscgiserv_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs3-master/files/pkg-message-chunkserver.in b/sysutils/moosefs3-master/files/pkg-message-chunkserver.in
index 6d3bc8159647..5ad0ee1a4388 100644
--- a/sysutils/moosefs3-master/files/pkg-message-chunkserver.in
+++ b/sysutils/moosefs3-master/files/pkg-message-chunkserver.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfschunkserver
@@ -8,5 +9,6 @@ Use it to start/stop the mfschunkserver service after you have added
 the following line to your rc.conf file:
 
 mfschunkserver_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs3-master/files/pkg-message-master.in b/sysutils/moosefs3-master/files/pkg-message-master.in
index 4cbf687c6f33..748bcc9eee7a 100644
--- a/sysutils/moosefs3-master/files/pkg-message-master.in
+++ b/sysutils/moosefs3-master/files/pkg-message-master.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfsmaster
@@ -8,5 +9,6 @@ Use it to start/stop the mfsmaster service after you have added
 the following line to your rc.conf file:
 
 mfsmaster_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/moosefs3-master/files/pkg-message-metalogger.in b/sysutils/moosefs3-master/files/pkg-message-metalogger.in
index af42c5fdd3a9..0a294c00bc0c 100644
--- a/sysutils/moosefs3-master/files/pkg-message-metalogger.in
+++ b/sysutils/moosefs3-master/files/pkg-message-metalogger.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfsmetalogger
@@ -8,5 +9,6 @@ Use it to start/stop the mfsmetalogger service after you have added
 the following line to your rc.conf file:
 
 mfsmetalogger_enable="YES"
-
-************************************************************************
+EOM
+}
+]
diff --git a/sysutils/mountsmb2/files/pkg-message.in b/sysutils/mountsmb2/files/pkg-message.in
index b7720dddcd5c..7dc733091dcc 100644
--- a/sysutils/mountsmb2/files/pkg-message.in
+++ b/sysutils/mountsmb2/files/pkg-message.in
@@ -1,5 +1,6 @@
-***********************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please, read %%EXAMPLESDIR%%/README.FreeBSD
 *B*E*F*O*R*E* the FIRST RUN of Mountsmb2!
 
@@ -18,5 +19,6 @@ Keep in mind, that:
 1. Mountsmb2 only calls mount_smbfs to mount shares with params, described in
    a .mssmbrc file
 2. DO NOT DISTURB ME ABOUT FreeBSD's SMB IMPLEMENTATION!
-
-************************************************************
+EOM
+}
+]
diff --git a/sysutils/msiklm/files/pkg-message.in b/sysutils/msiklm/files/pkg-message.in
index 3af659c5c1b4..fa82c739a80e 100644
--- a/sysutils/msiklm/files/pkg-message.in
+++ b/sysutils/msiklm/files/pkg-message.in
@@ -1,5 +1,6 @@
------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  A sample devd(8) configuration file has been installed as:
    %%PREFIX%%/etc/devd/msiklm.conf.sample
 
@@ -7,5 +8,6 @@
    %%PREFIX%%/etc/devd/msiklm.conf
  and configure it to your liking if you want msiklm to automatically
  set your keyboard backlight to a default upon system boot/resume.
-
------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/msyslog/files/pkg-message.in b/sysutils/msyslog/files/pkg-message.in
index 9d5c3552bf8b..be1fdf32a38c 100644
--- a/sysutils/msyslog/files/pkg-message.in
+++ b/sysutils/msyslog/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 To replace FreeBSD's standard syslogd with msyslog, do this:
 
 1) Create a configuration in %%PREFIX%%/etc/syslog.conf.
@@ -17,4 +19,6 @@ To replace FreeBSD's standard syslogd with msyslog, do this:
     in the end of /etc/rc.conf:
 
     syslogd_enable="NO"
-================================================================================
+EOM
+}
+]
diff --git a/sysutils/node_exporter/pkg-message b/sysutils/node_exporter/pkg-message
index c8e780f97b2a..a46508a954f3 100644
--- a/sysutils/node_exporter/pkg-message
+++ b/sysutils/node_exporter/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 If upgrading from a version of node_exporter <0.15.0 you'll need to update any
 custom command line flags that you may have set as it now requires a
 double-dash (--flag) instead of a single dash (-flag).
 The collector flags in 0.15.0 have now been replaced with individual boolean
 flags and the -collector.procfs` and -collector.sysfs` flags have been renamed
 to --path.procfs and --path.sysfs respectively.
+EOM
+}
+]
diff --git a/sysutils/omnibackup/files/pkg-message.in b/sysutils/omnibackup/files/pkg-message.in
index 0e0c12004b64..d126f7b189a2 100644
--- a/sysutils/omnibackup/files/pkg-message.in
+++ b/sysutils/omnibackup/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 In order to run OmniBackup, you will need to create and configure the main
 configuration file, e.g.:
 
@@ -28,5 +29,6 @@ or
 * https://github.com/NuLL3rr0r/omnibackup
 
 Before you use it in production.
-
-###############################################################################
+EOM
+}
+]
diff --git a/sysutils/open/files/pkg-message.in b/sysutils/open/files/pkg-message.in
index f3ce36747f4f..95a25e9e5eb2 100644
--- a/sysutils/open/files/pkg-message.in
+++ b/sysutils/open/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use open it must be installed setuid root
 (type "chmod u+s %%PREFIX%%/bin/open")
 
@@ -7,3 +10,6 @@ all the VT devices that are not allocated
 to getty should be read/write by all, e.g.
 
 chmod a=rw /dev/ttyv[9abc]
+EOM
+}
+]
diff --git a/sysutils/osquery/pkg-message b/sysutils/osquery/pkg-message
index d4f98c1e0ec5..36e02fc756f4 100644
--- a/sysutils/osquery/pkg-message
+++ b/sysutils/osquery/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Note that some osquery tables are currently unsupported on FreeBSD. A list of
 disabled tables can be found at:
 
 https://github.com/facebook/osquery/blob/master/specs/blacklist
+EOM
+}
+]
diff --git a/sysutils/p5-Ubic/pkg-message b/sysutils/p5-Ubic/pkg-message
index 85f58e2685af..6ab975d240e3 100644
--- a/sysutils/p5-Ubic/pkg-message
+++ b/sysutils/p5-Ubic/pkg-message
@@ -1,6 +1,8 @@
-*******************************************
-
+[
+{ type: install
+  message: <<EOM
 Ubic has been installed!
 To config and run Ubic use: ubic-admin setup
-
-********************************************
+EOM
+}
+]
diff --git a/sysutils/pacman/files/pkg-message.in b/sysutils/pacman/files/pkg-message.in
index 12e67c71134e..73494fa72d84 100644
--- a/sysutils/pacman/files/pkg-message.in
+++ b/sysutils/pacman/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Default pacman root directory (the one it will install packages into) is
 
   %%PACMAN_ROOT%%
@@ -5,4 +8,6 @@ Default pacman root directory (the one it will install packages into) is
 To change it (and to define package repositories to use), see
 
   %%PREFIX%%/etc/pacman.conf
-
+EOM
+}
+]
diff --git a/sysutils/paladin/pkg-message b/sysutils/paladin/pkg-message
index 6746cc640917..fd7730021238 100644
--- a/sysutils/paladin/pkg-message
+++ b/sysutils/paladin/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To run paladin:
 - Edit /usr/local/etc/paladin.conf 
 - Add paladin_enable="YES" to /etc/rc.conf
+EOM
+}
+]
diff --git a/sysutils/panicmail/pkg-message b/sysutils/panicmail/pkg-message
index c243a00cad13..f57cb45bc9af 100644
--- a/sysutils/panicmail/pkg-message
+++ b/sysutils/panicmail/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable sending of panic reports, add
 	dumpdev="AUTO"
 	panicmail_enable="YES"
@@ -8,3 +11,6 @@ them if they do not contain any sensitive information.  To automatically
 submit panic reports directly, add
 	panicmail_autosubmit="YES"
 to your /etc/rc.conf in addition.
+EOM
+}
+]
diff --git a/sysutils/personality/files/pkg-message.in b/sysutils/personality/files/pkg-message.in
index c0112ac702e1..419e40ca9a0a 100644
--- a/sysutils/personality/files/pkg-message.in
+++ b/sysutils/personality/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To change the personality of your system at system boot
 you have to add the following line into the /etc/rc script.
 
@@ -6,3 +9,6 @@ you have to add the following line into the /etc/rc script.
 Make sure that you add this after mounting of the ufs filesystems.
 If you prefer you can use other values than 60 seconds.
 After 60 seconds the system boots with the last configuration.
+EOM
+}
+]
diff --git a/sysutils/pot/files/pkg-message.in b/sysutils/pot/files/pkg-message.in
index 91c26ae2f09f..953d0a52e494 100644
--- a/sysutils/pot/files/pkg-message.in
+++ b/sysutils/pot/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Now, before to run 'pot init', it would be wise to edit the configuration file
 
 Do not edit pot.default.conf, but pot.conf instead.
@@ -11,3 +14,6 @@ To upgrade from prevoius versions of pot (<0.6.0) to 0.6.0+ the following steps
 
 The variable `pot_list` in the rc.conf file is deprecated.
 Use `pot set-attr` to enable the attribute start-at-boot to your pot
+EOM
+}
+]
diff --git a/sysutils/powerdxx/pkg-message b/sysutils/powerdxx/pkg-message
index 695634a1b13b..a080f193128b 100644
--- a/sysutils/powerdxx/pkg-message
+++ b/sysutils/powerdxx/pkg-message
@@ -1,9 +1,11 @@
-*********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 To run this service from startup, run
 
       sysrc powerdxx_enable="YES"
 
 Command line arguments can be set via powerdxx_flags. See powerd++(8)
-
-*********************************************************************
+EOM
+}
+]
diff --git a/sysutils/puppet-mode.el/pkg-message b/sysutils/puppet-mode.el/pkg-message
index 50fedfb455a3..55ddc94ad95d 100644
--- a/sysutils/puppet-mode.el/pkg-message
+++ b/sysutils/puppet-mode.el/pkg-message
@@ -1,5 +1,6 @@
-===================================================
-
+[
+{ type: install
+  message: <<EOM
 You should add the following line to your ~/.emacs:
 
 ;;
@@ -8,5 +9,6 @@ You should add the following line to your ~/.emacs:
 (autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
 
 (add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
-
-===================================================
+EOM
+}
+]
diff --git a/sysutils/puppet5/files/pkg-message.in b/sysutils/puppet5/files/pkg-message.in
index d036be0a93e0..b7f42c483592 100644
--- a/sysutils/puppet5/files/pkg-message.in
+++ b/sysutils/puppet5/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 To enable the puppet agent, add the following to /etc/rc.conf:
 
 	puppet_enable="YES"
@@ -11,4 +13,6 @@ Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
 deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
 
 The default PID directory is /var/run/puppet
-
+EOM
+}
+]
diff --git a/sysutils/puppet6/files/pkg-message.in b/sysutils/puppet6/files/pkg-message.in
index 9c18b68be5b4..caa220715594 100644
--- a/sysutils/puppet6/files/pkg-message.in
+++ b/sysutils/puppet6/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 To enable the puppet agent, add the following to /etc/rc.conf:
 
 	puppet_enable="YES"
 
 The default PID directory is /var/run/puppet
-
+EOM
+}
+]
diff --git a/sysutils/puppetserver5/files/pkg-message.in b/sysutils/puppetserver5/files/pkg-message.in
index 4c4aad47b360..0635f9786fce 100644
--- a/sysutils/puppetserver5/files/pkg-message.in
+++ b/sysutils/puppetserver5/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Remember to run:
 
 sysrc puppetserver_enable=yes
@@ -9,4 +12,6 @@ https://docs.puppet.com/puppetserver/latest/release_notes.html#puppet-server-25
 
 The file bootstrap.cfg has been removed and ca configuration has been moved out
 to its own file in ca.cfg.
-
+EOM
+}
+]
diff --git a/sysutils/puppetserver6/files/pkg-message.in b/sysutils/puppetserver6/files/pkg-message.in
index 4d5a91679e60..0635f9786fce 100644
--- a/sysutils/puppetserver6/files/pkg-message.in
+++ b/sysutils/puppetserver6/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Remember to run:
 
 sysrc puppetserver_enable=yes
@@ -9,3 +12,6 @@ https://docs.puppet.com/puppetserver/latest/release_notes.html#puppet-server-25
 
 The file bootstrap.cfg has been removed and ca configuration has been moved out
 to its own file in ca.cfg.
+EOM
+}
+]
diff --git a/sysutils/py-google-compute-engine/pkg-message b/sysutils/py-google-compute-engine/pkg-message
index 28b6cc0c763d..cc1a929304d1 100644
--- a/sysutils/py-google-compute-engine/pkg-message
+++ b/sysutils/py-google-compute-engine/pkg-message
@@ -1,6 +1,6 @@
-
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 google-compute-engine has been installed, and the following services are
 available:
 
@@ -17,5 +17,6 @@ google_startup			Implement support for running host provided
 To enable the above services, sysrc <servicename>_enable=YES
 
 Reboot your system or start the services, service <servicename> start
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/py-halite/files/pkg-message.in b/sysutils/py-halite/files/pkg-message.in
index ff6583c4ecce..1ec4056726fb 100644
--- a/sysutils/py-halite/files/pkg-message.in
+++ b/sysutils/py-halite/files/pkg-message.in
@@ -1,6 +1,6 @@
-======================================================
-Halite Configuration Instructions
-======================================================
+[
+{ type: install
+  message: <<EOM
 step 1: modify external_auth params in master config
         repeat username for each user allowed access
 
@@ -26,4 +26,6 @@ halite:
 
 step 3: restart salt_master daemon
 step 4: point browser to https://saltmaster:8080
-======================================================
+EOM
+}
+]
diff --git a/sysutils/py-mitogen/files/pkg-message.in b/sysutils/py-mitogen/files/pkg-message.in
index eef820123a64..0ff7c8f10d61 100644
--- a/sysutils/py-mitogen/files/pkg-message.in
+++ b/sysutils/py-mitogen/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 If you are intending to use mitogen together with [sysutils/ansible]
 then simply append this into your ansible.cfg file, whether in /etc
 or in the root directory of your ansible playbook:
@@ -5,3 +8,6 @@ or in the root directory of your ansible playbook:
 [defaults]
 strategy         = mitogen_linear
 strategy_plugins = %%PYTHON_SITELIBDIR%%/ansible_mitogen/plugins/strategy
+EOM
+}
+]
diff --git a/sysutils/py-mqttwarn/files/pkg-message.in b/sysutils/py-mqttwarn/files/pkg-message.in
index d3df2e371f1d..54c0014467d1 100644
--- a/sysutils/py-mqttwarn/files/pkg-message.in
+++ b/sysutils/py-mqttwarn/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
-
+[
+{ type: install
+  message: <<EOM
 After installing mqttwarn for the first time, we recommend making the
 following change to supervisord configuration settings:
 
@@ -29,5 +29,6 @@ environment=MQTTWARNINI="%%PREFIX%%/etc/mqttwarn/mqttwarn.ini",MQTTWARNLOG="/var
 
 [include]
 files = mqttwarn.conf
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+EOM
+}
+]
diff --git a/sysutils/py-pyznap/files/pkg-message.in b/sysutils/py-pyznap/files/pkg-message.in
index 4bc829de52bb..ae97ff64e4bb 100644
--- a/sysutils/py-pyznap/files/pkg-message.in
+++ b/sysutils/py-pyznap/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Now it is time to set-up the main configuration file.
 
 First run "pyznap setup", a sample configuration will be copied
@@ -8,3 +11,6 @@ following entries:
 
 */15	*	*	*	*	root	%%BINDIR%%/pyznap snap >> /var/log/pyznap.log
 0	0	*	*	*	root	%%BINDIR%%/pyznap send >> /var/log/pyznap.log
+EOM
+}
+]
diff --git a/sysutils/py-salt/files/pkg-message.in b/sysutils/py-salt/files/pkg-message.in
index 4aedb8e3c137..49e8d125da15 100644
--- a/sysutils/py-salt/files/pkg-message.in
+++ b/sysutils/py-salt/files/pkg-message.in
@@ -1,13 +1,13 @@
-
-===================================================================================================
-
+[
+{ type: install
+  message: <<EOM
 To configure a Salt Master, do the following:
 
   o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
   o Update to meet your needs
   o sysrc salt_master_enable="YES"
 
----------------------------------------------------------------------------------------------------
+
 
 To configure a Salt Minion, do the following:
 
@@ -15,7 +15,7 @@ To configure a Salt Minion, do the following:
   o Update 'master: salt' to point to your Salt Master's hostname or IP
   o sysrc salt_minion_enable="YES"
 
----------------------------------------------------------------------------------------------------
+
 
 To configure a Salt Proxy Minion, do the following:
 
@@ -23,7 +23,7 @@ To configure a Salt Proxy Minion, do the following:
   o sysrc salt_proxy_list=""
   o Update the salt_proxy_list with the proxy minion name(s)
 
----------------------------------------------------------------------------------------------------
+
 
 To change the Transport method from the default option of Zeromq to either TCP or RAET:
 
@@ -31,6 +31,6 @@ To change the Transport method from the default option of Zeromq to either TCP o
   o Ensure the master and minions all have salt installed with these same options and dependencies
   o Add the line 'transport: [tcp|raet]' to both the master and minion configuration files
   o Restart salt on the master and minions
-
-===================================================================================================
-
+EOM
+}
+]
diff --git a/sysutils/py-scarab/files/pkg-message.in b/sysutils/py-scarab/files/pkg-message.in
index 4303bfb7a244..be6a690098a6 100644
--- a/sysutils/py-scarab/files/pkg-message.in
+++ b/sysutils/py-scarab/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Before you can manipulate PRs with this program in FreeBSD Bugzilla
 you have to create an API key and copy it in your config file.
 
@@ -5,3 +8,6 @@ Login -> Preferences -> API keys -> Generate a new API key
 
 The config file is probed from your home directory as ".scarabrc".
 A sample scarabrc config file is located under %%EXAMPLESDIR%%.
+EOM
+}
+]
diff --git a/sysutils/pydf/files/pkg-message.in b/sysutils/pydf/files/pkg-message.in
index f20a9967c977..58af5777911d 100644
--- a/sysutils/pydf/files/pkg-message.in
+++ b/sysutils/pydf/files/pkg-message.in
@@ -1,8 +1,8 @@
-
-=========================================================
-
+[
+{ type: install
+  message: <<EOM
 Please copy the file %%PREFIX%%/etc/pydfrc.sample
 to %%PREFIX%%/etc/pydfrc and edit your configuration.
-
-=========================================================
-
+EOM
+}
+]
diff --git a/sysutils/qchroot/pkg-message b/sysutils/qchroot/pkg-message
index 48db5fa34121..ffecfbdf6a4a 100644
--- a/sysutils/qchroot/pkg-message
+++ b/sysutils/qchroot/pkg-message
@@ -1,4 +1,8 @@
-
+[
+{ type: install
+  message: <<EOM
 First issue "rehash" command to enable the qchroot script (if using csh).
 Then issue "man qchroot" to read about qchroot usage.
-
+EOM
+}
+]
diff --git a/sysutils/qjail/pkg-message b/sysutils/qjail/pkg-message
index 04128461cce5..cf3bc8823978 100644
--- a/sysutils/qjail/pkg-message
+++ b/sysutils/qjail/pkg-message
@@ -1,5 +1,6 @@
-########################################################################
-
+[
+{ type: install
+  message: <<EOM
 Use the qjail utility to deploy small or large numbers of jails quickly.
 
 First issue "rehash" command to enable the qjail command (if using csh).
@@ -9,5 +10,6 @@ Then issue
 "man qjail-howto" For example of driving public traffic to non-vnet jails.
 "man qjail-vnet-howto"   For example of creating vnet jails.
 "man qjail-ipv6-testing" For example of testing jails with ipv6 addresses.
-
-########################################################################
+EOM
+}
+]
diff --git a/sysutils/racktables/files/pkg-message.in b/sysutils/racktables/files/pkg-message.in
index c9fe9e5c0cdf..481858363c9e 100644
--- a/sysutils/racktables/files/pkg-message.in
+++ b/sysutils/racktables/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Apache users should create a racktables.conf file under their apache
 Includes directory with the following contents:
 <Directory %%WWWDIR%%/wwwroot>
@@ -13,4 +15,6 @@ locally.
 
 Then, visit http://your.system/racktables/ and follow the
 instructions to complete the setup.
----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/radmind/files/pkg-message.in b/sysutils/radmind/files/pkg-message.in
index e99cde202f90..e3d70dd5c532 100644
--- a/sysutils/radmind/files/pkg-message.in
+++ b/sysutils/radmind/files/pkg-message.in
@@ -1,4 +1,6 @@
-####################
+[
+{ type: install
+  message: <<EOM
 The radmind daemon for this port runs as user "%%RADMINUSER%%"
 by default.  If you wish to change this behavior you may
 set the radmind_user variable in /etc/rc.conf
@@ -8,4 +10,6 @@ A template configuration file has been installed as
 Please modify this file as necessary and place it in
 %%RADMIND_BASE_DIR%%/config to ensure proper operation of the
 radmind daemon.
-####################
+EOM
+}
+]
diff --git a/sysutils/read-edid/pkg-message b/sysutils/read-edid/pkg-message
index 2179426d612d..83673e80653f 100644
--- a/sysutils/read-edid/pkg-message
+++ b/sysutils/read-edid/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 FreeBSD has mapping at zero address feature turned off since 8.0-RC2:
 
   http://security.freebsd.org/advisories/FreeBSD-EN-09:05.null.asc
@@ -11,3 +14,6 @@ disable this protection, issue the following command:
 To return to secure state:
 
   # sysctl security.bsd.map_at_zero=0
+EOM
+}
+]
diff --git a/sysutils/realsync/files/pkg-message.in b/sysutils/realsync/files/pkg-message.in
index ddc091e1041e..c593875e30f0 100644
--- a/sysutils/realsync/files/pkg-message.in
+++ b/sysutils/realsync/files/pkg-message.in
@@ -1,4 +1,6 @@
--------------------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Author: Krasimir Nachev e-mail: krasi@it-sys.org
 Please:
 	1. Edit %%PREFIX%%/etc/realsync.cfg
@@ -9,5 +11,6 @@ Please:
 	4. Set realsync_enable="YES" in /etc/rc.conf
 Start the program:  %%PREFIX%%/etc/rc.d/realsync start
 That's all!
--------------------------------------------------------------------------------------------
-
+EOM
+}
+]
diff --git a/sysutils/rhc/pkg-message b/sysutils/rhc/pkg-message
index 1e8464445aca..87790600637a 100644
--- a/sysutils/rhc/pkg-message
+++ b/sysutils/rhc/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 If this is your first time installing the RHC tools,
 please run 'rhc setup' to configure your account and
 working development environment.
+EOM
+}
+]
diff --git a/sysutils/rsyncbackup/files/pkg-message.in b/sysutils/rsyncbackup/files/pkg-message.in
index e9873521c5f1..0854f9d5fac7 100644
--- a/sysutils/rsyncbackup/files/pkg-message.in
+++ b/sysutils/rsyncbackup/files/pkg-message.in
@@ -1,6 +1,6 @@
-NOTE:
-==========
-
+[
+{ type: install
+  message: <<EOM
 rsyncbackup is now installed on your system.
 
 - rsyncbackup installed into %%PREFIX%%/bin/rsyncbackup
@@ -16,3 +16,6 @@ rsyncbackup is now installed on your system.
   %%DOCSDIR%%
 
 Official page: 	http://BSDforge.com/projects/sysutils/rsync-backup/
+EOM
+}
+]
diff --git a/sysutils/rsyslog8/files/pkg-message.in b/sysutils/rsyslog8/files/pkg-message.in
index 9a95eaa33bf9..87e6076dbf4e 100644
--- a/sysutils/rsyslog8/files/pkg-message.in
+++ b/sysutils/rsyslog8/files/pkg-message.in
@@ -1,4 +1,6 @@
-===================================================================
+[
+{ type: install
+  message: <<EOM
 To start using rsyslogd(8), stop syslogd(8) if it's running and
 add the following lines to rc.conf(5):
 
@@ -22,4 +24,6 @@ newsyslog(8) has the path of syslogd's pid file hardcoded. To
 make it work seamlessly with rsyslog, add this:
 
   rsyslogd_pidfile="/var/run/syslog.pid"
-===================================================================
+EOM
+}
+]
diff --git a/sysutils/rubygem-bolt/pkg-message b/sysutils/rubygem-bolt/pkg-message
index a07d7a887e00..82138ff79f15 100644
--- a/sysutils/rubygem-bolt/pkg-message
+++ b/sysutils/rubygem-bolt/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This port depends on security/rubygem-net-ssh which has stricter defaults that
 OpenSSH: when using strict host key checking, security/rubygem-net-ssh will
 refuse the connexion if both the remote host name and IP address are not on the
@@ -28,3 +31,6 @@ As a consequence, host key verification may need additional work:
 Some future version of security/rubygem-net-ssh should drop strict host key
 checking entirely, for more details, see:
 https://github.com/net-ssh/net-ssh/pull/663
+EOM
+}
+]
diff --git a/sysutils/rubygem-smart_proxy_chef/pkg-message b/sysutils/rubygem-smart_proxy_chef/pkg-message
index b0637e1f314c..b72a012fb01f 100644
--- a/sysutils/rubygem-smart_proxy_chef/pkg-message
+++ b/sysutils/rubygem-smart_proxy_chef/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Further configuration is required to connect Chef and foreman-proxy, see:
 http://theforeman.org/plugins/foreman_chef/
+EOM
+}
+]
diff --git a/sysutils/rubygem-smart_proxy_salt/pkg-message b/sysutils/rubygem-smart_proxy_salt/pkg-message
index a0e2457deb25..56e73e4c1b01 100644
--- a/sysutils/rubygem-smart_proxy_salt/pkg-message
+++ b/sysutils/rubygem-smart_proxy_salt/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Further configuration is required to connect salt and foreman-proxy, see:
 http://theforeman.org/plugins/foreman_salt/
 
 To upload reports from SaltStack highstates to Foreman, add a line like this to your /etc/crontab:
 */10 * * * * root /usr/local/sbin/upload-salt-reports >>/var/log/foreman-proxy/salt-cron.log 2>&1
+EOM
+}
+]
diff --git a/sysutils/runit/files/pkg-message.in b/sysutils/runit/files/pkg-message.in
index 653ecfadb8a3..bb305bba05b3 100644
--- a/sysutils/runit/files/pkg-message.in
+++ b/sysutils/runit/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Using runit with FreeBSD init:
 
 # mkdir %%SERVICE_DIR%%
@@ -41,3 +44,6 @@ Note: On FreeBSD, runit-init works in %%PREFIX%%/sbin, but
 # echo 'init_path="%%PREFIX%%/sbin/runit-init:/sbin/init:/sbin/oninit:/sbin/init.bak:/rescue/init"' >> /boot/loader.conf
 
       making upgrades easier.
+EOM
+}
+]
diff --git a/sysutils/s-tui/pkg-message b/sysutils/s-tui/pkg-message
index 1d3c386de256..b27a88f38d74 100644
--- a/sysutils/s-tui/pkg-message
+++ b/sysutils/s-tui/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed s-tui, stress test and monitoring tool.
 s-tui is experimental on FreeBSD. Please help testing it.
 
@@ -7,4 +9,6 @@ additionally one of the following ports:
 
 - benchmarks/stress-ng
 - sysutils/stress
-======================================================================
+EOM
+}
+]
diff --git a/sysutils/samesame/pkg-message b/sysutils/samesame/pkg-message
index b7b51b8753b2..d2037f69097d 100644
--- a/sysutils/samesame/pkg-message
+++ b/sysutils/samesame/pkg-message
@@ -1,4 +1,8 @@
----------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 A 2 clause BSD licence applies to this application:
 http://samesame.kruijff.org/license.html
----------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/scalpel/files/pkg-message.in b/sysutils/scalpel/files/pkg-message.in
index 0de1eac040a8..92f1dabc2ee4 100644
--- a/sysutils/scalpel/files/pkg-message.in
+++ b/sysutils/scalpel/files/pkg-message.in
@@ -1,4 +1,6 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Scalpel has been successfully installed on your system.
 
 Now it is time to configure this package.
@@ -7,5 +9,6 @@ directory as scalpel.conf and edit it.
 
 Scalpel will always use scalpel.conf in your current working
 directory, if not specified with "-c /path/to/scalpel.conf".
-
-************************************************************
+EOM
+}
+]
diff --git a/sysutils/scanbuttond/files/pkg-message.in b/sysutils/scanbuttond/files/pkg-message.in
index 8274da776559..86be9bfae403 100644
--- a/sysutils/scanbuttond/files/pkg-message.in
+++ b/sysutils/scanbuttond/files/pkg-message.in
@@ -1,4 +1,6 @@
--------------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 scanbuttond has been installed, but is not quite ready to be used yet.
 
 To make scanbuttond actually do something you have to edit
@@ -34,4 +36,6 @@ detach 20 {
 	match "product" "0x220e";
 	action "/usr/bin/killall scanbuttond";
 };
--------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/screen/pkg-message b/sysutils/screen/pkg-message
index a7c017da25da..899fc017b061 100644
--- a/sysutils/screen/pkg-message
+++ b/sysutils/screen/pkg-message
@@ -1,9 +1,11 @@
-=============================================================
-
+[
+{ type: install
+  message: <<EOM
 As of GNU Screen 4.4.0:
 
 Note that there was fix to screen message structure field
 responsible for $TERM handling, making it impossible
 to attach to older versions.
-
-=============================================================
+EOM
+}
+]
diff --git a/sysutils/scterc/files/pkg-message.in b/sysutils/scterc/files/pkg-message.in
index ae193fab9319..02d03d43d337 100644
--- a/sysutils/scterc/files/pkg-message.in
+++ b/sysutils/scterc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable setting hard disk SCT ERC on system boot time, add the
 following to your /etc/rc.conf:
 
@@ -13,3 +16,6 @@ following to your /etc/rc.conf:
   scterc_write_timeout="70"
 
 See %%DOCSDIR%%/README.md for more info.
+EOM
+}
+]
diff --git a/sysutils/siegfried/pkg-message b/sysutils/siegfried/pkg-message
index 23bd0c9f818a..5a5321bacac2 100644
--- a/sysutils/siegfried/pkg-message
+++ b/sysutils/siegfried/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 You should run 'sf -update' to update your local PRONOM database
+EOM
+}
+]
diff --git a/sysutils/smartmontools/files/pkg-message.in b/sysutils/smartmontools/files/pkg-message.in
index 9c68b7009fc2..f34049696d84 100644
--- a/sysutils/smartmontools/files/pkg-message.in
+++ b/sysutils/smartmontools/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 smartmontools has been installed
 
 To check the status of drives, use the following:
@@ -18,3 +21,6 @@ Copy this file to %%PREFIX%%/etc/smartd.conf and edit appropriately
 
 To have smartd start at boot
 	echo 'smartd_enable="YES"' >> /etc/rc.conf
+EOM
+}
+]
diff --git a/sysutils/snmp_exporter/files/pkg-message.in b/sysutils/snmp_exporter/files/pkg-message.in
index 408e890e3148..8ad5d858310c 100644
--- a/sysutils/snmp_exporter/files/pkg-message.in
+++ b/sysutils/snmp_exporter/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To generate the snmp.yml configuration file for snmp_exporter,
 edit %%ETCDIR%%/generator.yml and add relevant MIBs, then run
 
@@ -5,3 +8,6 @@ edit %%ETCDIR%%/generator.yml and add relevant MIBs, then run
 
 To run snmp_exporter, set the snmp_exporter_enable="YES" rcvar
 and point your prometheus instance at port 9116.
+EOM
+}
+]
diff --git a/sysutils/snowlog/pkg-message b/sysutils/snowlog/pkg-message
index 22620ef76d04..30b7e319715a 100644
--- a/sysutils/snowlog/pkg-message
+++ b/sysutils/snowlog/pkg-message
@@ -1,5 +1,6 @@
-#########################################################
-
+[
+{ type: install
+  message: <<EOM
 To use snowlog, adding this to httpd.conf
 
 LogFormat "%a\t%l\t%u\t%{%s}t\t%r\t%>s\t%X\t%{Content-Type}o\t%b\t%{Referer}i\t%{User-Agent}i\t%V\t%{LogHint}e" parsable
@@ -7,5 +8,6 @@ LogFormat "%a\t%l\t%u\t%{%s}t\t%r\t%>s\t%X\t%{Content-Type}o\t%b\t%{Referer}i\t%
 Next, tell apache to make parsable logs:
 
 CustomLog /path/to/httpd_access_parsable.log  parsable
-
-#########################################################
+EOM
+}
+]
diff --git a/sysutils/ssync/pkg-message b/sysutils/ssync/pkg-message
index 4ddb1c9b24af..f2a5e46898db 100644
--- a/sysutils/ssync/pkg-message
+++ b/sysutils/ssync/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 You will need to copy ssyncd.conf.sample to ssyncd.conf and
 ssyncd.work.sample to ssyncd.work before this port can be used.
+EOM
+}
+]
diff --git a/sysutils/swapmon/pkg-message b/sysutils/swapmon/pkg-message
index ce3c7c5833a6..7e2ce63f0b9a 100644
--- a/sysutils/swapmon/pkg-message
+++ b/sysutils/swapmon/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 To have swapmon run automatically after each boot,
 add the following line to /etc/rc.conf:
 
   swapmon_enable="YES"
+EOM
+}
+]
diff --git a/sysutils/symon/files/pkg-message.in b/sysutils/symon/files/pkg-message.in
index 6c65c46812a0..50bf4fd584bc 100644
--- a/sysutils/symon/files/pkg-message.in
+++ b/sysutils/symon/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For the system monitor symon, use the following steps
 
   1. Copy %%PREFIX%%/share/examples/symon/symon.conf
@@ -13,3 +16,6 @@ For the data collector symux, use the following steps
 	%%PREFIX%%/share/symon/c_smrrds.sh all
      to create the RR database.
   3. Run symux
+EOM
+}
+]
diff --git a/sysutils/syslog-ng310/files/pkg-message.in b/sysutils/syslog-ng310/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng310/files/pkg-message.in
+++ b/sysutils/syslog-ng310/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng311/files/pkg-message.in b/sysutils/syslog-ng311/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng311/files/pkg-message.in
+++ b/sysutils/syslog-ng311/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng312/files/pkg-message.in b/sysutils/syslog-ng312/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng312/files/pkg-message.in
+++ b/sysutils/syslog-ng312/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng313/files/pkg-message.in b/sysutils/syslog-ng313/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng313/files/pkg-message.in
+++ b/sysutils/syslog-ng313/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng314/files/pkg-message.in b/sysutils/syslog-ng314/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng314/files/pkg-message.in
+++ b/sysutils/syslog-ng314/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng315/files/pkg-message.in b/sysutils/syslog-ng315/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng315/files/pkg-message.in
+++ b/sysutils/syslog-ng315/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng317/files/pkg-message.in b/sysutils/syslog-ng317/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng317/files/pkg-message.in
+++ b/sysutils/syslog-ng317/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng318/files/pkg-message.in b/sysutils/syslog-ng318/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng318/files/pkg-message.in
+++ b/sysutils/syslog-ng318/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng319/files/pkg-message.in b/sysutils/syslog-ng319/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng319/files/pkg-message.in
+++ b/sysutils/syslog-ng319/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng320/files/pkg-message.in b/sysutils/syslog-ng320/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng320/files/pkg-message.in
+++ b/sysutils/syslog-ng320/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng321/files/pkg-message.in b/sysutils/syslog-ng321/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng321/files/pkg-message.in
+++ b/sysutils/syslog-ng321/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng322/files/pkg-message.in b/sysutils/syslog-ng322/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng322/files/pkg-message.in
+++ b/sysutils/syslog-ng322/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/syslog-ng39/files/pkg-message.in b/sysutils/syslog-ng39/files/pkg-message.in
index 36cb7e65a243..95140fc941eb 100644
--- a/sysutils/syslog-ng39/files/pkg-message.in
+++ b/sysutils/syslog-ng39/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
@@ -26,4 +28,6 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 5. Start syslog-ng:
 
      %%PREFIX%%/etc/rc.d/syslog-ng start
-
+EOM
+}
+]
diff --git a/sysutils/tarsnap-periodic/pkg-message b/sysutils/tarsnap-periodic/pkg-message
index 83e10b6fc1bc..d02ebb044572 100644
--- a/sysutils/tarsnap-periodic/pkg-message
+++ b/sysutils/tarsnap-periodic/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 In order to enable periodic tarsnap backups you need
 to add these lines to your /etc/periodic.conf
 
@@ -11,3 +13,6 @@ weekly_tarsnap_backup_keep=5
 monthly_tarsnap_backup_enable="YES"
 monthly_tarsnap_backup_paths="/"
 monthly_tarsnap_backup_keep=2
+EOM
+}
+]
diff --git a/sysutils/tarsnap/pkg-message b/sysutils/tarsnap/pkg-message
index 30b09f0598f7..c91008dc7129 100644
--- a/sysutils/tarsnap/pkg-message
+++ b/sysutils/tarsnap/pkg-message
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you have never used tarsnap before, you will need to create an account
 with the tarsnap service and deposit money into the account before you
 can start using tarsnap; see
@@ -10,5 +11,6 @@ Once you have a tarsnap account you will need to create a key file using
 the tarsnap-keygen utility before you start storing archives; this key
 file MUST BE KEPT IN A SAFE LOCATION since you will not be able to read
 your backups without it.
-
-================================================================================
+EOM
+}
+]
diff --git a/sysutils/torque/files/pkg-message.in b/sysutils/torque/files/pkg-message.in
index adf720cc30e1..564ca2ef2640 100644
--- a/sysutils/torque/files/pkg-message.in
+++ b/sysutils/torque/files/pkg-message.in
@@ -1,16 +1,19 @@
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
 On the server, run:
 
 	torque-config head
 
-******************************************************************************
+
 On compute nodes, run:
 
 	torque-config compute
 
-******************************************************************************
+
 For further information, see
 
 	http://www.adaptivecomputing.com/products/open-source/torque/
-
-******************************************************************************
+EOM
+}
+]
diff --git a/sysutils/ttyload/files/pkg-message.in b/sysutils/ttyload/files/pkg-message.in
index b05fb29982ed..e5cf868c0578 100644
--- a/sysutils/ttyload/files/pkg-message.in
+++ b/sysutils/ttyload/files/pkg-message.in
@@ -1,8 +1,12 @@
-###########################################################################
+[
+{ type: install
+  message: <<EOM
 ttyload has been installed.
 
 If you have questions read %%DOCSDIR%%/README
 
 For more information about ttyload visit:
 http://www.daveltd.com/src/util/ttyload/
-###########################################################################
+EOM
+}
+]
diff --git a/sysutils/tuptime/files/pkg-message.in b/sysutils/tuptime/files/pkg-message.in
index 89a9d77859f3..25fbb076b8c7 100644
--- a/sysutils/tuptime/files/pkg-message.in
+++ b/sysutils/tuptime/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 tuptime requires execution at startup and shutdown on rc.d, please
 add to /etc/rc.conf:
 
@@ -9,5 +10,6 @@ tuptime requires a scheduled execution on cron, please add to
 /etc/crontab:
 
 	*/5 * * * * root %%PREFIX%%/bin/tuptime -x > /dev/null
-
-======================================================================
+EOM
+}
+]
diff --git a/sysutils/uhidd/pkg-message b/sysutils/uhidd/pkg-message
index 6d0f3db06a07..5fc70522e42c 100644
--- a/sysutils/uhidd/pkg-message
+++ b/sysutils/uhidd/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use uhidd daemon for USB HID devices, depends on which sub class
 driver you want to attach, to avoid conflicts between the daemon and
 the kernel drivers, you should either use the command line option '-u'
@@ -28,5 +29,6 @@ To manually start/stop uhidd daemon on certain device, run:
 
 See http://wiki.FreeBSD.org/uhidd for more details about how to install and
 setup the daemon.
-
-==============================================================================
+EOM
+}
+]
diff --git a/sysutils/unetbootin/pkg-message b/sysutils/unetbootin/pkg-message
index 0d461173cf3b..face699a42d3 100644
--- a/sysutils/unetbootin/pkg-message
+++ b/sysutils/unetbootin/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
     If SysLinux refuses to boot with a "Boot error" message when written to
     a PC partition (slice), try to reformat the drive in raw (or dedicated)
     mode (that is, without a partition table), then reinstall things again.
+EOM
+}
+]
diff --git a/sysutils/upsdaemon/pkg-message b/sysutils/upsdaemon/pkg-message
index d75fe006ba77..40ce73da4105 100644
--- a/sysutils/upsdaemon/pkg-message
+++ b/sysutils/upsdaemon/pkg-message
@@ -1,7 +1,10 @@
-*************************************************
+[
+{ type: install
+  message: <<EOM
 NOTICE:
 
      To run UpsDaemon from startup add
      upsdaemon_enable="YES" in rc.conf
-
-*************************************************
+EOM
+}
+]
diff --git a/sysutils/uschedule/pkg-message b/sysutils/uschedule/pkg-message
index e0933d6792de..69ad9c32d47c 100644
--- a/sysutils/uschedule/pkg-message
+++ b/sysutils/uschedule/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Post-installation information:
 
 Please read uschedule_intro(7) and visit http://www.ohse.de/uwe/uschedule.html
@@ -10,3 +12,6 @@ cron_enable=NO
 
 in /etc/rc.conf. See rc.conf(5) and /etc/defaults/rc.conf for further
 information.
+EOM
+}
+]
diff --git a/sysutils/usermin/files/pkg-message.in b/sysutils/usermin/files/pkg-message.in
index 578f69390543..4e389ba1f158 100644
--- a/sysutils/usermin/files/pkg-message.in
+++ b/sysutils/usermin/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 After installing Usermin for the first time you should perform the following
 steps as root:
 
@@ -10,4 +12,6 @@ steps as root:
 
 The parameters requested by setup.sh may then be changed from within Usermin
 itself.
-
+EOM
+}
+]
diff --git a/sysutils/virtualmin/pkg-message b/sysutils/virtualmin/pkg-message
index 158c2d583075..7aa9d9e6a036 100644
--- a/sysutils/virtualmin/pkg-message
+++ b/sysutils/virtualmin/pkg-message
@@ -1,4 +1,8 @@
-===============================================================
+[
+{ type: install
+  message: <<EOM
 You will have to manually grant user permissions to access this
 module from Webmin.
-===============================================================
+EOM
+}
+]
diff --git a/sysutils/vm-bhyve/pkg-message b/sysutils/vm-bhyve/pkg-message
index 31d6ed9527a4..035201335f27 100644
--- a/sysutils/vm-bhyve/pkg-message
+++ b/sysutils/vm-bhyve/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable vm-bhyve, please add the following lines to rc.conf,
 depending on whether you are using ZFS storage or not. Please note
 that the directory or dataset specified should already exist.
@@ -11,10 +14,12 @@ OR
     vm_dir="/directory/path"
 
 Then run 'vm init'.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+EOM
+}
+{ type: upgrade, maximum_version: 1.2
+  message: <<EOM
 Please note, if upgrading from version 1.1, it is advised to shutdown guests
 and restart the host in order to re-create all virtual switches using new identifiers.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+}
+]
diff --git a/sysutils/webmin/files/pkg-message.in b/sysutils/webmin/files/pkg-message.in
index 0903e84ddf36..e27e9c23793c 100644
--- a/sysutils/webmin/files/pkg-message.in
+++ b/sysutils/webmin/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 After installing Webmin for the first time you should perform the following
 steps as root:
 
@@ -10,4 +12,6 @@ steps as root:
 
 The parameters requested by setup.sh may then be changed from within Webmin
 itself.
-
+EOM
+}
+]
diff --git a/sysutils/wmcube/files/pkg-message.in b/sysutils/wmcube/files/pkg-message.in
index 785ca4fb3a4e..cb3d750ffe97 100644
--- a/sysutils/wmcube/files/pkg-message.in
+++ b/sysutils/wmcube/files/pkg-message.in
@@ -1,7 +1,11 @@
--------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The extra 3d objects are located in:
 	%%PREFIX%%/share/wmcube
 
 To run wmcube type:
 	wmcube -o %%PREFIX%%/share/wmcube &
--------------------------------------------
+EOM
+}
+]
diff --git a/sysutils/xcdroast/pkg-message b/sysutils/xcdroast/pkg-message
index ee064b330064..91e97e4f470e 100644
--- a/sysutils/xcdroast/pkg-message
+++ b/sysutils/xcdroast/pkg-message
@@ -1,12 +1,11 @@
-************************************************************
-                         ATTENTION!
-
+[
+{ type: install
+  message: <<EOM
 You must be root to use xcdroast.  To use it as normal user,
 click "enable-nonroot" after starting it at first as root.
 But beware!  This is a security risk!
 It modifies the following files and gives them the
 set-user-ID-on-execution bit:
-
-xcdwrap
-
-************************************************************
+EOM
+}
+]
diff --git a/sysutils/z/files/pkg-message.in b/sysutils/z/files/pkg-message.in
index 13da19fa806f..47124c25408e 100644
--- a/sysutils/z/files/pkg-message.in
+++ b/sysutils/z/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To use z, put this command in your .zshrc/.bashrc:
 
   . %%DATADIR%%/z.sh
+EOM
+}
+]
diff --git a/sysutils/zap/pkg-message b/sysutils/zap/pkg-message
index a02ad84ee418..c7a25a6452ce 100644
--- a/sysutils/zap/pkg-message
+++ b/sysutils/zap/pkg-message
@@ -1,7 +1,11 @@
-=============================================================
+[
+{ type: install
+  message: <<EOM
 See
 
 http://ftfl.ca/blog/2016-12-27-zfs-replication.html
 
 for a description of a replication strategy.
-=============================================================
+EOM
+}
+]
diff --git a/sysutils/zfs-periodic/pkg-message b/sysutils/zfs-periodic/pkg-message
index fb76bd52d1e0..010d2e7d1ce1 100644
--- a/sysutils/zfs-periodic/pkg-message
+++ b/sysutils/zfs-periodic/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 In order to enable periodic snapshots you need
 to add these lines to your /etc/periodic.conf
 
@@ -23,3 +25,6 @@ To get hourly snapshots you also need to add
 something like this to /etc/crontab:
 
 2       *       *       *       *       root    periodic hourly
+EOM
+}
+]
diff --git a/sysutils/zfs-snapshot-mgmt/files/pkg-message.in b/sysutils/zfs-snapshot-mgmt/files/pkg-message.in
index 4d5bd81cca7f..743b1cdc8341 100644
--- a/sysutils/zfs-snapshot-mgmt/files/pkg-message.in
+++ b/sysutils/zfs-snapshot-mgmt/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 To actually turn on the automatic snapshots you have to do the following:
 
 1. Add an appropriate crontab entry, e.g.:
@@ -6,4 +8,6 @@ To actually turn on the automatic snapshots you have to do the following:
     echo "*/5 * * * *	root   %%PREFIX%%/bin/zfs-snapshot-mgmt" >> /etc/crontab
 
 See zfs-snapshot-mgmt(8) manpage for more details.
-
+EOM
+}
+]
diff --git a/sysutils/zfsnap/pkg-message b/sysutils/zfsnap/pkg-message
index 1114ee61fb51..927cda7debfd 100644
--- a/sysutils/zfsnap/pkg-message
+++ b/sysutils/zfsnap/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 	To run zfSnap periodically you can add these options to your
 	/etc/periodic.conf
 
@@ -48,3 +50,6 @@
 	info.
 
 	Feedback welcomed: graudeejs@gmail.com
+EOM
+}
+]
diff --git a/sysutils/zfstools/files/pkg-message.in b/sysutils/zfstools/files/pkg-message.in
index 122d1af16cd5..6df0d4d832a2 100644
--- a/sysutils/zfstools/files/pkg-message.in
+++ b/sysutils/zfstools/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable automatic snapshots, place lines such as these into /etc/crontab:
 
     PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
@@ -24,3 +27,6 @@ Or for specific intervals:
     zfs set com.sun:auto-snapshot:frequent=false DATASET
 
 See website and command usage output for further details.
+EOM
+}
+]
diff --git a/sysutils/zrepl/files/pkg-message.in b/sysutils/zrepl/files/pkg-message.in
index 2bdeeabd7776..9a94b181bee8 100644
--- a/sysutils/zrepl/files/pkg-message.in
+++ b/sysutils/zrepl/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Messages from sysutils/zrepl:
 
 SETUP BEFORE FIRST USE:
@@ -33,4 +35,6 @@ is different from previous releases where pruning only affected snapshots with
 the configured snapshotting prefix. Make sure that snapshots to be kept or
 ignored by zrepl are covered, e.g. by using the regex keep rule.
 This also applies to snapshots taken by means other than zrepl (e.g. manually).
-------------------------------------------------------------------------
+EOM
+}
+]