32 files changed, 197 insertions, 79 deletions

diff --git a/irc/anope/files/pkg-message.in b/irc/anope/files/pkg-message.in
index 351348f024de..f4c60ba13053 100644
--- a/irc/anope/files/pkg-message.in
+++ b/irc/anope/files/pkg-message.in
@@ -1,15 +1,18 @@
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
+[
+{ type: install
+  message: <<EOM
 Anope now installs to %%LOCALBASE%%/anope
-
+EOM
+}
+{ type: upgrade
+  maximum_version: 2.0.0
+  message: <<EOM
 If you are upgrading from <2.0.0, you will need
 to migrate your configs to the new format. There
 is also a guide to migrate your databases to the
 new format. Please read the release notes for 2.0.0.
 
 https://www.anope.org/news.php?id=79
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-
+EOM
+}
+]
diff --git a/irc/bip/files/pkg-message.in b/irc/bip/files/pkg-message.in
index 5f2cf353e635..a0cc8d6dd17d 100644
--- a/irc/bip/files/pkg-message.in
+++ b/irc/bip/files/pkg-message.in
@@ -1,4 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+[
+{ type: install
+  message: <<EOM
 Your sample configuration files have been installed in:
 %%EXAMPLESDIR%%/bip.conf
 
@@ -6,4 +8,6 @@ You must create a directory named .bip in your home directory,
 copy bip.conf there and edit it for your settings.
 
 bip will not start if you don't do this.
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/irc/bitlbee/files/pkg-message.in b/irc/bitlbee/files/pkg-message.in
index 9ca1d122ed4a..12ef1b7d9f78 100644
--- a/irc/bitlbee/files/pkg-message.in
+++ b/irc/bitlbee/files/pkg-message.in
@@ -1,4 +1,6 @@
-/************************************************************************
+[
+{ type: install
+  message: <<EOM
 To configure bitlbee, do the following:
 
 Copy %%EXAMPLESDIR%%/bitlbee.conf
@@ -19,5 +21,6 @@ To instead launch bitlbee as a daemon, add the following line to
 /etc/rc.conf:
 
 bitlbee_enable="YES"
-
-*************************************************************************/
+EOM
+}
+]
diff --git a/irc/darkbot/files/pkg-message.in b/irc/darkbot/files/pkg-message.in
index 76a0e833a0d3..ab1ef37fa1b8 100644
--- a/irc/darkbot/files/pkg-message.in
+++ b/irc/darkbot/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Before using darkbot, it must be configured.
 
 Configuration is achieved using:
 
 # sh %%ETCDIR%%/configure
+EOM
+}
+]
diff --git a/irc/dircproxy/files/pkg-message.in b/irc/dircproxy/files/pkg-message.in
index 376da0d3bfbf..87a0e9b9b74f 100644
--- a/irc/dircproxy/files/pkg-message.in
+++ b/irc/dircproxy/files/pkg-message.in
@@ -1,8 +1,10 @@
-##################################################################
-
+[
+{ type: install
+  message: <<EOM
 A default dircproxy configuration file has been installed as:
 %%DATADIR%%/dircproxyrc.sample
 
 Please read this and the dircproxy(1) manpage to set up dircproxy.
-
-##################################################################
+EOM
+}
+]
diff --git a/irc/eggdrop-devel/files/pkg-message.in b/irc/eggdrop-devel/files/pkg-message.in
index 68f969678c0c..b885cab6f1cf 100644
--- a/irc/eggdrop-devel/files/pkg-message.in
+++ b/irc/eggdrop-devel/files/pkg-message.in
@@ -1,10 +1,12 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 This Port of Eggdrop differs from a normal eggdrop installation, because
 it does respect hier(7). That means your eggdrop.conf goes to
 %%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to
 %%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and
 documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go
 to %%PREFIX%%/share/eggdrop/scripts.
