Convert to UCL & cleanup pkg-message (categories d)

37 files changed, 298 insertions, 175 deletions

diff --git a/dns/adsuck/files/pkg-message.in b/dns/adsuck/files/pkg-message.in
index cc377f4315c1..608a3faed546 100644
--- a/dns/adsuck/files/pkg-message.in
+++ b/dns/adsuck/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-
+[
+{ type: install
+  message: <<EOM
 Quick way to use adsuck chrooted in /var/adsuck
 
 mkdir /var/adsuck
@@ -17,5 +18,6 @@ echo "nameserver 127.0.0.1" > /etc/resolv.conf
 
 If you're using DHCP consider configuring your dhclient.conf(5) to prevent
 resolv.conf updates.
-
-
+EOM
+}
+]
diff --git a/dns/bindgraph/pkg-message b/dns/bindgraph/pkg-message
index 34faeed075ae..7484a16c5def 100644
--- a/dns/bindgraph/pkg-message
+++ b/dns/bindgraph/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To get bindgraph working, you have to set querylog for bind. An example
 named.conf will be
 
@@ -10,3 +13,6 @@ named.conf will be
   };
 
 Make sure BINDGRAPH_USER (default www) can read this log file.
+EOM
+}
+]
diff --git a/dns/checkdns/files/pkg-message.in b/dns/checkdns/files/pkg-message.in
index e44e163e4f29..b421700da7e6 100644
--- a/dns/checkdns/files/pkg-message.in
+++ b/dns/checkdns/files/pkg-message.in
@@ -1,8 +1,12 @@
-   --------------------------------------------------------------------
-  |            >>> ATTENTION PLEASE <<<                                |
-  |                                                                    |
-  |   Please don't forget these :                                      |
-  |         - editing %%PREFIX%%/etc/checkdns.conf file !              |
-  |         - copying checkdns.css file to Html Output Directory !     |
-  |                                                                    |
-   --------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
+              >>> ATTENTION PLEASE <<<
+
+     Please don't forget these :
+           - editing %%PREFIX%%/etc/checkdns.conf file !
+           - copying checkdns.css file to Html Output Directory !
+
+EOM
+}
+]
diff --git a/dns/cli53/pkg-message b/dns/cli53/pkg-message
index bd48b2ebc3b8..e9d208f429b3 100644
--- a/dns/cli53/pkg-message
+++ b/dns/cli53/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please configure your AWS credentials, either through environment variables or
 ~/.aws/credentials config file.
 
@@ -17,3 +20,6 @@ You can switch between different sets in the credentials file by passing
 
 For example:
     cli53 list --profile my_profile
+EOM
+}
+]
diff --git a/dns/credns/pkg-message b/dns/credns/pkg-message
index 8f63a4185dd7..9786a03f8b52 100644
--- a/dns/credns/pkg-message
+++ b/dns/credns/pkg-message
@@ -1,10 +1,12 @@
-**************************************************************************
-*                                                                        *
-*   To run credns from startup, add credns_enable="YES"                  *
-*   to your /etc/rc.conf                                                 *
-*                                                                        *
-*   Take good care when using credns commands, since they often need to  *
-*   be executed as user dedicated to credns, in order for the files it   *
-*   touches or creates to have the proper permissions.                   *
-*                                                                        *
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
+   To run credns from startup, add credns_enable="YES"
+   to your /etc/rc.conf
+
+   Take good care when using credns commands, since they often need to
+   be executed as user dedicated to credns, in order for the files it
+   touches or creates to have the proper permissions.
+EOM
+}
+]
diff --git a/dns/curvedns/files/pkg-message.in b/dns/curvedns/files/pkg-message.in
index 9daef969e220..9e3a4dd04f20 100644
--- a/dns/curvedns/files/pkg-message.in
+++ b/dns/curvedns/files/pkg-message.in
@@ -1,5 +1,6 @@
-###########################################################
-
+[
+{ type: install
+  message: <<EOM
  To start using curvedns, finish the following tasks:
 
 ------- generate/install keys -----------------------------
@@ -29,5 +30,6 @@
  # examples:
  dig @<curvedns-ip> auth-dom.example any
  drill <curvedns-ip> auth-dom.example any
-
-###########################################################
+EOM
+}
+]
diff --git a/dns/ddclient/files/pkg-message.in b/dns/ddclient/files/pkg-message.in
index a320b5b7808b..226e65398842 100644
--- a/dns/ddclient/files/pkg-message.in
+++ b/dns/ddclient/files/pkg-message.in
@@ -1,5 +1,6 @@
-***********************************************************
-
+[
+{ type: install
+  message: <<EOM
 To configure ddclient, edit the following file:
 
 	%%PREFIX%%/etc/ddclient.conf
@@ -14,5 +15,6 @@ daily regardless of IP changes add the following line to
 your /etc/periodic.conf
 
 	daily_ddclient_force_enable="YES"
-
-***********************************************************
+EOM
+}
+]
diff --git a/dns/ddns/files/pkg-message.in b/dns/ddns/files/pkg-message.in
index 72ae93afa443..0d039f8a68fb 100644
--- a/dns/ddns/files/pkg-message.in
+++ b/dns/ddns/files/pkg-message.in
@@ -1,4 +1,6 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 ddns configuration files were installed in the following directory:
 
 	%%ETCDIR%%
