Index: head/devel/gitolite/files/pkg-message.in
===================================================================
--- head/devel/gitolite/files/pkg-message.in	(revision 504553)
+++ head/devel/gitolite/files/pkg-message.in	(revision 504554)
@@ -1,42 +1,48 @@
-==============================================================================
-
+[
+{
+message: <<EOT
 gitolite v2 -> v3 migration procedures:
 
 WARNING: gitolite v3 is NOT "API" compatible with gitolite v2. Any local
 modifications - hooks, scripts, ADCs, etc - must be migrated.
 
 Please refer to [0] or [1] before moving on.
 
 tl;dr:
     Run %%PREFIX%%/libexec/gitolite/check-g2-compat as your gitolite provider
     Backup gitolite-admin repo
     Remove old gitolite references (authorized_keys, rc file, gitolite-admin,
         ~/.gitolite)
     Preset rc file
     Proceed with final instructions for setup
     Push old gitolite-admin repo
 
 [0] http://sitaramc.github.com/gitolite/install.html#migr
 [1] http://sitaramc.github.com/gitolite/master-toc.html
-
-
+EOT
+  type: upgrade
+  maximum_version: "2.99"
+}
+{
+  message: <<EOT
 Final gitolite setup instructions:
 
 Any ssh user can be a gitolite provider. Simply run the following command as
 the user:
 
 %%PREFIX%%/bin/gitolite setup -pk /path/to/admin.ssh.key.pub
 
 This will setup up the configuration files and repositories for gitolite.
 
 The admin ssh key allows full access to the gitolite-admin repository where
 additional users and repositories can be configured.
 
 By default, the git user is created for use by gitolite.
 
-
 A quick-install guide can be found in:
 
 %%DOCSDIR%%/README.txt
-
-==============================================================================
+EOT
+  type: install
+}
+]
Index: head/mail/postfix-policyd-sf/pkg-message
===================================================================
--- head/mail/postfix-policyd-sf/pkg-message	(revision 504553)
+++ head/mail/postfix-policyd-sf/pkg-message	(revision 504554)
@@ -1,2 +1,6 @@
-
-Please conduct README.txt before using it.
+[
+{
+message: "Please conduct README.txt before using it."
+type: install
+}
+]
Index: head/net-mgmt/nagios/files/pkg-message.in
===================================================================
--- head/net-mgmt/nagios/files/pkg-message.in	(revision 504553)
+++ head/net-mgmt/nagios/files/pkg-message.in	(revision 504554)
@@ -1,31 +1,34 @@
-**********************************************************************
-
+[
+{
+message: <<EOT
  Enable Nagios in /etc/rc.conf with the following line:
 
    nagios_enable="YES"
 
  Configuration templates are available in %%PREFIX%%/etc/nagios as
  *.cfg-sample files.  Copy them to *.cfg files where required and
  edit to suit your needs.
 
  If you don't already have a web server running, you will need to
  install and configure one to finish off your Nagios installation.
  When used with Apache, the following should be sufficient to publish
  the web component of Nagios (modify the allow list to suit):
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
      Order deny,allow
      Deny from all
      Allow from 127.0.0.1
      php_flag engine on
      php_admin_value open_basedir %%PREFIX%%/%%NAGIOSWWWDIR%%/:%%NAGIOSDIR%%/
    </Directory>
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
      Options ExecCGI
    </Directory>
 
    ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
    Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
-
-**********************************************************************
+EOT
+type: install
+}
+]
Index: head/net-mgmt/nagios4/files/pkg-message.in
===================================================================
--- head/net-mgmt/nagios4/files/pkg-message.in	(revision 504553)
+++ head/net-mgmt/nagios4/files/pkg-message.in	(revision 504554)
@@ -1,29 +1,32 @@
-**********************************************************************
-
+[
+{
+message: <<EOT
  Enable Nagios in /etc/rc.conf with the following line:
 
    nagios_enable="YES"
 
  Configuration templates are available in %%ETCDIR%% as
  *.cfg-sample files.  Copy them to *.cfg files where required and
  edit to suit your needs.
 
  If you don't already have a web server running, you will need to
  install and configure one to finish off your Nagios installation.
  When used with Apache, the following should be sufficient to publish
  the web component of Nagios (modify the allow list to suit):
 
    <Directory %%WWWDIR%%>
      Require ip 127.0.0.1
      php_flag engine on
      php_admin_value open_basedir %%WWWDIR%%/:%%NAGIOSDIR%%/
    </Directory>
 
    <Directory %%WWWDIR%%/cgi-bin>
      Options ExecCGI
    </Directory>
 
    ScriptAlias %%NAGIOSCGIURL%%/ %%WWWDIR%%/cgi-bin/
    Alias %%NAGIOSHTMURL%%/ %%WWWDIR%%/
-
-**********************************************************************
+EOT
+type: install
+}
+]
Index: head/sysutils/munin-contrib/files/pkg-message.in
===================================================================
--- head/sysutils/munin-contrib/files/pkg-message.in	(revision 504553)
+++ head/sysutils/munin-contrib/files/pkg-message.in	(revision 504554)
@@ -1,12 +1,18 @@
+[
+{
+message: <<EOD
 To avoid having too many plugins activating at once when this port
 is installed, the contributed plugins from this port are NOT installed
 in munin's plugins directory.
 
 The best way to use a contributed plugin is to make a symlink to
 it to munin's plugins directory, for example:
 
   ln -s %%EXAMPLESDIR%%/plugins/cyrus/cyrus-imapd %%PREFIX%%/share/munin/plugins/
 
 Note that as this is a "contrib" port, some plugins may need some
 dependencies to run that are not provided by this port.
-
+EOD
+type: install
+}
+]
Index: head/sysutils/munin-master/files/pkg-message.in
===================================================================
--- head/sysutils/munin-master/files/pkg-message.in	(revision 504553)
+++ head/sysutils/munin-master/files/pkg-message.in	(revision 504554)
@@ -1,26 +1,36 @@
-********************************************************************
+[
+{
+message: <<EOT
 Unless this file already existed, a sample configuration file
 has been placed in %%ETCDIR%%/munin.conf.
 
 Please edit it according to your needs.
 
 The Munin server will be run from cron under the user 'munin'.
 
 If you need to customize the munin crontab, remove the lines
 containing #BEGIN_MUNIN_MAIN and #END_MUNIN_MAIN, and add a line
 with #MANUAL_MUNIN_CRONTAB.
-********************************************************************
+EOT
+type: install
+}
+{
+message: <<EOT
 The munin-master newsyslog.conf(5) filename has been changed:
   OLD: ${PREFIX}/etc/newsyslog.conf.d/munin-master
   NEW: ${PREFIX}/etc/newsyslog.conf.d/munin-master.conf
 
 Any file found at the old location has been automatically moved to
 the new location. This was done to ensure log rotation continued to
 work after change r340318 made to FreeBSD base, where the default
 newsyslog configuration now only includes filenames that end with
 '.conf' and do not begin with '.'.
 
 If you use provisioning/configuration management tools to create or
 edit this file, you will need to change their configuration to use
 the new filename.
-********************************************************************
+EOT
+type: upgrade
+maximum_version: "2.0.43_1"
+}
+]
Index: head/sysutils/munin-node/files/pkg-message.in
===================================================================
--- head/sysutils/munin-node/files/pkg-message.in	(revision 504553)
+++ head/sysutils/munin-node/files/pkg-message.in	(revision 504554)
@@ -1,42 +1,49 @@
-********************************************************************
+[
+{
+message: <<EOT
 Unless this file already existed, a sample configuration file
 has been placed in %%ETCDIR%%/munin-node.conf.
 
 Please edit it according to your needs.
 
-********************************************************************
-
 The Munin client will *not* be started automatically. To allow it
 to start, put this line in /etc/rc.conf:
 
 munin_node_enable="YES"
 
 Then, it will be started on the next boot. If this line is already
 present, the client will be started now.  Otherwise, edit
 /etc/rc.conf and execute this command:
 
     %%PREFIX%%/etc/rc.d/munin-node start
-********************************************************************
 
 For a list of plugins that will probably work run
 %%PREFIX%%/sbin/munin-node-configure --suggest
 
 If this is a fresh install run
 %%PREFIX%%/sbin/munin-node-configure --shell | sh -x
 to install the plugins automatically
 
-********************************************************************
+EOT
+type: install
+}
+{
+message: <<EOT
 The munin-node newsyslog.conf(5) filename has been changed:
   OLD: ${PREFIX}/etc/newsyslog.conf.d/munin-node
   NEW: ${PREFIX}/etc/newsyslog.conf.d/munin-node.conf
 
 Any file found at the old location has been automatically moved to
 the new location. This was done to ensure log rotation continued to
 work after change r340318 made to FreeBSD base, where the default
 newsyslog configuration now only includes filenames that end with
 '.conf' and do not begin with '.'.
 
 If you use provisioning/configuration management tools to create or
 edit this file, you will need to change their configuration to use
 the new filename.
-********************************************************************
+EOT
+type: upgrade
+maximum_version: "2.0.43_1"
+}
+]
Index: head/www/ikiwiki/pkg-message
===================================================================
--- head/www/ikiwiki/pkg-message	(revision 504553)
+++ head/www/ikiwiki/pkg-message	(revision 504554)
@@ -1,8 +1,12 @@
-===============================================================================
+[
+{
+message: <<EOD
 Some of the non-default ikiwiki plug-ins may require additional perl
 modules. Please see the following URL for more information:
 
 http://ikiwiki.info/plugins/
 
 NOTE: Remember to regenerate any ikiwiki wrappers after upgrading.
-===============================================================================
+EOD
+}
+]