-
-========================================================================
+EOM
+}
+]
diff --git a/irc/eggdrop/files/pkg-message.in b/irc/eggdrop/files/pkg-message.in
index 68f969678c0c..b885cab6f1cf 100644
--- a/irc/eggdrop/files/pkg-message.in
+++ b/irc/eggdrop/files/pkg-message.in
@@ -1,10 +1,12 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 This Port of Eggdrop differs from a normal eggdrop installation, because
 it does respect hier(7). That means your eggdrop.conf goes to
 %%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to
 %%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and
 documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go
 to %%PREFIX%%/share/eggdrop/scripts.
-
-========================================================================
+EOM
+}
+]
diff --git a/irc/epic4/pkg-message b/irc/epic4/pkg-message
index 48c6daacb768..3180174dd38f 100644
--- a/irc/epic4/pkg-message
+++ b/irc/epic4/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 EPIC is a toolkit, much akin to a box of legos.  It strives to let you
 build a client the way you want it.  You will not find EPIC usable without
 a script of some sort.
 
 Some of the more popular scripts can be found at:
 http://epicsol.org/doku.php?id=scripts
+EOM
+}
+]
diff --git a/irc/epic5/pkg-message b/irc/epic5/pkg-message
index 2e345279da73..31b8e91e4020 100644
--- a/irc/epic5/pkg-message
+++ b/irc/epic5/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 You will find EPIC to be a bit primitive without a script of some sort.
 
 Some of the more popular scripts can be found at:
 http://scripts.epicsol.org/doku.php/scripts
+EOM
+}
+]
diff --git a/irc/ezbounce/files/pkg-message.in b/irc/ezbounce/files/pkg-message.in
index 7019c64458a1..b8cfaeb98141 100644
--- a/irc/ezbounce/files/pkg-message.in
+++ b/irc/ezbounce/files/pkg-message.in
@@ -1,4 +1,8 @@
-------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 You will need to edit %%PREFIX%%/etc/ezb.conf and read the docs in
 %%DOCSDIR%%/README to set up this program.
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/gseen.mod/files/pkg-message.in b/irc/gseen.mod/files/pkg-message.in
index f26510132937..b4c46b788e13 100644
--- a/irc/gseen.mod/files/pkg-message.in
+++ b/irc/gseen.mod/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Please add the line source %%PREFIX%%/etc/gseen.conf at the end of
 your eggdrop config file and .rehash your bot
+EOM
+}
+]
diff --git a/irc/hexchat/files/pkg-message.in b/irc/hexchat/files/pkg-message.in
index 80d8bd6bb87c..2f12aae0ea86 100644
--- a/irc/hexchat/files/pkg-message.in
+++ b/irc/hexchat/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 HexChat has been installed.
 
 If you want spell-check to work, you need to install Aspell
@@ -7,5 +8,6 @@ dictionary for your language.
 
 For FiSH Protection it is best to use irc/py-fishcrypt, HexChat has one
 Option FiSHLiM which doesn't work good.
-
-===============================================================================
+EOM
+}
+]
diff --git a/irc/ircd-hybrid/files/pkg-message.in b/irc/ircd-hybrid/files/pkg-message.in
index 880ea30ac8fb..ec4ea2199b31 100644
--- a/irc/ircd-hybrid/files/pkg-message.in
+++ b/irc/ircd-hybrid/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 ircd-hybrid has now been installed.
 
 *** IMPORTANT: ***
@@ -14,3 +17,6 @@ ircd_hybrid_enable="YES"
 into your /etc/rc.conf.  You may then start the server by running:
 
 	%%PREFIX%%/etc/rc.d/ircd-hybrid start
+EOM
+}
+]
diff --git a/irc/ircd-ratbox-devel/files/pkg-message.in b/irc/ircd-ratbox-devel/files/pkg-message.in
index 75c12c16a970..796b5c987e81 100644
--- a/irc/ircd-ratbox-devel/files/pkg-message.in
+++ b/irc/ircd-ratbox-devel/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ircd-ratbox-devel has been successfully installed.
 
 Sample 'ircd.conf' and 'ircd.motd' files have been created in the