@@ -38,4 +40,6 @@ Then you can start a ddns daemon by issuing the following command:
     or
 
 	%%PREFIX%%/etc/rc.d/ddns_client start
-========================================================================
+EOM
+}
+]
diff --git a/dns/dns2blackhole/pkg-message b/dns/dns2blackhole/pkg-message
index 813b8ce6b66a..403583aadda2 100644
--- a/dns/dns2blackhole/pkg-message
+++ b/dns/dns2blackhole/pkg-message
@@ -1,9 +1,11 @@
-########################################################################
-
+[
+{ type: install
+  message: <<EOM
                       dns2blackhole
 
    Malware Prevention through Domain Blocking (Black Hole)
 
    Issue "man dns2blackhole"  For configuration and usage information
-
-########################################################################
+EOM
+}
+]
diff --git a/dns/dnscheckengine/files/pkg-message.in b/dns/dnscheckengine/files/pkg-message.in
index 10a3212947b9..c7953d00e17f 100644
--- a/dns/dnscheckengine/files/pkg-message.in
+++ b/dns/dnscheckengine/files/pkg-message.in
@@ -1,11 +1,10 @@
-*************************************************************************
-*	    _  _____ _____ _____ _   _ _____ ___ ___  _   _ 		*
-*	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |		*
-*	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |		*
-*	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
-*	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
-*                                                                       *
-*************************************************************************
+[
+{ type: install
+  message: <<EOM
+	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |
+	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |
+	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |
+	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|
 
 The DNSCheck software included in the port is the PERL-based engine and
 includes a command line utility that uses that engine in %%PREFIX%%/bin
@@ -32,3 +31,6 @@ Academ Consulting Services
 http://www.stanbarber.com
 http://www.academ.com
 
+EOM
+}
+]
diff --git a/dns/dnscrypt-proxy2/files/pkg-message.in b/dns/dnscrypt-proxy2/files/pkg-message.in
index ba894e3b62c3..9d5b29a5b6cf 100644
--- a/dns/dnscrypt-proxy2/files/pkg-message.in
+++ b/dns/dnscrypt-proxy2/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 Version 2 of dnscrypt-proxy is written in Go and therefore isn't capable
 of dropping privileges after binding to a low port on FreeBSD.
 
@@ -56,4 +58,6 @@ Below are a few examples on how to redirect local connections from port
   If you are using local_unbound, DNSSEC is enabled by default. You should
   comment the "auto-trust-anchor-file" line or change dnscrypt-proxy to use
   servers with DNSSEC support only.
-======================================================================
+EOM
+}
+]
diff --git a/dns/dnsmasq-devel/files/pkg-message.in b/dns/dnsmasq-devel/files/pkg-message.in
index 4ec9add459b7..adcbeb5d5375 100644
--- a/dns/dnsmasq-devel/files/pkg-message.in
+++ b/dns/dnsmasq-devel/files/pkg-message.in
@@ -1,7 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+ To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
+ set dnsmasq_enable="YES" in /etc/rc.conf[.local]
 
