8 files changed, 72 insertions, 29 deletions
diff --git a/devel/gitolite/files/pkg-message.in b/devel/gitolite/files/pkg-message.in
index b2fa60cf7b12..c1e820698c75 100644
--- a/devel/gitolite/files/pkg-message.in
+++ b/devel/gitolite/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{
+message: <<EOT
 gitolite v2 -> v3 migration procedures:
 
 WARNING: gitolite v3 is NOT "API" compatible with gitolite v2. Any local
@@ -18,8 +19,12 @@ tl;dr:
 
 [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
@@ -34,9 +39,10 @@ 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
+}
+]
diff --git a/mail/postfix-policyd-sf/pkg-message b/mail/postfix-policyd-sf/pkg-message
index 289c2b272656..98d34f12f011 100644
--- a/mail/postfix-policyd-sf/pkg-message
+++ b/mail/postfix-policyd-sf/pkg-message
@@ -1,2 +1,6 @@
-
-Please conduct README.txt before using it.
+[
+{
+message: "Please conduct README.txt before using it."
+type: install
+}
+]
diff --git a/net-mgmt/nagios/files/pkg-message.in b/net-mgmt/nagios/files/pkg-message.in
index adf8b0d2c650..75926229c250 100644
--- a/net-mgmt/nagios/files/pkg-message.in
+++ b/net-mgmt/nagios/files/pkg-message.in
@@ -1,5 +1,6 @@
-**********************************************************************
-
+[
+{
+message: <<EOT
  Enable Nagios in /etc/rc.conf with the following line:
 
    nagios_enable="YES"
@@ -27,5 +28,7 @@
 
    ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
    Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
-
-**********************************************************************
+EOT
+type: install
+}
+]
diff --git a/net-mgmt/nagios4/files/pkg-message.in b/net-mgmt/nagios4/files/pkg-message.in
index f3f36a5fa47a..4f4ce1dff5f4 100644
--- a/net-mgmt/nagios4/files/pkg-message.in
+++ b/net-mgmt/nagios4/files/pkg-message.in
@@ -1,5 +1,6 @@
-**********************************************************************
-
+[
+{
+message: <<EOT
  Enable Nagios in /etc/rc.conf with the following line:
 
    nagios_enable="YES"
@@ -25,5 +26,7 @@
 
    ScriptAlias %%NAGIOSCGIURL%%/ %%WWWDIR%%/cgi-bin/
    Alias %%NAGIOSHTMURL%%/ %%WWWDIR%%/
-
-**********************************************************************
+EOT
+type: install
+}
+]
diff --git a/sysutils/munin-contrib/files/pkg-message.in b/sysutils/munin-contrib/files/pkg-message.in
index 46527119176c..c0e4447a1b1c 100644
--- a/sysutils/munin-contrib/files/pkg-message.in
+++ b/sysutils/munin-contrib/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{
+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.
@@ -9,4 +12,7 @@ it to munin's plugins directory, for example:
 
 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
+}
+]
diff --git a/sysutils/munin-master/files/pkg-message.in b/sysutils/munin-master/files/pkg-message.in
index fbb806fb3c78..5bd0f0a0cc11 100644
--- a/sysutils/munin-master/files/pkg-message.in
+++ b/sysutils/munin-master/files/pkg-message.in
@@ -1,4 +1,6 @@
-********************************************************************
+[
+{
+message: <<EOT
 Unless this file already existed, a sample configuration file
 has been placed in %%ETCDIR%%/munin.conf.
 
@@ -9,7 +11,11 @@ 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
@@ -23,4 +29,8 @@ newsyslog configuration now only includes filenames that end with
 If you use provisioning/configuration management tools to create or
 edit this file, you will need to change their configuration to use
 the new filename.
-********************************************************************
+EOT
+type: upgrade
+maximum_version: "2.0.43_1"
+}
+]
diff --git a/sysutils/munin-node/files/pkg-message.in b/sysutils/munin-node/files/pkg-message.in
index b652c5a2ad97..2042a1548601 100644
--- a/sysutils/munin-node/files/pkg-message.in
+++ b/sysutils/munin-node/files/pkg-message.in
@@ -1,11 +1,11 @@
-********************************************************************
+[
+{
+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:
 
@@ -16,7 +16,6 @@ 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
@@ -25,7 +24,11 @@ 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
@@ -39,4 +42,8 @@ newsyslog configuration now only includes filenames that end with
 If you use provisioning/configuration management tools to create or
 edit this file, you will need to change their configuration to use
 the new filename.
-********************************************************************
+EOT
+type: upgrade
+maximum_version: "2.0.43_1"
+}
+]
diff --git a/www/ikiwiki/pkg-message b/www/ikiwiki/pkg-message
index 4cd11bddc4e4..6211ef363ebf 100644
--- a/www/ikiwiki/pkg-message
+++ b/www/ikiwiki/pkg-message
@@ -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
+}
+]