@@ -28,4 +30,6 @@ should be added as a configuration setting (use_sslonly) in the
 ircd.conf file in order to activate the +S channel mode.
 
 Be sure to check out 'ratbox-services' if you need a services package.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ircd-ratbox/files/pkg-message.in b/irc/ircd-ratbox/files/pkg-message.in
index 45d3fb825fef..c6c4b6a99c92 100644
--- a/irc/ircd-ratbox/files/pkg-message.in
+++ b/irc/ircd-ratbox/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ircd-ratbox has been successfully installed.
 
 Sample 'ircd.conf' and 'ircd.motd' files have been created in the
@@ -33,4 +35,6 @@ For more information on upgrading, see:
 	http://svn.ratbox.org/svnroot/ircd-ratbox/trunk/INSTALL
 
 Be sure to check out 'ratbox-services' if you need a services package.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ircd-ru/files/pkg-message.in b/irc/ircd-ru/files/pkg-message.in
index e96514060493..ac965c1abdc6 100644
--- a/irc/ircd-ru/files/pkg-message.in
+++ b/irc/ircd-ru/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-----------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 ircd-RU has now been installed.
 
 This port create user ircd and group ircd
@@ -12,5 +12,6 @@ You should now edit %%PREFIX%%/ircd-RU/etc/ircd.conf
 You may then start the server by running:
  echo ircd_enable=\"YES\" >> /etc/rc.conf
  %%PREFIX%%/etc/rc.d/ircd.sh start
-
-----------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ircservices/files/pkg-message.in b/irc/ircservices/files/pkg-message.in
index a5d6bc1603b3..a1c486b9bfdf 100644
--- a/irc/ircservices/files/pkg-message.in
+++ b/irc/ircservices/files/pkg-message.in
@@ -1,4 +1,8 @@
-**********          IMPORTANT           **********
+[
+{ type: install
+  message: <<EOM
 The configuration directory has changed to %%PREFIX%%/etc/ircservices
 Please copy your old config files there if updating
-**********          IMPORTANT           *********
+EOM
+}
+]
diff --git a/irc/iroffer-dinoex/pkg-message b/irc/iroffer-dinoex/pkg-message
index 827c9c101b63..fed23e24f7fc 100644
--- a/irc/iroffer-dinoex/pkg-message
+++ b/irc/iroffer-dinoex/pkg-message
@@ -1,5 +1,6 @@
-=========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Sample configuration and crontab files have been placed in
 ${PREFIX}/share/examples/iroffer.
 
@@ -17,5 +18,6 @@ For more details on how to use the program see the comments in
 ${PREFIX}/share/examples/iroffer/sample.config, as well as the README
 files ${PREFIX}/share/doc/iroffer/README and
 ${PREFIX}/share/doc/iroffer/WHATSNEW.
-
-=========================================================================
+EOM
+}
+]
diff --git a/irc/iroffer-lamm/pkg-message b/irc/iroffer-lamm/pkg-message
index 827c9c101b63..fed23e24f7fc 100644
--- a/irc/iroffer-lamm/pkg-message
+++ b/irc/iroffer-lamm/pkg-message
@@ -1,5 +1,6 @@
-=========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Sample configuration and crontab files have been placed in
 ${PREFIX}/share/examples/iroffer.
 
@@ -17,5 +18,6 @@ For more details on how to use the program see the comments in
 ${PREFIX}/share/examples/iroffer/sample.config, as well as the README
 files ${PREFIX}/share/doc/iroffer/README and
 ${PREFIX}/share/doc/iroffer/WHATSNEW.