-*** To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
-*** set dnsmasq_enable="YES" in /etc/rc.conf[.local]
-***
-*** Further options and actions are documented inside
-*** %%PREFIX%%/etc/rc.d/dnsmasq
-
+ Further options and actions are documented inside
+ %%PREFIX%%/etc/rc.d/dnsmasq
+EOM
+}
+]
diff --git a/dns/dnsmasq/files/pkg-message.in b/dns/dnsmasq/files/pkg-message.in
index 88a8ae592f96..931dec5f38c0 100644
--- a/dns/dnsmasq/files/pkg-message.in
+++ b/dns/dnsmasq/files/pkg-message.in
@@ -1,14 +1,18 @@
+[
+{ type: install
+  message: <<EOM
+ To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
+ set dnsmasq_enable="YES" in /etc/rc.conf[.local]
 
-*** To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
-*** set dnsmasq_enable="YES" in /etc/rc.conf[.local]
-***
-*** Further options and actions are documented inside
-*** %%PREFIX%%/etc/rc.d/dnsmasq
-
-*** SECURITY RECOMMENDATION
-*** ~~~~~~~~~~~~~~~~~~~~~~~
-*** It is recommended to enable the wpad-related options
-*** at the end of the configuration file (you may need to
-*** copy them from the example file to yours) to fix
-*** CERT Vulnerability VU#598349.
+ Further options and actions are documented inside
+ %%PREFIX%%/etc/rc.d/dnsmasq
 
+ SECURITY RECOMMENDATION
+ ~~~~~~~~~~~~~~~~~~~~~~~
+ It is recommended to enable the wpad-related options
+ at the end of the configuration file (you may need to
+ copy them from the example file to yours) to fix
+ CERT Vulnerability VU#598349.
+EOM
+}
+]
diff --git a/dns/dnsmax-perl/pkg-message b/dns/dnsmax-perl/pkg-message
index 91cd01e5da5b..d134aa8f1e55 100644
--- a/dns/dnsmax-perl/pkg-message
+++ b/dns/dnsmax-perl/pkg-message
@@ -1,5 +1,6 @@
-***************************************************************
-
+[
+{ type: install
+  message: <<EOM
 The DNSMax update client has been installed.  You will need
 a dynamic dns account from a DNSMax enabled provider.
 
@@ -8,5 +9,6 @@ Providers:
 - www.thatip.com
 
 To set up your configuration, run dnsmax-perl
-
-***************************************************************
+EOM
+}
+]
diff --git a/dns/dnsproxy/files/pkg-message.in b/dns/dnsproxy/files/pkg-message.in
index 1434e9d15655..89433f9442f0 100644
--- a/dns/dnsproxy/files/pkg-message.in
+++ b/dns/dnsproxy/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To enable dnsproxy you need:
 
 1) Enable dnsproxy in /etc/rc.conf with the following line:
@@ -8,7 +10,6 @@ To enable dnsproxy you need:
    dnsproxy.conf.sample file.
 
 For more information see man dnsproxy(1)
-
-**********************************************************************
-
-
+EOM
+}
+]
diff --git a/dns/dsc/files/pkg-message.in b/dns/dsc/files/pkg-message.in
index 2c8de6a11f57..5e6b7fe0f104 100644
--- a/dns/dsc/files/pkg-message.in
+++ b/dns/dsc/files/pkg-message.in
@@ -1,7 +1,9 @@
-###########################################
-
+[
+{ type: install
+  message: <<EOM
 Before you configure:
 To obtain MaxMind's GeoIP tables, install net/geoipupdate
 and run %%LOCALBASE%%/bin/geoipupdate manually.
-
-###########################################
+EOM
+}
+]
diff --git a/dns/dynip/pkg-message b/dns/dynip/pkg-message
index 89aec54092d9..bb5880260cc7 100644
--- a/dns/dynip/pkg-message
+++ b/dns/dynip/pkg-message
@@ -1,9 +1,11 @@
-########################################################################
-
+[
+{ type: install
+  message: <<EOM
                       dynip
 
              Dynamic IP Address Updater
 
    Issue "man dynip"  For set up and usage information
-
-########################################################################
+EOM
+}
+]
diff --git a/dns/gdnsd3/pkg-message b/dns/gdnsd3/pkg-message
index c54265435d9f..ee928e7b98c2 100644
--- a/dns/gdnsd3/pkg-message
+++ b/dns/gdnsd3/pkg-message
@@ -1,4 +1,6 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
 As of version 3.0.0, gdnsd no longer has the ability to bind to
 privileged ports and then drop privileges.  As a result, you must use
 mac_portacl to allow the gdnsd user to bind to 53 udp/tcp.
@@ -24,5 +26,6 @@ kldload mac_portacl
 kldload accf_dns
 kldload accf_data
 service sysctl reload
-
-************************************************************************
+EOM
+}
+]
diff --git a/dns/getdns/files/pkg-message.in b/dns/getdns/files/pkg-message.in
index f1ee9be4ba6a..36eda9b9e57b 100644
--- a/dns/getdns/files/pkg-message.in
+++ b/dns/getdns/files/pkg-message.in
@@ -1,12 +1,18 @@
-***
-***  !!! IMPORTANT !!!!  libgetdns needs a DNSSEC trust anchor!
-***
-***  For the library to be able to perform DNSSEC, the root
-***  trust anchor needs to be present in presentation format
-***  in the file:
-***     %%LOCALBASE%%/etc/unbound/root.key
-***
-***  We recomend using unbound-anchor to retrieve and install
-***  the root trust anchor like this:
-***     su -m unbound -c /usr/local/sbin/unbound-anchor
-***
+[
+{ type: install
+  message: <<EOM
+
+  !!! IMPORTANT !!!!  libgetdns needs a DNSSEC trust anchor!
+
+  For the library to be able to perform DNSSEC, the root
+  trust anchor needs to be present in presentation format
+  in the file:
+     %%LOCALBASE%%/etc/unbound/root.key
+
+  We recomend using unbound-anchor to retrieve and install
+  the root trust anchor like this:
+     su -m unbound -c /usr/local/sbin/unbound-anchor
+
+EOM
+}
+]
diff --git a/dns/kadnode/pkg-message b/dns/kadnode/pkg-message
index f7954db4d331..617527a20ba8 100644
--- a/dns/kadnode/pkg-message
+++ b/dns/kadnode/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 In order to resolve domains using kadnode all over the system, add this
 line to your /etc/nsswitch.conf:
 
 hosts: kadnode dns
 
 If the hosts line already exists, just add kadnode before the dns entry.
+EOM
+}
+]
diff --git a/dns/knot-resolver/files/pkg-message.in b/dns/knot-resolver/files/pkg-message.in
index adb121c11ba8..d72c09dbfc0a 100644
--- a/dns/knot-resolver/files/pkg-message.in
+++ b/dns/knot-resolver/files/pkg-message.in
@@ -1,5 +1,6 @@
-######################################################################
-
+[
+{ type: install
+  message: <<EOM
   Please consult the documentation:
    - man kresd
    - https://knot-resolver.readthedocs.io/
@@ -9,5 +10,6 @@
 
   If upgrading:
    - https://knot-resolver.readthedocs.io/en/stable/upgrading.html
-
-######################################################################
+EOM
+}
+]
diff --git a/dns/knot2/files/pkg-message.in b/dns/knot2/files/pkg-message.in
index 175006c9cda8..a11ffed7f5d3 100644
--- a/dns/knot2/files/pkg-message.in
+++ b/dns/knot2/files/pkg-message.in
@@ -1,5 +1,6 @@
-################################################################################
-
+[
+{ type: install
+  message: <<EOM
   To start using Knot DNS, you should complete the following tasks:
 
     cp %%ETCDIR%%/knot.conf.sample %%ETCDIR%%/knot.conf
@@ -15,6 +16,6 @@
 
   When upgrading from 2.4.x read:
    - https://www.knot-dns.cz/docs/2.5/html/migration.html#upgrade-2-4-x-to-2-5-x
-
-################################################################################
-
+EOM
+}
+]
diff --git a/dns/mDNSResponder_nss/pkg-message b/dns/mDNSResponder_nss/pkg-message
index a232498a8961..09bffe7f6012 100644
--- a/dns/mDNSResponder_nss/pkg-message
+++ b/dns/mDNSResponder_nss/pkg-message
@@ -1,6 +1,10 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 To enable the mDNSResponder NSS module, update the hosts entry in
 /etc/nsswitch.conf by adding mdns, preferably between files and dns:
 
 hosts: files mdns dns