-
-=========================================================================
+EOM
+}
+]
diff --git a/irc/minbif/files/pkg-message.in b/irc/minbif/files/pkg-message.in
index 50ab96117464..8bb89018232b 100644
--- a/irc/minbif/files/pkg-message.in
+++ b/irc/minbif/files/pkg-message.in
@@ -1,4 +1,6 @@
-/************************************************************************
+[
+{ type: install
+  message: <<EOM
 To configure minbif, do the following:
 
 Copy %%PREFIX%%/etc/minbif/minbif.conf-dist
@@ -14,5 +16,6 @@ minbif.
 To launch the minbif daemon, add the following line to /etc/rc.conf:
 
 minbif_enable="YES"
-
-*************************************************************************/
+EOM
+}
+]
diff --git a/irc/pircbot/files/pkg-message.in b/irc/pircbot/files/pkg-message.in
index e04808be2308..913fbf06da44 100644
--- a/irc/pircbot/files/pkg-message.in
+++ b/irc/pircbot/files/pkg-message.in
@@ -1,4 +1,6 @@
----------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To use pircbot add %%JAVAJARDIR%%/pircbot.jar to
 your classpath. A short tutorial can be found here:
     http://www.jibble.org/pircbot.php
@@ -6,4 +8,6 @@ your classpath. A short tutorial can be found here:
 If you have the DOCS option enabled the pircbot javadoc
 documentation will also have been installed in:
     %%DOCSDIR%%
----------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/psybnc/files/pkg-message.in b/irc/psybnc/files/pkg-message.in
index 5adf0b170134..26c0128bf74d 100644
--- a/irc/psybnc/files/pkg-message.in
+++ b/irc/psybnc/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 If you have not created SSL certificates for psybnc already, do so using the
 following commands:
 
@@ -8,3 +11,6 @@ cd %%PSYBASE%%
         -key key/psybnc.key.pem -out key/psybnc.cert.pem
 /usr/bin/openssl x509 -subject -dates -fingerprint -noout \
         -in key/psybnc.cert.pem
+EOM
+}
+]
diff --git a/irc/py-fishcrypt/files/pkg-message.in b/irc/py-fishcrypt/files/pkg-message.in
index d72aeeacbae7..1b8149580b18 100644
--- a/irc/py-fishcrypt/files/pkg-message.in
+++ b/irc/py-fishcrypt/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 py-fishcrypt has been installed.
 
 To make FiSH work with py-fishcrypt please do symlink as user
@@ -9,6 +10,6 @@ To make FiSH work with py-fishcrypt please do symlink as user
 For HexChat
 
     ln -sf %%DATADIR%%/fishcrypt.py ~/.config/hexchat/addons/
-
-
-===============================================================================
+EOM
+}
+]
diff --git a/irc/py-supybot/pkg-message b/irc/py-supybot/pkg-message
index 7c6c9845b7cf..2feea7ece9ea 100644
--- a/irc/py-supybot/pkg-message
+++ b/irc/py-supybot/pkg-message
@@ -1,4 +1,6 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Supybot is installed.
 
 For a quick start:
@@ -11,4 +13,6 @@ installed.
 
 **WARNING** Some config names changed between some versions.
 Review the ChangeLog document in the documentation directory.
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/quassel/files/pkg-message.in b/irc/quassel/files/pkg-message.in
index d492d5d4c84a..36e8ef204536 100644
--- a/irc/quassel/files/pkg-message.in
+++ b/irc/quassel/files/pkg-message.in
@@ -1,4 +1,6 @@
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 To run quasselcore at system start-up, add quasselcore_enable="YES"
 to /etc/rc.conf.
 
@@ -14,4 +16,6 @@ or
 By default quasselcore listens on 4242 port at localhost.
 To change default behavior set quasselcore_args variable in /etc/rc.conf.
 See 'quasselcore --help' for available arguments.
-=============================================================================
+EOM
+}
+]
diff --git a/irc/ratbox-respond/files/pkg-message.in b/irc/ratbox-respond/files/pkg-message.in
index 826b46ba980c..fbb8b9aa3fc1 100644
--- a/irc/ratbox-respond/files/pkg-message.in
+++ b/irc/ratbox-respond/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ratbox-respond has been successfully installed.
 
 Be sure to look in:
@@ -6,4 +8,6 @@ Be sure to look in:
   %%EXAMPLESDIR%%/client-scripts
 
 for some example scripts for various popular IRC clients.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/ratbox-services/files/pkg-message.in b/irc/ratbox-services/files/pkg-message.in
index 43e4363b1aa2..aaf10aa5bcd7 100644
--- a/irc/ratbox-services/files/pkg-message.in
+++ b/irc/ratbox-services/files/pkg-message.in
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 ratbox-services has been successfully installed.
 
 A sample configuration file 'ratbox-services.conf' has been created in
@@ -62,5 +64,6 @@ Database Support Note:
 In recent versions, support for MySQL and PgSQL lib detection has been slightly
 broken and currently does not work as expected. This problem should be resolved
 in the next release.
-
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/rbot/files/pkg-message.in b/irc/rbot/files/pkg-message.in
index 38728890e188..4a868bbde846 100644
--- a/irc/rbot/files/pkg-message.in
+++ b/irc/rbot/files/pkg-message.in
@@ -1,7 +1,11 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
   There are many plugins supported by rbot. Each plugin may require specific
   libraries. Before these plugins run correctly, you should make sure those
   libs required are available.
 
   For more details, please check %%DOCSDIR%%/REQUIREMENTS.
-===============================================================================
+EOM
+}
+]
diff --git a/irc/riece/pkg-message b/irc/riece/pkg-message
index ee36e575fc2f..47697dd14e45 100644
--- a/irc/riece/pkg-message
+++ b/irc/riece/pkg-message
@@ -1,8 +1,12 @@
-**********************************************************************
+[
+{ type: install
+  message: <<EOM
 To use riece, you should add the following line to your .emacs file:
 
 (autoload 'riece "riece" "Start Riece" t)
 
 Some add-ons (e.g. riece-async, riece-rdcc) require Ruby.
 If you use them, you need to install Ruby from port or package.
-**********************************************************************
+EOM
+}
+]
diff --git a/irc/sirc/files/pkg-message-socks b/irc/sirc/files/pkg-message-socks
index c8dcaf6086b5..3807d9c86e1a 100644
--- a/irc/sirc/files/pkg-message-socks
+++ b/irc/sirc/files/pkg-message-socks
@@ -1,5 +1,6 @@
-
-***************************************************************************
+[
+{ type: install
+  message: <<EOM
 	SOCKS support has been added.  To take advantage of it you
 	must add the following to ~/.sircrc.pl:
 
@@ -8,5 +9,6 @@ $ENV{"SOCKS_SERVER"}	=		# You must set this
 # $ENV{"SOCKS_DNS"}	= 1		# For DNS through the proxy
 
 &load("socks.pl");
-***************************************************************************
-
+EOM
+}
+]
diff --git a/irc/srvx/files/pkg-message.in b/irc/srvx/files/pkg-message.in
index 40c4b21c687a..fb2a17172db8 100644
--- a/irc/srvx/files/pkg-message.in
+++ b/irc/srvx/files/pkg-message.in
@@ -1,5 +1,9 @@
-------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 When you 'make deinstall', any files generated by srvx (logs, etc)
 will remain in %%PREFIX%%/etc/. These files must be removed
 manually.
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/irc/undernet-ircu/files/pkg-message.in b/irc/undernet-ircu/files/pkg-message.in
index c796cfcc16ce..e9ba7e6fc6a7 100644
--- a/irc/undernet-ircu/files/pkg-message.in
+++ b/irc/undernet-ircu/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 	To run undernet ircu you must add 'undernet_enable="YES"' to
 	"/etc/rc.conf" .  It can then be started with
 	"%%PREFIX%%/etc/rc.d/undernet start"
@@ -5,3 +8,6 @@
 	You must also copy "%%PREFIX%%/etc/ircd.conf.example" to
 	"%%PREFIX%%/etc/ircd.conf\" and modify its settings according to
 	your needs.  See documentation at http://coder-com.undernet.org.
+EOM
+}
+]