-================================================================================
+EOM
+}
+]
diff --git a/dns/mdnsd/pkg-message b/dns/mdnsd/pkg-message
index e63520068bd3..0eeef1006d09 100644
--- a/dns/mdnsd/pkg-message
+++ b/dns/mdnsd/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 To use:
      mdnsd 'unique name' 12.34.56.78 80 '/optionalpath'
 For example:
      mdnsd audiotron 192.168.123.195 80 '/index.asp' &
+EOM
+}
+]
diff --git a/dns/mydns-ng/files/pkg-message.in b/dns/mydns-ng/files/pkg-message.in
index c6bd630bf2a3..e3e73329db69 100644
--- a/dns/mydns-ng/files/pkg-message.in
+++ b/dns/mydns-ng/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To get MyDNS working you will need to do some configuration, first you
 will need to create %%PREFIX%%/etc/mydns.conf based on the
 installed sample file. Following that you will need to setup your
@@ -17,5 +19,6 @@ You can use %%DOCSDIR%%/contrib/admin.php to maintain MyDNS.
 If you are looking for the web interface for MyDNS, it's included in
 the MyDNS distribution as %%DOCSDIR%%/contrib/admin.php.
 See %%DOCSDIR%%/contrib/README for installation instructions.
-
-*********************************************************************
+EOM
+}
+]
diff --git a/dns/mydns/files/pkg-message.in b/dns/mydns/files/pkg-message.in
index a4840bb5b715..9b2c8280f262 100644
--- a/dns/mydns/files/pkg-message.in
+++ b/dns/mydns/files/pkg-message.in
@@ -1,4 +1,6 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To get MyDNS working you will need to do some configuration, first you
 will need to create %%PREFIX%%/etc/mydns.conf based on the
 installed sample file. Following that you will need to setup your
@@ -11,4 +13,6 @@ as a template. Finally enable MyDNS by adding
  mydns_enable="YES"
 
 into your rc.conf.
-*********************************************************************
+EOM
+}
+]
diff --git a/dns/noip/files/pkg-message.in b/dns/noip/files/pkg-message.in
index 8246aa2b0bb3..1b8c40373b8e 100644
--- a/dns/noip/files/pkg-message.in
+++ b/dns/noip/files/pkg-message.in
@@ -1,4 +1,6 @@
-###########################################################
+[
+{ type: install
+  message: <<EOM
 You must have a registered host with No-IP (www.noip.com)
 to use the noip Dynamic DNS Update Client (DUC).
 
@@ -27,4 +29,6 @@ Refer to the following for more information:
 
 /usr/local/bin/noip2 --help
 /usr/local/share/doc/noip/README.FIRST
-###########################################################
+EOM
+}
+]
diff --git a/dns/nsd/pkg-message b/dns/nsd/pkg-message
index 048c29c57cdc..19b102abda8c 100644
--- a/dns/nsd/pkg-message
+++ b/dns/nsd/pkg-message
@@ -1,12 +1,14 @@
-**************************************************************************
-*
-*   To run nsd from startup, add nsd_enable="YES" to your etc/rc.conf
-*
-*   Starting with nsd version 4 the old nsdc control program has been
-*   replaced by nsd-control. This requires some manual setup with
-*   nsd-control-setup and editing of the config files.
-*
-*   nsd-control is incompatible with nsdc so when that is used in scripts,
-*   these should be adapted
-*
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
+   To run nsd from startup, add nsd_enable="YES" to your etc/rc.conf
+
+   Starting with nsd version 4 the old nsdc control program has been
+   replaced by nsd-control. This requires some manual setup with
+   nsd-control-setup and editing of the config files.
+
+   nsd-control is incompatible with nsdc so when that is used in scripts,
+   these should be adapted
+EOM
+}
+]
diff --git a/dns/opendnssec2/files/pkg-message.in b/dns/opendnssec2/files/pkg-message.in
index 389bde5fcb4d..549cc3b4f398 100644
--- a/dns/opendnssec2/files/pkg-message.in
+++ b/dns/opendnssec2/files/pkg-message.in
@@ -1,27 +1,31 @@
-######
-# A manual migration step is needed to migration from 1.4 to 2.0.
-#
-# First migrate to at least the 1.4.10 release if you have not already done
-# so.
-#
-# Review the documentation on the OpenDNSSEC site.  This can be
-# updated in between releases to provide more help.  Especially if
-# you have tooling around OpenDNSSEC you should be aware that some
-# command line utilities have changed.  A fair amount of backward
-# compatibility has been respected, but changes are present.
-# 
-# The enforcer does require a full migration, as the internal database has
-# been completely revised.  See the documentation in 
-# %%DOCSDIR%%/1.4-2.0_db_convert/README.md for a description.
-# 
-# Migration scripts are installed in %%DOCSDIR%%.
-#
-# The signer does not require any migration.  Backward compatibility is
-# respected from earlier 1.4 release.  The signer should not require a
-# full resign of your zone when upgrading, however if you decide to downgrade
-# a full resign is required.
-######
+[
+{ type: install
+  message: <<EOM
+ A manual migration step is needed to migration from 1.4 to 2.0.
+
+ First migrate to at least the 1.4.10 release if you have not already done
+ so.
+
+ Review the documentation on the OpenDNSSEC site.  This can be
+ updated in between releases to provide more help.  Especially if
+ you have tooling around OpenDNSSEC you should be aware that some
+ command line utilities have changed.  A fair amount of backward
+ compatibility has been respected, but changes are present.
+ 
+ The enforcer does require a full migration, as the internal database has
+ been completely revised.  See the documentation in 
+ %%DOCSDIR%%/1.4-2.0_db_convert/README.md for a description.
+ 
+ Migration scripts are installed in %%DOCSDIR%%.
+
+ The signer does not require any migration.  Backward compatibility is
+ respected from earlier 1.4 release.  The signer should not require a
+ full resign of your zone when upgrading, however if you decide to downgrade
+ a full resign is required.
 
 An HowTo is provided at
 <https://wiki.opendnssec.org/display/DOCS20/Quick+start+guide>
 
+EOM
+}
+]
diff --git a/dns/openresolv/files/pkg-message.in b/dns/openresolv/files/pkg-message.in
index b17d948ce23a..e25daf854019 100644
--- a/dns/openresolv/files/pkg-message.in
+++ b/dns/openresolv/files/pkg-message.in
@@ -1,8 +1,9 @@
-=================================================
-
+[
+{ type: install
+  message: <<EOM
 To make sure openresolv runs correctly
 please symlink /etc/resolv.conf to
 %%PREFIX%%/etc/resolvconf/run/resolv.conf
-
-=================================================
-
+EOM
+}
+]
diff --git a/dns/powerdns-recursor/files/pkg-message.in b/dns/powerdns-recursor/files/pkg-message.in
index a5480fd56ad2..36e346d90979 100644
--- a/dns/powerdns-recursor/files/pkg-message.in
+++ b/dns/powerdns-recursor/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
  If you want to use the powerdns recursor,
  you need the following line in /etc/rc.conf(.local)
 
@@ -7,5 +8,6 @@
 
  Configuration templates are available in %%PREFIX%%/etc/pdns
  as recursor.conf-dist.
-*******************************************************************
-
+EOM
+}
+]
diff --git a/dns/powerdns/files/pkg-message.in b/dns/powerdns/files/pkg-message.in
index 70defb2b70dd..7ad5592d6161 100644
--- a/dns/powerdns/files/pkg-message.in
+++ b/dns/powerdns/files/pkg-message.in
@@ -1,5 +1,6 @@
-
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
  Enable powerdns in /etc/rc.conf with the following line:
 
     pdns_enable="YES"
@@ -9,12 +10,17 @@
 
  A pdns.conf with all possible options is available in
  %%EXAMPLESDIR%%
-
+EOM
+}
+{ type: upgrade
+  maximum_versio: 3.4
+  message: <<EOM
  ---------------------------------------------
  IMPORTANT: PowerDNS Authoritive Server 3.4.0+:
  ---------------------------------------------
  This version needs a mandatory schema change for the gmsyql,
  gpgsql and gsqlite3 backends. SQL statements are available in
  %%DOCSDIR%% or http://doc.powerdns.com
-*******************************************************************
-
+EOM
+}
+]
diff --git a/dns/radns/files/pkg-message.in b/dns/radns/files/pkg-message.in
index 8e6cf44d5520..c0307b41c3f8 100644
--- a/dns/radns/files/pkg-message.in
+++ b/dns/radns/files/pkg-message.in
@@ -1,5 +1,6 @@
-****************************************************
-
+[
+{ type: install
+  message: <<EOM
 To enable radns, edit /etc/rc.conf and add:
 
   radns_enable="YES"
@@ -9,5 +10,6 @@ own file %%PREFIX%%/etc/radns/radns-resolv.conf.
 
 To make sure the system's /etc/resolv.conf file is created from all
 sources, read %%PREFIX%%/share/doc/radns/README.FreeBSD.
-
-****************************************************
+EOM
+}
+]
diff --git a/dns/rbldnsd/files/pkg-message.in b/dns/rbldnsd/files/pkg-message.in
index 5eaa84203b17..fcea614b8e70 100644
--- a/dns/rbldnsd/files/pkg-message.in
+++ b/dns/rbldnsd/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 The rbldnsd port has been installed with an example zone file, located
 in %%PREFIX%%/etc/rbldnsd/.
 
@@ -13,5 +14,6 @@ or
 	% nslookup -query=any 1.1.31.172.bl.example.com. localhost
 
 If you see a response that mentions 127.0.0.2, the install worked!
-
-========================================================================
+EOM
+}
+]
diff --git a/dns/sleuth/pkg-message b/dns/sleuth/pkg-message
index adedeb0e8cf6..5932f176156d 100644
--- a/dns/sleuth/pkg-message
+++ b/dns/sleuth/pkg-message
@@ -1,7 +1,9 @@
-============================================================
-
+[
+{ type: install
+  message: <<EOM
 Before you can run "sleuth" you will need to copy
 
 ${PREFIX}etc/sleuth.conf.sample to ${PREFIX}etc/sleuth.conf
-
-============================================================
+EOM
+}
+]
diff --git a/dns/unbound/files/pkg-message.in b/dns/unbound/files/pkg-message.in
index eba979e3b205..94a1f3bc8975 100644
--- a/dns/unbound/files/pkg-message.in
+++ b/dns/unbound/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Munin support requires additional configuration in the plugin config file:
 %%PREFIX%%/etc/munin/plugin-conf.d/plugins.conf
 
@@ -8,3 +11,6 @@ env.unbound_conf %%PREFIX%%/etc/unbound/unbound.conf
 env.unbound_control %%PREFIX%%/sbin/unbound-control
 env.spoof_warn 1000
 env.spoof_crit 100000
+EOM
+}
+]
diff --git a/dns/void-zones-tools/files/pkg-message.in b/dns/void-zones-tools/files/pkg-message.in
index ef5d20004008..690e2ee5df78 100644
--- a/dns/void-zones-tools/files/pkg-message.in
+++ b/dns/void-zones-tools/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To download the host lists and convert them to void zones,
 run the following script:
 %%PREFIX%%/bin/void-zones-update.sh
@@ -14,3 +17,6 @@ For future updates, run void-zones-update.sh and restart Unbound.
 
 For more information, see %%PREFIX%%/share/doc/void-zones-tools/README.md
 or https://github.com/cyclaero/void-zones-tools
+EOM
+}
+]