From 79698c84577df2797724d484418f1de7f67bf07f Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 13 Aug 2019 16:03:11 +0000
Subject: [PATCH] Convert to UCL & cleanup pkg-message (categories e-g)

---
 editors/gomate/pkg-message                    |  6 ++++
 editors/kak-lsp/files/pkg-message.in          |  6 ++++
 editors/lazarus/files/pkg-message.in          | 10 +++---
 editors/led/files/pkg-message.in              | 10 +++---
 editors/mp/pkg-message                        | 10 +++---
 editors/openoffice-4/files/pkg-message.in     |  6 ++++
 editors/openoffice-devel/files/pkg-message.in |  6 ++++
 editors/paredit-mode.el/pkg-message           | 10 +++---
 editors/py-pynvim/files/pkg-message.in        |  6 ++++
 editors/slime/files/pkg-message.in            |  8 +++--
 editors/tamago/pkg-message                    |  6 ++++
 editors/teco/pkg-message                      |  6 ++++
 editors/tetradraw/pkg-message                 |  8 +++--
 editors/treeform/pkg-message                  |  8 +++--
 emulators/bochs/files/pkg-message.in          | 10 +++---
 emulators/cannonball/pkg-message              |  8 +++--
 emulators/dtcyber/files/pkg-message.in        | 10 +++---
 emulators/fmsx/pkg-message                    |  8 +++--
 emulators/gngeo/files/pkg-message.in          | 10 +++---
 emulators/hercules/pkg-message                | 12 +++----
 .../i386-wine-devel/files/pkg-message.in      |  6 ++++
 emulators/i386-wine/files/pkg-message.in      |  6 ++++
 emulators/jzintv/files/pkg-message.in         | 12 +++----
 emulators/klh10/files/pkg-message.in          | 14 +++++---
 emulators/klh10/pkg-message                   |  8 +++--
 emulators/linux_base-c6/pkg-message           |  6 ++++
 emulators/linux_base-c7/pkg-message           |  6 ++++
 emulators/mame/files/pkg-message.in           | 10 +++---
 emulators/mednafen/files/pkg-message.in       | 10 +++---
 emulators/mtools/files/pkg-message.in         |  8 +++--
 emulators/mupen64plus/pkg-message             | 10 +++---
 emulators/o2em/pkg-message                    |  8 +++--
 emulators/pipelight/pkg-message               |  6 ++++
 emulators/ppsspp/files/pkg-message.in         |  6 ++++
 emulators/qemu-devel/pkg-message              |  6 ++++
 emulators/qemu-sbruno/pkg-message             |  6 ++++
 emulators/qemu/pkg-message                    |  6 ++++
 emulators/qemu2/pkg-message                   |  6 ++++
 emulators/qemu30/pkg-message                  |  6 ++++
 emulators/qmc2/pkg-message                    | 10 +++---
 emulators/simh/files/pkg-message.in           | 10 +++---
 emulators/vba/files/pkg-message.in            |  8 +++--
 emulators/vice/pkg-message                    |  6 ++++
 .../virtualbox-ose-additions/pkg-message      | 10 +++---
 emulators/virtualbox-ose/pkg-message          | 10 +++---
 emulators/wine-devel/files/pkg-message.in     |  6 ++++
 emulators/wine/files/pkg-message.in           |  6 ++++
 emulators/winetricks/pkg-message              |  6 ++++
 emulators/x49gp/pkg-message                   | 14 +++++---
 emulators/xen-kernel/pkg-message              |  6 ++++
 emulators/xhomer/files/pkg-message.in         |  8 +++--
 emulators/xsystem35/files/pkg-message.in      |  7 +++-
 finance/bitcoinnodestats/files/pkg-message.in | 10 +++---
 .../electrum/files/pkg-message-hwwallet.in    |  6 ++++
 finance/frontaccounting/files/pkg-message.in  | 10 +++---
 finance/ktoblzcheck/files/pkg-message.in      |  8 +++--
 finance/ledgersmb/files/pkg-message.in        | 10 +++---
 finance/ledgersmb12/files/pkg-message.in      | 11 ++++---
 finance/prestashop/files/pkg-message.in       |  8 +++--
 .../sabernetdcs-client/files/pkg-message.in   |  8 +++--
 finance/sql-ledger/files/pkg-message.in       | 10 +++---
 finance/trytond28/files/pkg-message.in        | 11 ++++---
 finance/weberp/files/pkg-message.in           | 11 ++++---
 french/aster/files/pkg-message.in             |  6 ++++
 french/aster/files/pkg-message.sans-astk.in   |  6 ++++
 .../files/pkg-message.in                      |  8 +++--
 french/homard/pkg-message                     |  6 ++++
 french/wordpress/files/pkg-message.in         |  7 +++-
 ftp/bsdftpd-ssl/files/pkg-message.in          |  8 +++--
 ftp/frox/files/pkg-message.in                 |  8 +++--
 ftp/net2ftp/files/pkg-message.in              |  7 +++-
 ftp/oftpd/pkg-message                         |  8 +++--
 ftp/p5-Net-FTPServer/files/pkg-message.in     |  8 +++--
 ftp/php-fastdfs/pkg-message                   |  8 ++++-
 ftp/pure-ftpd/files/pkg-message.in            |  6 ++++
 ftp/tnftpd/files/pkg-message.in               |  8 +++--
 games/4stattack/files/pkg-message.in          | 10 +++---
 games/OpenTomb/pkg-message                    |  6 ++++
 games/adom/files/pkg-message.in               |  7 +++-
 games/alephone-data/pkg-message               | 10 +++---
 games/alephone-scenarios/pkg-message          | 10 +++---
 games/alephone/pkg-message                    | 10 +++---
 games/alienarena/files/pkg-message.in         | 10 +++---
 games/allacrost/pkg-message                   |  6 ++++
 games/aquaria/files/pkg-message.in            |  6 ++++
 games/arx-libertatis/files/pkg-message.in     | 10 +++---
 games/asc/pkg-message                         |  6 ++++
 games/awale/files/pkg-message.in              | 10 +++---
 games/banihstypos/files/pkg-message.in        | 10 +++---
 games/barony/files/pkg-message.in             |  6 ++++
 games/bass/files/pkg-message.in               | 30 +++++++++--------
 games/blackshadeselite/pkg-message            |  6 ++++
 games/cake/pkg-message                        |  6 ++++
 games/chocolate-doom/pkg-message              | 10 +++---
 games/conquest/files/pkg-message.in           |  6 ++++
 games/corsix-th/pkg-message                   |  8 +++--
 games/crafty-tablebase-no-pawn/pkg-message    |  9 ++++--
 games/crafty/pkg-message                      |  6 ++++
 games/d2x/pkg-message                         |  6 ++++
 games/devilutionX/pkg-message                 |  6 ++++
 games/dhewm3/files/pkg-message.in             |  6 ++++
 games/digger-vgl/pkg-message.sound            |  6 ++++
 games/doom-data/files/pkg-message.in          | 10 +++---
 games/doomsday/pkg-message                    | 10 +++---
 games/dxx-rebirth/pkg-message                 |  6 ++++
 games/eboard/pkg-message                      | 10 +++---
 games/ecwolf/files/pkg-message.in             | 10 +++---
 games/eduke32/files/pkg-message.in            | 10 +++---
 games/egoboo/pkg-message                      |  6 ++++
 games/einstein/pkg-message                    |  6 ++++
 games/endless-sky-high-dpi/pkg-message        |  6 ++++
 games/enigma/files/pkg-message.in             |  6 ++++
 games/exhaust-ma/pkg-message                  |  6 ++++
 games/exhaust/pkg-message                     |  6 ++++
 games/exult/files/pkg-message.in              | 12 ++++---
 games/flightgear/pkg-message                  |  8 +++--
 games/fotaq/files/pkg-message.in              | 32 +++++++++++--------
 games/freeminer/pkg-message                   |  6 ++++
 games/freera/files/pkg-message.in             | 10 +++---
 games/freesynd/files/pkg-message.in           | 10 +++---
 games/fretsonfire/files/pkg-message.in        | 10 +++---
 games/fs2open/pkg-message                     |  6 ++++
 games/fteqw/files/pkg-message.in              | 10 +++---
 games/gemrb/files/pkg-message.in              |  8 +++--
 games/glchess/pkg-message                     |  9 ++++--
 games/glest/files/pkg-message.in              | 10 +++---
 games/glob2/files/pkg-message.in              | 10 +++---
 games/gnurobots/files/pkg-message.in          | 10 +++---
 games/highmoon/files/pkg-message.in           | 10 +++---
 games/holotz-castle/files/pkg-message.in      | 10 +++---
 games/ioquake3/pkg-message                    |  6 ++++
 games/iortcw/files/pkg-message.in             |  6 ++++
 games/iourbanterror/pkg-message               |  6 ++++
 games/jaggedalliance2/pkg-message             |  6 ++++
 games/jfk/files/pkg-message.in                |  6 ++++
 games/jfsw/files/pkg-message.in               | 12 +++----
 games/joequake/pkg-message                    | 10 +++---
 games/julius/files/pkg-message.in             |  6 ++++
 games/kye/files/pkg-message.in                | 10 +++---
 games/leela-zero/pkg-message                  |  8 +++--
 games/linux-darwinia-demo/pkg-message         |  9 ++++--
 games/linux-defcon/pkg-message                |  9 ++++--
 games/linux-doom3/files/pkg-message.in        | 10 +++---
 games/linux-nerogame/files/pkg-message.in     | 10 +++---
 games/linux-nwnclient/pkg-message             | 10 +++---
 games/linux-quake4/files/pkg-message.in       | 10 +++---
 games/linux-ssamtfe/files/pkg-message.in      |  8 +++--
 games/linux-ssamtse/files/pkg-message.in      |  8 +++--
 games/linux-unrealgold/files/pkg-message.in   | 12 +++----
 games/linux-uplink-demo/pkg-message           |  9 ++++--
 games/linux-ut/pkg-message                    |  8 +++--
 games/mangband/files/pkg-message.in           | 10 +++---
 games/marsnomercy/files/pkg-message.in        | 10 +++---
 games/megaglest/files/pkg-message.in          | 10 +++---
 games/minecraft-server/files/pkg-message.in   |  6 ++++
 games/mtaserver/files/pkg-message.in          |  8 +++--
 games/multimc/pkg-message                     |  8 +++--
 games/mvdsv/pkg-message                       | 10 +++---
 games/nehquake/files/pkg-message.in           | 12 +++----
 games/netrek-BRMH-bin/pkg-message             |  6 ++++
 games/openbor/files/pkg-message.in            |  6 ++++
 games/openclaw/files/pkg-message.in           |  9 ++++--
 games/openjazz/files/pkg-message.in           | 12 +++----
 games/openjk/pkg-message                      |  6 ++++
 games/openmw/pkg-message                      |  6 ++++
 games/openrct2/pkg-message                    | 10 +++---
 games/openttd/files/pkg-message.in            | 10 +++---
 games/opentyrian/files/pkg-message.in         |  6 ++++
 games/openxcom/files/pkg-message.in           | 10 +++---
 games/outerspace/pkg-message                  |  6 ++++
 games/pink-pony/pkg-message                   |  6 ++++
 games/pioneer/files/pkg-message.in            |  6 ++++
 games/prboom/files/pkg-message.in             |  9 ++++--
 games/pydance/files/pkg-message.in            | 10 +++---
 games/pysycache/files/pkg-message.in          | 10 +++---
 games/quake2-3zb2/files/pkg-message.in        | 10 +++---
 games/quake2-data/files/pkg-message.in        | 10 +++---
 games/quake2-rogue/files/pkg-message.in       | 10 +++---
 games/quake2-xatrix/files/pkg-message.in      | 10 +++---
 games/quake3-data/files/pkg-message.in        | 10 +++---
 games/quakeforge/files/pkg-message.in         | 10 +++---
 games/reminiscence/files/pkg-message.in       | 10 +++---
 games/retroarch/files/pkg-message.in          |  8 +++--
 games/rnd_jue/files/pkg-message.in            | 10 +++---
 games/robocode-naval/files/pkg-message.in     | 10 +++---
 games/robocode/files/pkg-message.in           | 10 +++---
 .../rocksndiamonds-data/files/pkg-message.in  | 10 +++---
 games/rocksndiamonds/files/pkg-message.in     | 10 +++---
 games/rottdc/pkg-message                      | 10 +++---
 games/rubygem-vimgolf/pkg-message             |  6 ++++
 games/sampsvr/files/pkg-message.in            |  8 +++--
 games/sauerbraten/files/pkg-message.in        | 10 +++---
 games/scourge/files/pkg-message.in            | 10 +++---
 games/sex/pkg-message                         |  6 ++++
 games/slashem-tty/pkg-message                 |  8 +++--
 games/spring/pkg-message                      | 10 +++---
 games/stratagus/pkg-message                   | 10 +++---
 games/tenebrae/pkg-message                    | 10 +++---
 games/tetrinet-x/files/pkg-message.in         |  6 ++++
 games/tetrinet/pkg-message                    |  6 ++++
 games/tome4/files/pkg-message.in              |  6 ++++
 games/tomenet/files/pkg-message.in            | 10 +++---
 games/traingame/files/pkg-message.in          | 10 +++---
 games/tremulous/pkg-message                   | 10 +++---
 games/tuxfighter/files/pkg-message.in         | 10 +++---
 games/twitch/files/pkg-message.in             | 10 +++---
 games/ufoai/files/pkg-message.in              | 10 +++---
 games/uhexen2/files/pkg-message.in            | 10 +++---
 games/umark/files/pkg-message.in              |  6 ++++
 games/unnethack/pkg-message                   |  8 +++--
 games/vavoom/files/pkg-message.in             | 10 +++---
 games/vegastrike/pkg-message                  |  6 ++++
 games/voadi/pkg-message                       |  6 ++++
 games/wargus/files/pkg-message.in             | 10 +++---
 games/wesnoth/pkg-message                     |  6 ++++
 games/wmshuffle/pkg-message                   |  6 ++++
 games/wolfpack/files/pkg-message.in           | 10 ++++--
 games/worldofpadman/pkg-message               | 10 +++---
 games/xjump/pkg-message                       |  8 +++--
 games/xjumpx/files/pkg-message.in             |  7 +++-
 games/xonotic/pkg-message                     | 10 +++---
 games/xye/files/pkg-message.in                | 10 +++---
 games/yadex/files/pkg-message.in              |  6 ++++
 games/zangband/files/pkg-message.in           |  8 +++--
 german/BBBike/pkg-message                     |  6 ++++
 german/bugzilla44/pkg-message                 |  8 +++--
 german/wordpress/files/pkg-message.in         |  7 +++-
 graphics/aoi/files/pkg-message.in             | 10 +++---
 graphics/aseprite/pkg-message                 |  8 +++--
 graphics/blender-doc/files/pkg-message.in     | 10 +++---
 graphics/deegree-csw/files/pkg-message.in     |  8 +++--
 .../deegree-igeoportal/files/pkg-message.in   |  8 +++--
 graphics/deegree-wcs/files/pkg-message.in     |  8 +++--
 graphics/deegree-wfs/files/pkg-message.in     |  8 +++--
 graphics/deegree-wms/files/pkg-message.in     |  8 +++--
 graphics/deegree-wps/files/pkg-message.in     |  8 +++--
 graphics/deegree-wpvs/files/pkg-message.in    |  8 +++--
 graphics/drm-current-kmod/pkg-message         |  6 ++++
 graphics/drm-devel-kmod/pkg-message           |  6 ++++
 graphics/drm-fbsd11.2-kmod/pkg-message        |  6 ++++
 graphics/drm-fbsd12.0-kmod/pkg-message        |  6 ++++
 graphics/drm-legacy-kmod/pkg-message          |  6 ++++
 graphics/entangle/pkg-message                 |  6 ++++
 graphics/freeglut/pkg-message                 |  6 ++++
 graphics/geoserver/files/pkg-message.in       |  9 ++++--
 graphics/giftool/pkg-message                  | 18 +++++++----
 graphics/gimp-lqr-plugin/pkg-message          |  6 ++++
 graphics/gimp-resynthesizer/pkg-message       |  6 ++++
 graphics/gimp/pkg-message                     |  6 ++++
 graphics/gracula/files/pkg-message.in         |  8 +++--
 graphics/instant-meshes/pkg-message           |  8 +++--
 graphics/inventor/files/pkg-message.in        | 12 +++----
 graphics/jave6/files/pkg-message.in           | 10 +++---
 graphics/kix-kmod/files/pkg-message.in        |  8 +++--
 graphics/leptonica/pkg-message                |  6 ++++
 graphics/liblqr-1/files/pkg-message.in        |  8 +++--
 graphics/linux-c7-dri/pkg-message             |  6 ++++
 graphics/mapyrus/files/pkg-message.in         | 10 +++---
 graphics/opendx/files/pkg-message.in          |  9 ++++--
 graphics/piglit/files/pkg-message.in          |  6 ++++
 graphics/py-gvgen/pkg-message                 |  8 +++--
 graphics/qtawesome/pkg-message                |  6 ++++
 graphics/rawtherapee/pkg-message              |  8 +++--
 graphics/sane-backends/files/pkg-message.in   | 10 +++---
 graphics/sane-frontends/files/pkg-message.in  |  6 ++++
 graphics/separate/pkg-message                 |  6 ++++
 graphics/simpleviewer/files/pkg-message.in    |  6 ++++
 graphics/telak/pkg-message                    |  8 +++--
 graphics/xoris/files/pkg-message.in           |  8 +++--
 graphics/xpdf3/pkg-message                    |  6 ++++
 graphics/xpdf4/pkg-message                    |  6 ++++
 graphics/xsane/files/pkg-message.in           |  6 ++++
 graphics/zathura/pkg-message                  | 10 +++---
 graphics/zphoto/pkg-message                   |  8 +++--
 274 files changed, 1684 insertions(+), 612 deletions(-)

diff --git a/editors/gomate/pkg-message b/editors/gomate/pkg-message
index b20671e12446..b811b2aeb291 100644
--- a/editors/gomate/pkg-message
+++ b/editors/gomate/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 To remotely edit a file on this host connect via SSH with remote
 port forwarding:
 
 ssh -R 52698:127.0.0.1:52698 user@example.org \
 	gomate /path/to/the/file.txt
+EOM
+}
+]
diff --git a/editors/kak-lsp/files/pkg-message.in b/editors/kak-lsp/files/pkg-message.in
index 5b5e3bd44744..319739277729 100644
--- a/editors/kak-lsp/files/pkg-message.in
+++ b/editors/kak-lsp/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable LSP support for configured languages just add following
 commands to your kakrc:
 
@@ -7,3 +10,6 @@ eval %sh{
 		-s $kak_session
 }
 lsp-enable
+EOM
+}
+]
diff --git a/editors/lazarus/files/pkg-message.in b/editors/lazarus/files/pkg-message.in
index 8d28b37519a8..41870f7cd149 100644
--- a/editors/lazarus/files/pkg-message.in
+++ b/editors/lazarus/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The Lazarus RAD was installed
 
 1) You can run it using:
@@ -32,5 +33,6 @@ The Lazarus RAD was installed
    how use it
 
 6) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/editors/led/files/pkg-message.in b/editors/led/files/pkg-message.in
index 8ec04576f66f..f4e16a7ad5d3 100644
--- a/editors/led/files/pkg-message.in
+++ b/editors/led/files/pkg-message.in
@@ -1,7 +1,9 @@
-**************************************************
-
+[
+{ type: install
+  message: <<EOM
 An example configuration file is located in
 %%DOCSDIR%%/sample.ledrc; to use it,
 copy it to ~/.ledrc and edit it to your liking.
-
-**************************************************
+EOM
+}
+]
diff --git a/editors/mp/pkg-message b/editors/mp/pkg-message
index 1009f6dd7eb1..902b7a639569 100644
--- a/editors/mp/pkg-message
+++ b/editors/mp/pkg-message
@@ -1,5 +1,6 @@
-=========================================================================
-
+[
+{ type: install
+  message: <<EOM
 The default color scheme for GUI drivers changed in version 5.30 to a
 dark background and softer colors. If you want to revert to the classic
 bright colors on white background theme, edit the configuration file
@@ -19,5 +20,6 @@ bright colors on white background theme, edit the configuration file
     mp.colors.tag.gui           = [ 0x8888ff, 0xffffff ];
     mp.colors.spell.gui         = [ 0xff8888, 0xffffff ];
     mp.colors.search.gui        = [ 0x000000, 0x00cc77 ];
-
-=========================================================================
+EOM
+}
+]
diff --git a/editors/openoffice-4/files/pkg-message.in b/editors/openoffice-4/files/pkg-message.in
index 6cb7a2c46b4c..33d8a8913f58 100644
--- a/editors/openoffice-4/files/pkg-message.in
+++ b/editors/openoffice-4/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Apache OpenOffice Build %%AOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
@@ -48,3 +51,6 @@ installation with the extension manager is no longer needed.
 If you somehow run into problems, please remove the already installed
 "%%AOOUDIR%%" directory in your home directory, then redo the
 user installation and the problems should go away.
+EOM
+}
+]
diff --git a/editors/openoffice-devel/files/pkg-message.in b/editors/openoffice-devel/files/pkg-message.in
index 815f95d6ddb6..aed27de6b02e 100644
--- a/editors/openoffice-devel/files/pkg-message.in
+++ b/editors/openoffice-devel/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Apache OpenOffice Build %%AOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
@@ -43,3 +46,6 @@ OpenOffice does need $LANG to be set to a suitable value.
 If you somehow run into problems, please remove the already installed
 "%%AOOUDIR%%" directory in your home directory, then redo the
 user installation and the problems should go away.
+EOM
+}
+]
diff --git a/editors/paredit-mode.el/pkg-message b/editors/paredit-mode.el/pkg-message
index 42ab47233130..3d7c9431919e 100644
--- a/editors/paredit-mode.el/pkg-message
+++ b/editors/paredit-mode.el/pkg-message
@@ -1,7 +1,9 @@
-===================================================
-
+[
+{ type: install
+  message: <<EOM
 You should add the following line to your ~/.emacs:
 
     (require 'paredit)
-
-===================================================
+EOM
+}
+]
diff --git a/editors/py-pynvim/files/pkg-message.in b/editors/py-pynvim/files/pkg-message.in
index 5378cf1a36a6..c2a7b47309a0 100644
--- a/editors/py-pynvim/files/pkg-message.in
+++ b/editors/py-pynvim/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 In order to use pynvim in Neovim it is required to specify add the following line
 to ~/.config/nvim/init.vim:
 
@@ -5,3 +8,6 @@ let g:python%%SUFFIX_FOR_PYTHON_3%%_host_prog='%%PYTHON_CMD%%'
 
 See Neovim Wiki for more information:
 https://github.com/neovim/neovim/wiki/Installing-Neovim
+EOM
+}
+]
diff --git a/editors/slime/files/pkg-message.in b/editors/slime/files/pkg-message.in
index 95873826dcaa..4adbcf02cc1d 100644
--- a/editors/slime/files/pkg-message.in
+++ b/editors/slime/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 To activate SLIME, add these lines to your Emacs initialization.
 
 (setq inferior-lisp-program "PATH_TO_YOUR_LISP_BINARY")
@@ -7,4 +9,6 @@ To activate SLIME, add these lines to your Emacs initialization.
              "%%SLIME_LISPDIR%%/contrib")
 (require 'slime)
 (slime-setup '(slime-repl))
-======================================================================
+EOM
+}
+]
diff --git a/editors/tamago/pkg-message b/editors/tamago/pkg-message
index 18f5820391a0..acd0ade27572 100644
--- a/editors/tamago/pkg-message
+++ b/editors/tamago/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Enabling Tamago
 =================
 
@@ -8,3 +11,6 @@ Japanese:	(set-language-environment "Japanese")
 Korean:		(set-language-environment "Korean")
 Chinese-GB:	(set-language-environment "Chinese-GB")
 Chinese-CNS:	(set-language-environment "Chinese-CNS")
+EOM
+}
+]
diff --git a/editors/teco/pkg-message b/editors/teco/pkg-message
index 40f740319f83..dab64d460b21 100644
--- a/editors/teco/pkg-message
+++ b/editors/teco/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Powerful and compact editor with nongraphical user interface
 
 The FreeBSD port implements pretty well all that the Linux version does.
@@ -35,3 +38,6 @@ inconsistent, and thus of limited use.
 
 Before starting to use tecoc, see the sections "DESCRIPTION/Command
 names" and "SEE ALSO" in the manual page.
+EOM
+}
+]
diff --git a/editors/tetradraw/pkg-message b/editors/tetradraw/pkg-message
index 95d3b42d6de2..a3a53285dc89 100644
--- a/editors/tetradraw/pkg-message
+++ b/editors/tetradraw/pkg-message
@@ -1,4 +1,8 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 Tetradraw is now installed! Press ESC+h in the editor to get help menu
 You have to have TERM=cons25 when running tetradraw
-======================================================================
+EOM
+}
+]
diff --git a/editors/treeform/pkg-message b/editors/treeform/pkg-message
index 9800d20fab09..70f14aa79779 100644
--- a/editors/treeform/pkg-message
+++ b/editors/treeform/pkg-message
@@ -1,5 +1,9 @@
-*******************************************************************************
+[
+{ type: install
+  message: <<EOM
 TreeForm works best if you have the DOULOS SIL font installed from:
 
 http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=DoulosSIL_download#dc835487
-*******************************************************************************
+EOM
+}
+]
diff --git a/emulators/bochs/files/pkg-message.in b/emulators/bochs/files/pkg-message.in
index 7b46ee416780..fb984fb6198c 100644
--- a/emulators/bochs/files/pkg-message.in
+++ b/emulators/bochs/files/pkg-message.in
@@ -1,7 +1,9 @@
-===========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Bochs requires a .bochsrc file to be present in either your current
 directory or your home directory before starting. A sample .bochsrc
 file can be found in %%DOCSDIR%%/bochsrc-sample.txt
-
-===========================================================================
+EOM
+}
+]
diff --git a/emulators/cannonball/pkg-message b/emulators/cannonball/pkg-message
index 863357f96cf1..49fd7fff1301 100644
--- a/emulators/cannonball/pkg-message
+++ b/emulators/cannonball/pkg-message
@@ -1,4 +1,6 @@
-===========================================================================
+[
+{ type: install
+  message: <<EOM
 $FreeBSD$
 
 In order for Cannonball to work you need to provide a copy of the
@@ -13,4 +15,6 @@ which defaults to $HOME/.local/share/cannonball/config.xml
 
 NOTE: The directories will be created on the first run of Cannonball
 if they do not exist.
-===========================================================================
+EOM
+}
+]
diff --git a/emulators/dtcyber/files/pkg-message.in b/emulators/dtcyber/files/pkg-message.in
index e965fb0f760e..36853025d853 100644
--- a/emulators/dtcyber/files/pkg-message.in
+++ b/emulators/dtcyber/files/pkg-message.in
@@ -1,8 +1,10 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Additional files were installed into %%EXAMPLESDIR%%/.
 
 See http://members.iinet.net.au/~tom-hunter/dtcyber.pdf for usage
 instructions.
-
-************************************************************************
+EOM
+}
+]
diff --git a/emulators/fmsx/pkg-message b/emulators/fmsx/pkg-message
index 43ff3d776e57..a8589202d0ae 100644
--- a/emulators/fmsx/pkg-message
+++ b/emulators/fmsx/pkg-message
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 From http://www.msx.org/newspost149.html:
 
 Also a tip for X11 users: if you get 'Opening window... FAILED'
@@ -7,6 +9,8 @@ when starting fMSX and you're using -DBPP32, try compiling with
 
 For FreeBSD users: run "make clean config" and unselect BPP32 and
 select BPP16 or BPP24 as options.
-*******************************************************************
 
 See ftp://ftp.komkon.org//pub/EMUL8/MSX/Carts for cartridge ROMs
+EOM
+}
+]
diff --git a/emulators/gngeo/files/pkg-message.in b/emulators/gngeo/files/pkg-message.in
index 444d2cd48b35..93bc7e271c5e 100644
--- a/emulators/gngeo/files/pkg-message.in
+++ b/emulators/gngeo/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 GnGeo has been installed.
 
 1) You need to manually download neogeo-bios or neogeo-unibios. It's available
@@ -31,5 +32,6 @@ GnGeo has been installed.
    Note: Use rom's name (romname) without zip extension.
 
 5) Enjoy it ;)
-
-##############################################################################
+EOM
+}
+]
diff --git a/emulators/hercules/pkg-message b/emulators/hercules/pkg-message
index 3a021dc9837a..8cf0f858a75f 100644
--- a/emulators/hercules/pkg-message
+++ b/emulators/hercules/pkg-message
@@ -1,8 +1,8 @@
-######################################################################
-
-                           IMPORTANT
-
+[
+{ type: install
+  message: <<EOM
   Be sure to have a look at the docs and edit the hercules.cnf file to
 your needs (The sample is in ${PREFIX}/share/doc/hercules)
-
-######################################################################
+EOM
+}
+]
diff --git a/emulators/i386-wine-devel/files/pkg-message.in b/emulators/i386-wine-devel/files/pkg-message.in
index ac9a492540d2..16c17b8a828d 100644
--- a/emulators/i386-wine-devel/files/pkg-message.in
+++ b/emulators/i386-wine-devel/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel
 configuration.  This is incompatible with Wine.  The maximum possible
 is KVA_PAGES=500, which should still be enough for ZFS.
@@ -7,3 +10,6 @@ additional programs that are not in the manual pages under
   %%PREFIX%%/share/doc/wine
 There is more in the source tree but the others are only useful in
 conjunction with the rest of the source tree.
+EOM
+}
+]
diff --git a/emulators/i386-wine/files/pkg-message.in b/emulators/i386-wine/files/pkg-message.in
index ac9a492540d2..16c17b8a828d 100644
--- a/emulators/i386-wine/files/pkg-message.in
+++ b/emulators/i386-wine/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel
 configuration.  This is incompatible with Wine.  The maximum possible
 is KVA_PAGES=500, which should still be enough for ZFS.
@@ -7,3 +10,6 @@ additional programs that are not in the manual pages under
   %%PREFIX%%/share/doc/wine
 There is more in the source tree but the others are only useful in
 conjunction with the rest of the source tree.
+EOM
+}
+]
diff --git a/emulators/jzintv/files/pkg-message.in b/emulators/jzintv/files/pkg-message.in
index a5e5e4e3e96a..c5732ff79b52 100644
--- a/emulators/jzintv/files/pkg-message.in
+++ b/emulators/jzintv/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=============================================================
-
+[
+{ type: install
+  message: <<EOM
 jzIntv is now installed. To use the emulator, you will need
 an EXEC image (exec.bin), a GROM image (grom.bin), and a
 GAME image. Each file must be copied to this directory :
@@ -15,6 +15,6 @@ http://www.intellivisiongames.com
 
 You can test the emulator by running 'jzintv emu_ver'. If
 everything is ok, run 'jzintv <game>' to play. Enjoy !
-
-=============================================================
-
+EOM
+}
+]
diff --git a/emulators/klh10/files/pkg-message.in b/emulators/klh10/files/pkg-message.in
index c651ef8ef8e3..280c5aed9bb8 100644
--- a/emulators/klh10/files/pkg-message.in
+++ b/emulators/klh10/files/pkg-message.in
@@ -1,4 +1,10 @@
-!!! KLH10 contains a setuid that accepts network connections.
-!!! Consider using a firewall to limit access to KLH10.
-!!! See the %%DOCSDIR%%/pubits/adm
-!!! for firewall documentation.
+[
+{ type: install
+  message: <<EOM
+ KLH10 contains a setuid that accepts network connections.
+ Consider using a firewall to limit access to KLH10.
+ See the %%DOCSDIR%%/pubits/adm
+ for firewall documentation.
+EOM
+}
+]
diff --git a/emulators/klh10/pkg-message b/emulators/klh10/pkg-message
index 0ef554e628af..aeba651e0512 100644
--- a/emulators/klh10/pkg-message
+++ b/emulators/klh10/pkg-message
@@ -1,4 +1,8 @@
-Install notice:
-
+[
+{ type: install
+  message: <<EOM
 KLH10 contains a setuid that accepts network connections.
 Consider using a firewall to limit access to KLH10.
+EOM
+}
+]
diff --git a/emulators/linux_base-c6/pkg-message b/emulators/linux_base-c6/pkg-message
index 954ba7855f46..cdb849df0087 100644
--- a/emulators/linux_base-c6/pkg-message
+++ b/emulators/linux_base-c6/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some programs need linprocfs mounted on /compat/linux/proc.  Add the
 following line to /etc/fstab:
 
@@ -11,3 +14,6 @@ following line to /etc/fstab:
 tmpfs    /compat/linux/dev/shm	tmpfs	rw,mode=1777	0	0
 
 Then run "mount /compat/linux/dev/shm".
+EOM
+}
+]
diff --git a/emulators/linux_base-c7/pkg-message b/emulators/linux_base-c7/pkg-message
index 83c9d752773f..1794a670937d 100644
--- a/emulators/linux_base-c7/pkg-message
+++ b/emulators/linux_base-c7/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some programs need linprocfs mounted on /compat/linux/proc.  Add the
 following line to /etc/fstab:
 
@@ -18,3 +21,6 @@ following line to /etc/fstab:
 tmpfs    /compat/linux/dev/shm	tmpfs	rw,mode=1777	0	0
 
 Then run "mount /compat/linux/dev/shm".
+EOM
+}
+]
diff --git a/emulators/mame/files/pkg-message.in b/emulators/mame/files/pkg-message.in
index e9519472592a..3d2ee477ee42 100644
--- a/emulators/mame/files/pkg-message.in
+++ b/emulators/mame/files/pkg-message.in
@@ -1,8 +1,10 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 An example configuration file has been installed in
 "%%EXAMPLESDIR%%/%%MTARGET%%.ini"
 Should you create a "~/.%%MTARGET%%" directory and place it here or
 launch "%%MTARGET%% -createconfig" and place the %%MTARGET%%.ini created instead.
-
-==============================================================================
+EOM
+}
+]
diff --git a/emulators/mednafen/files/pkg-message.in b/emulators/mednafen/files/pkg-message.in
index 7deb4aff00e3..3bb65580db19 100644
--- a/emulators/mednafen/files/pkg-message.in
+++ b/emulators/mednafen/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 1) Run mednafen [OPTION] [FILE]
 
 2) See complete documentation at:
@@ -7,5 +8,6 @@
    %%DOCSDIR%%/mednafen.html
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/emulators/mtools/files/pkg-message.in b/emulators/mtools/files/pkg-message.in
index a2d4f00fd4cb..fb262add717d 100644
--- a/emulators/mtools/files/pkg-message.in
+++ b/emulators/mtools/files/pkg-message.in
@@ -1,3 +1,7 @@
-************************************************************
+[
+{ type: install
+  message: <<EOM
 Please verify %%PREFIX%%/etc/mtools.conf for your machine.
-************************************************************
+EOM
+}
+]
diff --git a/emulators/mupen64plus/pkg-message b/emulators/mupen64plus/pkg-message
index 39de90bbbeed..081af6b7e36e 100644
--- a/emulators/mupen64plus/pkg-message
+++ b/emulators/mupen64plus/pkg-message
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The mupen64plus emulator was installed
 
 1) If you have installed/upgraded any new plugins or are upgrading from a
@@ -28,5 +29,6 @@ video) of Mupen64Plus and
    emulators/wxmupen64plus
 
 6) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/emulators/o2em/pkg-message b/emulators/o2em/pkg-message
index 9acd34866b31..97ca974e637e 100644
--- a/emulators/o2em/pkg-message
+++ b/emulators/o2em/pkg-message
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
  * The Odyessey2 ROM is included in the source, although the documentation says
    it isn't.
  * The main voice samples are included with this port, but not the sidsamp
@@ -14,4 +16,6 @@
    - be compliant with allegro 4.1.12
 
 Read O2EM.txt.
-===============================================================================
+EOM
+}
+]
diff --git a/emulators/pipelight/pkg-message b/emulators/pipelight/pkg-message
index d53c320fe808..1e4443fa4241 100644
--- a/emulators/pipelight/pkg-message
+++ b/emulators/pipelight/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This port installs the Pipelight plugin wrapper for running Silverlight,
 Flash and others. Before enabling Pipelight for your users, run the
 following as root:
@@ -16,3 +19,6 @@ To create the UFS filesystem
 
 To remove the UFS filesystem
 # pipelight-mkufs --delete <username>
+EOM
+}
+]
diff --git a/emulators/ppsspp/files/pkg-message.in b/emulators/ppsspp/files/pkg-message.in
index 78ce933a201b..f60e5f5c2a54 100644
--- a/emulators/ppsspp/files/pkg-message.in
+++ b/emulators/ppsspp/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Known issues:
 - %%DATADIR%%/assets/gamecontrollerdb.txt cannot be used
   as is because SDL_JoystickGetGUID is a stub on FreeBSD. Create the
   file using controllermap (or antimicro) then check with testgamecontroller
   it's detected (pay attention to guid). If you have trouble making it
   work try OLDJOY option for v1.3 behavior.
+EOM
+}
+]
diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message
index 6d6814baf124..4ce5e9a61853 100644
--- a/emulators/qemu-devel/pkg-message
+++ b/emulators/qemu-devel/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 FreeBSD host notes
 ==================
 
@@ -180,3 +183,6 @@ processing error - resetting ehci HC
 	http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD
 
   )
+EOM
+}
+]
diff --git a/emulators/qemu-sbruno/pkg-message b/emulators/qemu-sbruno/pkg-message
index e7039d2f295a..919736f7a186 100644
--- a/emulators/qemu-sbruno/pkg-message
+++ b/emulators/qemu-sbruno/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 FreeBSD host notes
 ==================
 
@@ -170,3 +173,6 @@ processing error - resetting ehci HC
   while using pcap.
 
   )
+EOM
+}
+]
diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message
index 6d6814baf124..4ce5e9a61853 100644
--- a/emulators/qemu/pkg-message
+++ b/emulators/qemu/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 FreeBSD host notes
 ==================
 
@@ -180,3 +183,6 @@ processing error - resetting ehci HC
 	http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD
 
   )
+EOM
+}
+]
diff --git a/emulators/qemu2/pkg-message b/emulators/qemu2/pkg-message
index 6d6814baf124..4ce5e9a61853 100644
--- a/emulators/qemu2/pkg-message
+++ b/emulators/qemu2/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 FreeBSD host notes
 ==================
 
@@ -180,3 +183,6 @@ processing error - resetting ehci HC
 	http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD
 
   )
+EOM
+}
+]
diff --git a/emulators/qemu30/pkg-message b/emulators/qemu30/pkg-message
index 6d6814baf124..4ce5e9a61853 100644
--- a/emulators/qemu30/pkg-message
+++ b/emulators/qemu30/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 FreeBSD host notes
 ==================
 
@@ -180,3 +183,6 @@ processing error - resetting ehci HC
 	http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD
 
   )
+EOM
+}
+]
diff --git a/emulators/qmc2/pkg-message b/emulators/qmc2/pkg-message
index ee6b674e24aa..5df2a0804f18 100644
--- a/emulators/qmc2/pkg-message
+++ b/emulators/qmc2/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 QMC2 has been installed.
 
 You can download game preview images (screenshots) and flyer images here:
@@ -8,5 +9,6 @@ http://www.mameworld.net/mamecat/download.html
 
 Extract them to a directory (like "~/.qmc2/prv" and "~/.qmc2/fly") and tell
 the program where to find them in the path configuration.
-
-==============================================================================
+EOM
+}
+]
diff --git a/emulators/simh/files/pkg-message.in b/emulators/simh/files/pkg-message.in
index c801cb10a9b6..ac0502c6aa06 100644
--- a/emulators/simh/files/pkg-message.in
+++ b/emulators/simh/files/pkg-message.in
@@ -1,5 +1,6 @@
-*********************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Note that the executable files for some simulators have been renamed
 to remove conflicts with other ports. In such cases, the name is now
 prefixed with 'simh'. Affected simulators are:
@@ -14,5 +15,6 @@ if they want to use the old names.
 The file needed by the VAX emulator is located in:
 
 	%%DATADIR%%
-
-*********************************************************************
+EOM
+}
+]
diff --git a/emulators/vba/files/pkg-message.in b/emulators/vba/files/pkg-message.in
index cb364d43a385..26da3acaefe7 100644
--- a/emulators/vba/files/pkg-message.in
+++ b/emulators/vba/files/pkg-message.in
@@ -1,4 +1,6 @@
------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The default configuration file has been installed as
 %%LOCALBASE%%/bin/VisualBoyAdvance.cfg-default. Please copy it to
 %%LOCALBASE%%/bin/VisualBoyAdvance.cfg before you start the emulator.
@@ -6,4 +8,6 @@ The default configuration file has been installed as
 If all you see after loading a ROM is a black screen and/or
 VisualBoy Advance crashes, try switching the video filter.
 Either change it in the global config file or use the -f switch.
------------------------------------------------------------------
+EOM
+}
+]
diff --git a/emulators/vice/pkg-message b/emulators/vice/pkg-message
index 39fb27e5f8eb..862160800b46 100644
--- a/emulators/vice/pkg-message
+++ b/emulators/vice/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The VICE port can use /dev/joy* for joystick support for video games. To enable
 the joystick port, add
 
@@ -8,3 +11,6 @@ and the following lines to /etc/devfs.conf (for additional joysticks use
 
 own	/dev/joy0 root:wheel
 perm 	/dev/joy0 0666
+EOM
+}
+]
diff --git a/emulators/virtualbox-ose-additions/pkg-message b/emulators/virtualbox-ose-additions/pkg-message
index de21f5082924..e8b5c6a5edfa 100644
--- a/emulators/virtualbox-ose-additions/pkg-message
+++ b/emulators/virtualbox-ose-additions/pkg-message
@@ -1,5 +1,6 @@
-=============================================================================
-
+[
+{ type: install
+  message: <<EOM
 VirtualBox Guest Additions were installed.
 
 
@@ -17,5 +18,6 @@ features (clipboard sharing, window scaling) to the wheel group.
 Reboot the machine to load the needed kernel modules.
 
 For detailed informations please visit http://wiki.freebsd.org/VirtualBox
-
-=============================================================================
+EOM
+}
+]
diff --git a/emulators/virtualbox-ose/pkg-message b/emulators/virtualbox-ose/pkg-message
index 650c8c8c995f..0cf6996bbefa 100644
--- a/emulators/virtualbox-ose/pkg-message
+++ b/emulators/virtualbox-ose/pkg-message
@@ -1,5 +1,6 @@
-=============================================================================
-
+[
+{ type: install
+  message: <<EOM
 VirtualBox was installed.
 
 You need to load the vboxdrv kernel module via /boot/loader.conf:
@@ -63,5 +64,6 @@ Check wiki page for known issues and troubleshooting:
 http://wiki.freebsd.org/VirtualBox
 
 Please report any problems to emulation@. Thanks!
-
-=============================================================================
+EOM
+}
+]
diff --git a/emulators/wine-devel/files/pkg-message.in b/emulators/wine-devel/files/pkg-message.in
index ac9a492540d2..16c17b8a828d 100644
--- a/emulators/wine-devel/files/pkg-message.in
+++ b/emulators/wine-devel/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel
 configuration.  This is incompatible with Wine.  The maximum possible
 is KVA_PAGES=500, which should still be enough for ZFS.
@@ -7,3 +10,6 @@ additional programs that are not in the manual pages under
   %%PREFIX%%/share/doc/wine
 There is more in the source tree but the others are only useful in
 conjunction with the rest of the source tree.
+EOM
+}
+]
diff --git a/emulators/wine/files/pkg-message.in b/emulators/wine/files/pkg-message.in
index ac9a492540d2..16c17b8a828d 100644
--- a/emulators/wine/files/pkg-message.in
+++ b/emulators/wine/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel
 configuration.  This is incompatible with Wine.  The maximum possible
 is KVA_PAGES=500, which should still be enough for ZFS.
@@ -7,3 +10,6 @@ additional programs that are not in the manual pages under
   %%PREFIX%%/share/doc/wine
 There is more in the source tree but the others are only useful in
 conjunction with the rest of the source tree.
+EOM
+}
+]
diff --git a/emulators/winetricks/pkg-message b/emulators/winetricks/pkg-message
index 93a43bb92e1c..62fa09cc611b 100644
--- a/emulators/winetricks/pkg-message
+++ b/emulators/winetricks/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 The winetricks port requires a 32 bit version of Wine
 
 Please install one of the following packages:
  wine or wine-devel on i386
  i386-wine or i386-wine-devel on amd64
+EOM
+}
+]
diff --git a/emulators/x49gp/pkg-message b/emulators/x49gp/pkg-message
index 704a7fd43320..b81b5e6d6728 100644
--- a/emulators/x49gp/pkg-message
+++ b/emulators/x49gp/pkg-message
@@ -1,6 +1,8 @@
--------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
  Instructions
--------------------------------------------------------
+
  - Start a HP 50g with "hp50g"
 
  - Start a HP 49G+ with "hp49g+"
@@ -31,10 +33,12 @@
    When finished:
      umount /mnt
      mdconfig -d -u 0
--------------------------------------------------------
+
  Known limitations
--------------------------------------------------------
+
  - Cannot write to port 2. Libs will eat up your RAM.
 
  - HPGCC2/3 SD I/O is unstable.
--------------------------------------------------------
+EOM
+}
+]
diff --git a/emulators/xen-kernel/pkg-message b/emulators/xen-kernel/pkg-message
index 9105ffc7bd43..37683720d077 100644
--- a/emulators/xen-kernel/pkg-message
+++ b/emulators/xen-kernel/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please add the following entries in order to boot the xen kernel
 
 In /etc/sysctl.conf:
@@ -12,3 +15,6 @@ In /boot/loader.conf for a dom0 with 2G memory and 4 vcpus:
 
 Add to the above xen_cmdline in order to activate the serial console:
 	console=com1
+EOM
+}
+]
diff --git a/emulators/xhomer/files/pkg-message.in b/emulators/xhomer/files/pkg-message.in
index 1894bde3061c..b67294b9f0be 100644
--- a/emulators/xhomer/files/pkg-message.in
+++ b/emulators/xhomer/files/pkg-message.in
@@ -1,7 +1,11 @@
-*****************************************************************************
+[
+{ type: install
+  message: <<EOM
 Please see %%DOCSDIR%%/README for instructions.  Copy
 the example config file from %%PREFIX%%/share/examples/xhomer/xhomer.cfg
 to your home directory as '.xhomerrc' and set 'rd_dir' line to point
 to the directory containing disk images downloaded from
 http://xhomer.isani.org/xhomer/.
-*****************************************************************************
+EOM
+}
+]
diff --git a/emulators/xsystem35/files/pkg-message.in b/emulators/xsystem35/files/pkg-message.in
index 7901cb7398af..7de30b7b231f 100644
--- a/emulators/xsystem35/files/pkg-message.in
+++ b/emulators/xsystem35/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 o Make sure your kernel has been configured with options SHMMAXPGS=4096
   when you run on display 16bpp or deeper color.
 
@@ -13,3 +15,6 @@ o pcm0 sound device doesn't work well with this program for now.
   `-devdsp none' command line option as the last resort.
 
 Enjoy!
+EOM
+}
+]
diff --git a/finance/bitcoinnodestats/files/pkg-message.in b/finance/bitcoinnodestats/files/pkg-message.in
index 9d7e223f2a8a..6dd91430517e 100644
--- a/finance/bitcoinnodestats/files/pkg-message.in
+++ b/finance/bitcoinnodestats/files/pkg-message.in
@@ -1,10 +1,12 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 Quick start instructions:
 
 # cd %%DATADIR%%
 # python%%PYTHON_VER%% create_local_settings.py 
 # python%%PYTHON_VER%% manage.py migrate
 # python%%PYTHON_VER%% manage.py runserver
-
-================================================================================
+EOM
+}
+]
diff --git a/finance/electrum/files/pkg-message-hwwallet.in b/finance/electrum/files/pkg-message-hwwallet.in
index 06d247fe78e1..03896d1c49fb 100644
--- a/finance/electrum/files/pkg-message-hwwallet.in
+++ b/finance/electrum/files/pkg-message-hwwallet.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 For hardware wallet devices to work you need to be in the operator group
 and need r/w permissions to the appropriate /dev/usb/* device.
 
@@ -12,3 +15,6 @@ Edit your configuration:
 Then restart devd to load the new rules:
 
 % /etc/rc.d/devd restart
+EOM
+}
+]
diff --git a/finance/frontaccounting/files/pkg-message.in b/finance/frontaccounting/files/pkg-message.in
index 96914536f6d0..98af12d591f4 100644
--- a/finance/frontaccounting/files/pkg-message.in
+++ b/finance/frontaccounting/files/pkg-message.in
@@ -1,9 +1,11 @@
- *******************************************************************
-
+[
+{ type: install
+  message: <<EOM
  FrontAccounting has been installed into the following directory:
  %%WWWDIR%%
 
  Be sure to adjust your web server's configuration to allow you to
  access that directory.
-
- *******************************************************************
+EOM
+}
+]
diff --git a/finance/ktoblzcheck/files/pkg-message.in b/finance/ktoblzcheck/files/pkg-message.in
index 5bc44881a2b4..bdba5877329b 100644
--- a/finance/ktoblzcheck/files/pkg-message.in
+++ b/finance/ktoblzcheck/files/pkg-message.in
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 The bankdata included with the ktoblzcheck distribution is outdated.
 You should update this bankdata upon installation and periodically
 afterwards. New bankdata is typically available every three months.
@@ -10,4 +12,6 @@ To update the bankdata, run (as root):
 The script is interactive and will present you with the bankdata
 available for download. Follow the prompts and it will write the
 new bankdata to %%DATADIR%%.
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/finance/ledgersmb/files/pkg-message.in b/finance/ledgersmb/files/pkg-message.in
index 485c368fc764..f833dcf81ef9 100644
--- a/finance/ledgersmb/files/pkg-message.in
+++ b/finance/ledgersmb/files/pkg-message.in
@@ -1,5 +1,6 @@
-=================================================================
-
+[
+{ type: install
+  message: <<EOM
 LedgerSMB has now been installed.
 
 To enable Apache web access, add the following to your
@@ -8,5 +9,6 @@ To enable Apache web access, add the following to your
   Include %%PREFIX%%/etc/ledger-smb-httpd.conf
 
 Enjoy!
-
-=================================================================
+EOM
+}
+]
diff --git a/finance/ledgersmb12/files/pkg-message.in b/finance/ledgersmb12/files/pkg-message.in
index b39863d90fcf..06672c3a9cf1 100644
--- a/finance/ledgersmb12/files/pkg-message.in
+++ b/finance/ledgersmb12/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=================================================================
-
+[
+{ type: install
+  message: <<EOM
 LedgerSMB has now been installed.
 
 To enable Apache web access, add the following to your httpd.conf:
@@ -8,5 +8,6 @@ To enable Apache web access, add the following to your httpd.conf:
   Include %%PREFIX%%/etc/ledger-smb-httpd.conf
 
 Enjoy!
-=================================================================
-
+EOM
+}
+]
diff --git a/finance/prestashop/files/pkg-message.in b/finance/prestashop/files/pkg-message.in
index 026d07d9e51f..04cd17ea5d60 100644
--- a/finance/prestashop/files/pkg-message.in
+++ b/finance/prestashop/files/pkg-message.in
@@ -1,4 +1,6 @@
-=============================================
+[
+{ type: install
+  message: <<EOM
 1 Congratulations! You have successfully installed
 PRESTASHOP e-Commerce platform.
 
@@ -21,4 +23,6 @@ PRESTASHOP e-Commerce platform.
 
 4 More detailed document could be found here:
   http://www.prestashop.com/wiki/Installing_And_Updating_PrestaShop_Software/
-=============================================
+EOM
+}
+]
diff --git a/finance/sabernetdcs-client/files/pkg-message.in b/finance/sabernetdcs-client/files/pkg-message.in
index e2941dc8bf9e..709649c90669 100644
--- a/finance/sabernetdcs-client/files/pkg-message.in
+++ b/finance/sabernetdcs-client/files/pkg-message.in
@@ -1,5 +1,9 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[
+{ type: install
+  message: <<EOM
 SaberNet DCS Client is now installed.
 Change the settings in %%PREFIX%%/etc/sndcs/sndcs2.conf
 to suit your needs.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - -
+EOM
+}
+]
diff --git a/finance/sql-ledger/files/pkg-message.in b/finance/sql-ledger/files/pkg-message.in
index b53016a85140..9c61c6edb7fa 100644
--- a/finance/sql-ledger/files/pkg-message.in
+++ b/finance/sql-ledger/files/pkg-message.in
@@ -1,5 +1,6 @@
-=================================================================
-
+[
+{ type: install
+  message: <<EOM
 SQL-Ledger has now been installed.
 
 To enable Apache web access, add the following to your
@@ -9,5 +10,6 @@ To enable Apache web access, add the following to your
   Include %%PREFIX%%/etc/sql-ledger-httpd.conf
 
 Enjoy!
-
-=================================================================
+EOM
+}
+]
diff --git a/finance/trytond28/files/pkg-message.in b/finance/trytond28/files/pkg-message.in
index e9b0d18b9522..f7a86682a8bc 100644
--- a/finance/trytond28/files/pkg-message.in
+++ b/finance/trytond28/files/pkg-message.in
@@ -1,6 +1,6 @@
-POST-INSTALL CONFIGURATION FOR TRYTOND
-==================================================
-
+[
+{ type: install
+  message: <<EOM
 Before you start the trytond server, you should:
 
 1) Install a PostgreSQL server.
@@ -11,5 +11,6 @@ to customize the daemon.
 For more information, see the DOCUMENTATION:
 
    http://www.tryton.org/documentation.html
-
-====================================================
+EOM
+}
+]
diff --git a/finance/weberp/files/pkg-message.in b/finance/weberp/files/pkg-message.in
index 585970612663..9b562253534b 100644
--- a/finance/weberp/files/pkg-message.in
+++ b/finance/weberp/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-POST-INSTALL CONFIGURATION FOR webERP
-=====================================
+[
+{ type: install
+  message: <<EOM
 1) Add the following to your Apache configuration, and
    restart the server:
 
@@ -17,5 +17,6 @@ POST-INSTALL CONFIGURATION FOR webERP
 Before you start webERP, please read carefully the INSTALL file:
    /usr/local/www/weberp/doc/INSTALL.txt
 for detailed information.
-
-=====================================
+EOM
+}
+]
diff --git a/french/aster/files/pkg-message.in b/french/aster/files/pkg-message.in
index 224d2d24ff88..681be696d208 100644
--- a/french/aster/files/pkg-message.in
+++ b/french/aster/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 To run Code_Aster through ASTK, type:
 %%tools_dir%%/astk
 
 On i386 or amd64 platforms, we suggest you install the ports french/gibi
 and french/homard, two additional meshing tools.
+EOM
+}
+]
diff --git a/french/aster/files/pkg-message.sans-astk.in b/french/aster/files/pkg-message.sans-astk.in
index 880e1749a22d..4dd8b0fd588e 100644
--- a/french/aster/files/pkg-message.sans-astk.in
+++ b/french/aster/files/pkg-message.sans-astk.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 After Code_Aster installation you could install ASTK
 [cad/astk-serveur and cad/astk-client].
 ASTK is a graphic interface to run Code_Aster.
 
 On i386 platform, we suggest you install the ports french/gibi and
 french/homard, two additional meshing tools.
+EOM
+}
+]
diff --git a/french/fortune-mod-zarathoustra/files/pkg-message.in b/french/fortune-mod-zarathoustra/files/pkg-message.in
index c4d1c8fc21f4..910b81026bfb 100644
--- a/french/fortune-mod-zarathoustra/files/pkg-message.in
+++ b/french/fortune-mod-zarathoustra/files/pkg-message.in
@@ -1,7 +1,11 @@
-******************************************************
+[
+{ type: install
+  message: <<EOM
 Usage:
 
 fortune %%PREFIX%%/share/games/fortune/zarathoustra
 
 See fortune(6) for details.
-******************************************************
+EOM
+}
+]
diff --git a/french/homard/pkg-message b/french/homard/pkg-message
index 59400a33d94e..11f48a6a619c 100644
--- a/french/homard/pkg-message
+++ b/french/homard/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Avertissement
 =============
 
@@ -17,3 +20,6 @@ port french/aster).
 
 If you want to use homard for any other purpose, you have to acquire a
 license: please contact the Homard's administrators at <homard@edf.fr>.
+EOM
+}
+]
diff --git a/french/wordpress/files/pkg-message.in b/french/wordpress/files/pkg-message.in
index 11afe3fec699..a3d0617e38e0 100644
--- a/french/wordpress/files/pkg-message.in
+++ b/french/wordpress/files/pkg-message.in
@@ -1,6 +1,11 @@
-                  **** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
 in %%WWWDIR%% and modify it to fit your MySQL.
 Maybe you need 'mysqladmin create wordpress' first.
 If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
 http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
+EOM
+}
+]
diff --git a/ftp/bsdftpd-ssl/files/pkg-message.in b/ftp/bsdftpd-ssl/files/pkg-message.in
index e3c5a6d1c158..7d5adc773cc6 100644
--- a/ftp/bsdftpd-ssl/files/pkg-message.in
+++ b/ftp/bsdftpd-ssl/files/pkg-message.in
@@ -1,4 +1,6 @@
-=============================================================================
+[
+{ type: install
+  message: <<EOM
 You will also need to read "Configuration" and "Supplement information" parts
 of the %%DOCSDIR%%/INSTALL file from the package
 documentation for the subsequent configuration steps:
@@ -10,4 +12,6 @@ Please note:
 - The example configuration files are available in the
   %%EXAMPLESDIR%% directory.
 - The manual page for the FTP server is available as ftpd-ssl(8).
-=============================================================================
+EOM
+}
+]
diff --git a/ftp/frox/files/pkg-message.in b/ftp/frox/files/pkg-message.in
index 58c02d5fd0ff..a82361dd292e 100644
--- a/ftp/frox/files/pkg-message.in
+++ b/ftp/frox/files/pkg-message.in
@@ -1,4 +1,6 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 Don't forget to create %%PREFIX%%/etc/frox.conf.
 See an example in %%EXAMPLESDIR%%/frox.conf
 
@@ -12,4 +14,6 @@ Add `frox_enable="YES"' in /etc/rc.conf and run %%PREFIX%%/etc/rc.d/frox.sh
 frox     stream  tcp     nowait  nobody    %%PREFIX%%/sbin/frox    frox
 * assign a port number for frox inside /etc/services (e.g. 2121):
 frox	2121/tcp
-**************************************************************************
+EOM
+}
+]
diff --git a/ftp/net2ftp/files/pkg-message.in b/ftp/net2ftp/files/pkg-message.in
index 1cf0ece13d5f..d3d6d9dcbf0b 100644
--- a/ftp/net2ftp/files/pkg-message.in
+++ b/ftp/net2ftp/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 To make net2ftp available through your Apache web server,
 add something similar to the following to httpd.conf:
 
@@ -11,3 +13,6 @@ add something similar to the following to httpd.conf:
 		Deny from all
 		Allow from 127.0.0.1 .example.com
 	</Directory>
+EOM
+}
+]
diff --git a/ftp/oftpd/pkg-message b/ftp/oftpd/pkg-message
index 379c8daf0c01..d5707298c904 100644
--- a/ftp/oftpd/pkg-message
+++ b/ftp/oftpd/pkg-message
@@ -1,5 +1,9 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 oftpd only runs standalone, not from inetd.
 Create a README file in the root anonymous FTP dir to have it displayed to
 users upon login.
-================================================================================
+EOM
+}
+]
diff --git a/ftp/p5-Net-FTPServer/files/pkg-message.in b/ftp/p5-Net-FTPServer/files/pkg-message.in
index c68cbf0f6c7a..4796f89c358b 100644
--- a/ftp/p5-Net-FTPServer/files/pkg-message.in
+++ b/ftp/p5-Net-FTPServer/files/pkg-message.in
@@ -1,6 +1,10 @@
---------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 You have installed p5-Net-FTPServer, a full-featured ftp daemon written in
 Perl.  For more information, please type `perldoc Net::FTPServer'.  The
 ftpd is installed as %%PREFIX%%/sbin/ftpd.pl, with an example config
 file in %%PREFIX%%/share/examples/Net-FTPServer.
---------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/ftp/php-fastdfs/pkg-message b/ftp/php-fastdfs/pkg-message
index 993d158f9115..203ccb1323d1 100644
--- a/ftp/php-fastdfs/pkg-message
+++ b/ftp/php-fastdfs/pkg-message
@@ -1,8 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Before you can start using this module;
 - Make sure you have configured client.conf to point to your FastDFS cluster
   and that you see the cluster with fdfs_monitor
 - Add this to your php.ini file
-==================================================================
+
 fastdfs_client.base_path = /var/tmp
 fastdfs_client.connect_timeout = 2
 fastdfs_client.network_timeout = 60
@@ -13,3 +16,6 @@ fastdfs_client.tracker_group_count = 1
 fastdfs_client.tracker_group0 = /usr/local/etc/fdfs/client.conf
 fastdfs_client.use_connection_pool = false
 fastdfs_client.connection_pool_max_idle_time = 3600
+EOM
+}
+]
diff --git a/ftp/pure-ftpd/files/pkg-message.in b/ftp/pure-ftpd/files/pkg-message.in
index 19c43faa36f7..4f843c4e614e 100644
--- a/ftp/pure-ftpd/files/pkg-message.in
+++ b/ftp/pure-ftpd/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Now you need to examine %%EXAMPLESDIR%%/pam.d/pure-ftpd
 and add the relevant PAM configuration lines to your /etc/pam.conf file.
 
@@ -5,3 +8,6 @@ If you defined call upload script in pure-ftpd config define corresponding
 vars in rc.conf. pure-ftpd will not listen TCP socket without it.
 
 See FAQ: https://github.com/jedisct1/pure-ftpd/blob/master/FAQ
+EOM
+}
+]
diff --git a/ftp/tnftpd/files/pkg-message.in b/ftp/tnftpd/files/pkg-message.in
index 71e871b3cafe..ebb3795f43fd 100644
--- a/ftp/tnftpd/files/pkg-message.in
+++ b/ftp/tnftpd/files/pkg-message.in
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 This port relies on a number of configuration files in %%PREFIX%%/etc.
 At the very least, create a ftpusers file with the usernams of users you don't
 want to connect (root, toor, etc.). This will allow non-listed users to log in.
@@ -7,4 +9,6 @@ Copying /etc/ftpusers to %%PREFIX%%/etc/ftpusers should be sufficient.
 See the man pages and examples in %%EXAMPLESDIR%% for more
 information. The man pages and configuration files for FreeBSD's built-in ftpd
 can also be of use as examples/additional info.
-================================================================================
+EOM
+}
+]
diff --git a/games/4stattack/files/pkg-message.in b/games/4stattack/files/pkg-message.in
index 18957e7d9f40..1dd6cd74cfa8 100644
--- a/games/4stattack/files/pkg-message.in
+++ b/games/4stattack/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 4st Attack has been installed.
 
 All options are given only in the config file.
@@ -17,5 +18,6 @@ You could manually change Permissions with:
     exit
 
 Have fun!
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/OpenTomb/pkg-message b/games/OpenTomb/pkg-message
index 4a660098dc0c..0bc02df2c082 100644
--- a/games/OpenTomb/pkg-message
+++ b/games/OpenTomb/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You need the following files to play OpenTomb:
 * Data folders from each game. Get them from your retail game CDs or
   Steam/GOG bundles.
@@ -12,3 +15,6 @@ You need the following files to play OpenTomb:
 * Loading screens for TR1-3 and TR5. For TR3, get them from pix
   directory of your installed official game.  For other versions
   download them from http://trep.trlevel.de/temp/loading_screens.zip
+EOM
+}
+]
diff --git a/games/adom/files/pkg-message.in b/games/adom/files/pkg-message.in
index af7968018df2..1b1e6114d580 100644
--- a/games/adom/files/pkg-message.in
+++ b/games/adom/files/pkg-message.in
@@ -1,2 +1,7 @@
-
+[
+{ type: install
+  message: <<EOM
 After installation please read manual in %%DOCSDIR%%.
+EOM
+}
+]
diff --git a/games/alephone-data/pkg-message b/games/alephone-data/pkg-message
index dec6ae249043..ccfb5c408205 100644
--- a/games/alephone-data/pkg-message
+++ b/games/alephone-data/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 The Aleph One data has been installed.
 
 In addition, wrapper scripts for the selected games were installed.
@@ -9,5 +10,6 @@ Marathon 2: Durandal	- alephone-durandal
 Marathon Infinity	- alephone-infinity
 
 Texture Packs for all scenarios can be found on a http://www.simplici7y.com.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/alephone-scenarios/pkg-message b/games/alephone-scenarios/pkg-message
index 9dabb064f081..43e035819ac1 100644
--- a/games/alephone-scenarios/pkg-message
+++ b/games/alephone-scenarios/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 The Aleph One scenarios have been installed.
 
 In addition, wrapper scripts for the selected games were installed.
@@ -11,5 +12,6 @@ Red				- alephone-red
 Rubicon X			- alephone-rubicon
 Tempus Irae			- alephone-tempus_irae
 The Gray Incident		- alephone-gray
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/alephone/pkg-message b/games/alephone/pkg-message
index d5c9b0d60c19..6bf4fd6a3200 100644
--- a/games/alephone/pkg-message
+++ b/games/alephone/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Aleph One has been installed.
 
 This package does not include any Aleph One data files. To obtain the original
@@ -8,5 +9,6 @@ contains more (unofficial) scenarios. In addition, you can search for game
 stuff here:
 
 * http://www.simplici7y.com/
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/alienarena/files/pkg-message.in b/games/alienarena/files/pkg-message.in
index dc602b74b509..e437f8a8b9c8 100644
--- a/games/alienarena/files/pkg-message.in
+++ b/games/alienarena/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 Alien Arena (native version) has been installed.
 
 1) The OSS (native FreeBSD sound) version of Alien Arena 2011 (named
@@ -13,5 +14,6 @@ delay is 11025, and the SDL version uses 22050). The value of "sndspeed" will
 be saved in the configuration file for future runs.
 
 2) Enjoy it :)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/allacrost/pkg-message b/games/allacrost/pkg-message
index fda0b05b402a..aa9f7a0631bf 100644
--- a/games/allacrost/pkg-message
+++ b/games/allacrost/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Remember that Allacrost is still a work in progress, and this release
 remains a fair distance from what we want this game to eventually
 become. Please share with us your comments, critiques, and thoughts
@@ -11,3 +14,6 @@ NOTE: If you experience sound problems with allacrost (music is
 harsh and choppy), try creating ~/.openalrc with single line:
 
 (define devices '(sdl))
+EOM
+}
+]
diff --git a/games/aquaria/files/pkg-message.in b/games/aquaria/files/pkg-message.in
index 5dc51cb78c37..2a7878b6206e 100644
--- a/games/aquaria/files/pkg-message.in
+++ b/games/aquaria/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The following method was only tested with Aquaria release from Humble
 Indie Bundle. In order to play the game copy data files under
 %%DATADIR%% or specify the path to them via environment variable e.g.,
@@ -10,3 +13,6 @@ or
 
    $ cp -R %%DATADIR%%/override /path/to/aquaria/data/
    $ AQUARIA_DATA_PATH=/path/to/aquaria/data aquaria
+EOM
+}
+]
diff --git a/games/arx-libertatis/files/pkg-message.in b/games/arx-libertatis/files/pkg-message.in
index d8b68d74c9fa..d3ed20b9e949 100644
--- a/games/arx-libertatis/files/pkg-message.in
+++ b/games/arx-libertatis/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Arx Libertatis requires data files from either full version or a demo
 of Arx Fatalis. Copy the following files and directories to
 either %%PREFIX%%/share/arx or ~/.local/share/arx:
@@ -10,5 +11,6 @@ either %%PREFIX%%/share/arx or ~/.local/share/arx:
 
 See http://arx.parpg.net/Getting_the_game_data for the information on
 getting the game data.
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/asc/pkg-message b/games/asc/pkg-message
index 34bebbe7ac37..a659e3888f73 100644
--- a/games/asc/pkg-message
+++ b/games/asc/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 - to start the game type 'asc' in an x-windows console
 - if the music temporary stops during the computers moves,
 turn it off. This will increase the speed of the computers moves!
+EOM
+}
+]
diff --git a/games/awale/files/pkg-message.in b/games/awale/files/pkg-message.in
index befdd7f0ce62..da7ca2119684 100644
--- a/games/awale/files/pkg-message.in
+++ b/games/awale/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Free Awale has been installed.
 
 To start Free Awale please use
@@ -12,5 +13,6 @@ for CLI
 for GUI
 
     %%PREFIX%%/share/applications/awale.desktop
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/banihstypos/files/pkg-message.in b/games/banihstypos/files/pkg-message.in
index fa7764d0408d..6d18dd37b59b 100644
--- a/games/banihstypos/files/pkg-message.in
+++ b/games/banihstypos/files/pkg-message.in
@@ -1,6 +1,8 @@
----------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 %%PORTNAME%% looks in /usr/share/dict for a dictionary-file. If you want
 more words, please install more dictionary-file.
-
----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/games/barony/files/pkg-message.in b/games/barony/files/pkg-message.in
index 44c3f56181a7..f8677f254b65 100644
--- a/games/barony/files/pkg-message.in
+++ b/games/barony/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Barony requires the original game files from Barony: Blessed Edition
 (e.g. 3.2.x) to work properly.  These can come from the GOG.com
 or the Steam versions of the game.
@@ -23,3 +26,6 @@ for example:
 $ barony -datadir=$HOME/.barony
 
 You do not have to fix file permissions in this case.
+EOM
+}
+]
diff --git a/games/bass/files/pkg-message.in b/games/bass/files/pkg-message.in
index 8958f1874bae..db0d18c0bf93 100644
--- a/games/bass/files/pkg-message.in
+++ b/games/bass/files/pkg-message.in
@@ -1,13 +1,17 @@
- - --------------------------------------------------------------------- -
- - Beneath a Steel Sky (bass) PORT NOTES                ported by atrull -
- - --------------------------------------------------------------------- -
- -  How to Get Playing:                                                  -
- -                                                                       -
- -  i) Type scummvm to start the game interpreter                        -
- -  ii) Click 'Add Game...', Browse to %%DATADIR%%             -
- -  iii) Click 'Choose' then click 'OK'                                  -
- -  iv) Select 'Beneath a Steel Sky' from the Menu and click 'Start'     -
- -                                                                       -
- -                                         Have fun, Be Vigilant!        -
- -                                                              - atrull -
- - --------------------------------------------------------------------- -
+[
+{ type: install
+  message: <<EOM
+  Beneath a Steel Sky (bass) PORT NOTES                ported by atrull
+
+   How to Get Playing:
+
+   i) Type scummvm to start the game interpreter
+   ii) Click 'Add Game...', Browse to %%DATADIR%%
+   iii) Click 'Choose' then click 'OK'
+   iv) Select 'Beneath a Steel Sky' from the Menu and click 'Start'
+
+                                          Have fun, Be Vigilant!
+                                                               - atrull
+EOM
+}
+]
diff --git a/games/blackshadeselite/pkg-message b/games/blackshadeselite/pkg-message
index d500db6cdfc2..7ff7ce62df0c 100644
--- a/games/blackshadeselite/pkg-message
+++ b/games/blackshadeselite/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Black Shades Elite has been installed. To start the game, type
 `blackshades'.
 
@@ -5,3 +8,6 @@ Also, you may find those key combinations useful:
 
 Alt+Enter: toggle fullscreen
 Ctrl+G: toggle mouse grab
+EOM
+}
+]
diff --git a/games/cake/pkg-message b/games/cake/pkg-message
index 94e089f1ae43..2658d86a0ff3 100644
--- a/games/cake/pkg-message
+++ b/games/cake/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You can put custom configuration file in the same directory where you
 run cake binary from, named `config.ini'.  Some default values are:
 
@@ -15,3 +18,6 @@ NOTE: cake requires a gfx card that supports following extensions:
 
     * GL_EXT_compiled_vertex_array
     * GL_ARB_multitexture
+EOM
+}
+]
diff --git a/games/chocolate-doom/pkg-message b/games/chocolate-doom/pkg-message
index 2956bc7cc74d..b89c2b8a8e87 100644
--- a/games/chocolate-doom/pkg-message
+++ b/games/chocolate-doom/pkg-message
@@ -1,5 +1,6 @@
-******************************************************
-
+[
+{ type: install
+  message: <<EOM
 The default location for a configuration files and
 saves is no longer ~/.chocolate-doom, current one is
 ~/.local/share/chocolate-doom/.
@@ -40,5 +41,6 @@ Examples:
 If you choose either Gravis Ultrasound emulation or
 native MIDI and provide no path, there will be no
 music.
-
-******************************************************
+EOM
+}
+]
diff --git a/games/conquest/files/pkg-message.in b/games/conquest/files/pkg-message.in
index e267d092ea70..5910e9e4f237 100644
--- a/games/conquest/files/pkg-message.in
+++ b/games/conquest/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Before Conquest can be run it must be configured, you need to
 initialise and enable the game:
 
@@ -5,3 +8,6 @@ initialise and enable the game:
 # sbin/conqoper -Ie -E
 
 Conqoper is documented in %%DOCSDIR%%/README.
+EOM
+}
+]
diff --git a/games/corsix-th/pkg-message b/games/corsix-th/pkg-message
index c89486dddfd5..2478b910bdab 100644
--- a/games/corsix-th/pkg-message
+++ b/games/corsix-th/pkg-message
@@ -1,5 +1,6 @@
-NOTE:
-
+[
+{ type: install
+  message: <<EOM
 At the moment, game assets (graphics, sounds, levels, translations, etc.)
 are loaded from the original game files.  Therefore, you will require a
 pre-existing Theme Hospital install in order to use CorsixTH.  If you've
@@ -10,3 +11,6 @@ this for the theme_hospital_install setting later.  If you are unable to
 acquire the full game data files, then the demo can be downloaded easily
 and used instead (though the demo only has one level, and lacks most of
 the management screens).
+EOM
+}
+]
diff --git a/games/crafty-tablebase-no-pawn/pkg-message b/games/crafty-tablebase-no-pawn/pkg-message
index 279f327d8b53..53c6583ead28 100644
--- a/games/crafty-tablebase-no-pawn/pkg-message
+++ b/games/crafty-tablebase-no-pawn/pkg-message
@@ -1,6 +1,6 @@
-
-
-
+[
+{ type: install
+  message: <<EOM
 These tablebases do not include the pawn tablebases, which are quite
 large.  This port alone will eat up around 2G. The pawn ending
 tablebases will need to be installed with the
@@ -18,3 +18,6 @@ added to your ~/.craftyrc file:
 
 	egtb
 	cache 12M
+EOM
+}
+]
diff --git a/games/crafty/pkg-message b/games/crafty/pkg-message
index 10bf0a20f201..7c921af35cd7 100644
--- a/games/crafty/pkg-message
+++ b/games/crafty/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This package is set to allow per-user config files, and a shared books
 directory.  To accomplish this, crafty is setgid nobody, and the books
 and learning information are owned by the user 'nobody.'
@@ -17,3 +20,6 @@ where n is a number between 1 and 100.  100 is max (default) skill.
 Skill 70 will drop the playing Elo by about 200 points.  Skill 50 will
 drop it about 400 points.  The curve is not linear, and the closer you
 get to 1, the lower the rating.
+EOM
+}
+]
diff --git a/games/d2x/pkg-message b/games/d2x/pkg-message
index cbb1176fdf3e..f5a83d13f946 100644
--- a/games/d2x/pkg-message
+++ b/games/d2x/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 You need to get datafiles from original Descent 2 or 1 game.
 Descent has also shareware edition, which is freely downloadable
 from d2x home page. Read file installation.txt for more information.
+EOM
+}
+]
diff --git a/games/devilutionX/pkg-message b/games/devilutionX/pkg-message
index 2fa0c97acd07..9b6eccc56fd4 100644
--- a/games/devilutionX/pkg-message
+++ b/games/devilutionX/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This game requires a datafile from the original Diablo(tm) CD or the GOG release.
 If you don't own it yet, you can buy it at https://www.gog.com/game/diablo
 
@@ -9,3 +12,6 @@ https://github.com/diasurgical/devilutionX/issues
 
 Note that only 32-bit builds are currently supported, amd64 is experimental but
 seems to be working fine as far as I've tested.
+EOM
+}
+]
diff --git a/games/dhewm3/files/pkg-message.in b/games/dhewm3/files/pkg-message.in
index 79f64bf1b51a..a47c0fd26bb3 100644
--- a/games/dhewm3/files/pkg-message.in
+++ b/games/dhewm3/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You need data files from original Doom 3 version 1.3.1 (NOT BFG
 edition):
 
@@ -23,3 +26,6 @@ These should be placed under %%DATADIR%%/d3xp
 
 Please consult https://github.com/dhewm/dhewm3/wiki/FAQ for more
 info.
+EOM
+}
+]
diff --git a/games/digger-vgl/pkg-message.sound b/games/digger-vgl/pkg-message.sound
index de7af8068249..2ad791cc3c05 100644
--- a/games/digger-vgl/pkg-message.sound
+++ b/games/digger-vgl/pkg-message.sound
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Use "digger /A" command to run Digger with sound enabled.
+EOM
+}
+]
diff --git a/games/doom-data/files/pkg-message.in b/games/doom-data/files/pkg-message.in
index 7a0988bb892e..59527d882437 100644
--- a/games/doom-data/files/pkg-message.in
+++ b/games/doom-data/files/pkg-message.in
@@ -1,8 +1,10 @@
-====================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use the full version of the games you need to own a legitimate
 copy of Doom, Doom II, Hexen, Heretic, and/or Strife.
 
 If you have them, copy the *.wad files to %%DATADIR%%.
-
-====================================================================
+EOM
+}
+]
diff --git a/games/doomsday/pkg-message b/games/doomsday/pkg-message
index 75c51ab7f7a1..4ac0a5b76984 100644
--- a/games/doomsday/pkg-message
+++ b/games/doomsday/pkg-message
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you use an Intel graphics adapter and experience missing or
 corrupted textures during gameplay, try launching doomsday with the
 "-notexcomp" option.
@@ -7,5 +8,6 @@ corrupted textures during gameplay, try launching doomsday with the
 If you get the error message "Variable 'audio.soundPlugin' not found"
 after upgrade from 1.15, remove the file ~/.doomsday/runtime/persist.pack
 and try to start doomsday again.
-
-========================================================================
+EOM
+}
+]
diff --git a/games/dxx-rebirth/pkg-message b/games/dxx-rebirth/pkg-message
index 61f0a8a5da63..3a2d4f2ce8fa 100644
--- a/games/dxx-rebirth/pkg-message
+++ b/games/dxx-rebirth/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 dxx-rebirth requires the original game files from Descent I and/or
 Descent II to work properly.  These can come from an original CD or from
 GOG.com.
@@ -20,3 +23,6 @@ You can then delete everything extracted from the exe.
 If you own the GOG.com version of Descent II, follow the above steps
 with the setup_descent_2_1.1_(16596).exe file and using
 ~/.d2x-rebirth/Data as the directory name.
+EOM
+}
+]
diff --git a/games/eboard/pkg-message b/games/eboard/pkg-message
index 0abd89e0b1df..b5c1af0f9850 100644
--- a/games/eboard/pkg-message
+++ b/games/eboard/pkg-message
@@ -1,7 +1,9 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you want to make FICS games fairer by accounting for network lag,
 install the games/timeseal port (when timeseal is active, the
 bottom-left icon changes to a orange/yellow locked clock).
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/ecwolf/files/pkg-message.in b/games/ecwolf/files/pkg-message.in
index 00e7483b557b..a109377be10a 100644
--- a/games/ecwolf/files/pkg-message.in
+++ b/games/ecwolf/files/pkg-message.in
@@ -1,5 +1,7 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 To play this game, unpack original files to %%PREFIX%%/share/%%PORTNAME%%.
-
-================================================================================
+EOM
+}
+]
diff --git a/games/eduke32/files/pkg-message.in b/games/eduke32/files/pkg-message.in
index f776f23db33b..2b4684cbcf55 100644
--- a/games/eduke32/files/pkg-message.in
+++ b/games/eduke32/files/pkg-message.in
@@ -1,5 +1,6 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port, you need to copy the files
 DUKE3D.GRP and DUKE.RTS from the original Duke Nukem 3D distribution to
 %%DATADIR%% with names "duke3d.grp" and "duke.rts"
@@ -11,5 +12,6 @@ To use the XXX Pack, you need to first include the HRP,
 i.e. eduke32 -g %%DATADIR%%/duke3d_hrp.zip -g %%DATADIR%%/duke3d_xxx.zip
 
 The Voxel pack is intended for use with classic textures, HRP has new models.
-
-================================================================================
+EOM
+}
+]
diff --git a/games/egoboo/pkg-message b/games/egoboo/pkg-message
index 60d32a03fd1f..4e87e39c2554 100644
--- a/games/egoboo/pkg-message
+++ b/games/egoboo/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 On first run, egoboo creates and populates ~/.egoboo directory. If
 egooboo doesn't start, try deleting ~/.egoboo so the game can
 recreate it.
+EOM
+}
+]
diff --git a/games/einstein/pkg-message b/games/einstein/pkg-message
index e626ebf3814f..81fa0f7bb0da 100644
--- a/games/einstein/pkg-message
+++ b/games/einstein/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 This game doesn't come with a proper manual. Please see
 http://www.babichev.info/en/projects/einstein/ for more information
 on how the game is supposed to be played.
+EOM
+}
+]
diff --git a/games/endless-sky-high-dpi/pkg-message b/games/endless-sky-high-dpi/pkg-message
index e366bf71045c..22700edf2cec 100644
--- a/games/endless-sky-high-dpi/pkg-message
+++ b/games/endless-sky-high-dpi/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Note that high-dpi sprites will only be used if:
 
 - you have set the "zoom factor" to higher than 100% in the preferences, or
 - you have a high-DPI monitor.
+EOM
+}
+]
diff --git a/games/enigma/files/pkg-message.in b/games/enigma/files/pkg-message.in
index c7cf59199a5c..fe533e030bcc 100644
--- a/games/enigma/files/pkg-message.in
+++ b/games/enigma/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This game was installed as %%PREFIX%%/bin/enigma.
 If you run "enigma" now, you might end up running /usr/bin/enigma
 (very simple file encryption) instead of a game, so please run
@@ -5,3 +8,6 @@ If you run "enigma" now, you might end up running /usr/bin/enigma
 %%PREFIX%%/bin/enigma
 
 to play and also read enigma(6) instead of enigma(1).
+EOM
+}
+]
diff --git a/games/exhaust-ma/pkg-message b/games/exhaust-ma/pkg-message
index f4cf55c757f5..09f31e7b0684 100644
--- a/games/exhaust-ma/pkg-message
+++ b/games/exhaust-ma/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 This MARS does not have a parser, so you have to do it separately.
 
 To parse Redcode programs with pMARS do the following:
 
 pmars-server -r 0 b-scanner.red | sed '1,2d' > b-scanner.rc
+EOM
+}
+]
diff --git a/games/exhaust/pkg-message b/games/exhaust/pkg-message
index f4cf55c757f5..09f31e7b0684 100644
--- a/games/exhaust/pkg-message
+++ b/games/exhaust/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 This MARS does not have a parser, so you have to do it separately.
 
 To parse Redcode programs with pMARS do the following:
 
 pmars-server -r 0 b-scanner.red | sed '1,2d' > b-scanner.rc
+EOM
+}
+]
diff --git a/games/exult/files/pkg-message.in b/games/exult/files/pkg-message.in
index e7f084f9746b..a7dd31dd209b 100644
--- a/games/exult/files/pkg-message.in
+++ b/games/exult/files/pkg-message.in
@@ -1,4 +1,8 @@
-******************************************************************************
-* Run Exult from directory containing original Ultima VII data.
-* Please, read %%DOCSDIR%%/README for additional information.
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
+ Run Exult from directory containing original Ultima VII data.
+ Please, read %%DOCSDIR%%/README for additional information.
+EOM
+}
+]
diff --git a/games/flightgear/pkg-message b/games/flightgear/pkg-message
index 091ab6726ab9..1b1fdaac191f 100644
--- a/games/flightgear/pkg-message
+++ b/games/flightgear/pkg-message
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 FlightGear may occasionally exceed the FreeBSD default maximum data size
 (512 MB), resulting in a crash of the program. To avoid that situation, add
 the following lines to /boot/loader.conf and reboot the system:
@@ -7,4 +9,6 @@ the following lines to /boot/loader.conf and reboot the system:
 	kern.maxdsiz="1073741824"
 	# set the default data size limit to 1 GB
 	kern.dfldsiz="1073741824"
-===============================================================================
+EOM
+}
+]
diff --git a/games/fotaq/files/pkg-message.in b/games/fotaq/files/pkg-message.in
index 6c43296fb3d9..9dc915004810 100644
--- a/games/fotaq/files/pkg-message.in
+++ b/games/fotaq/files/pkg-message.in
@@ -1,14 +1,18 @@
- - --------------------------------------------------------------------- -
- - Flight of the Amazon Queen (fotaq) PORT NOTES        ported by atrull -
- - --------------------------------------------------------------------- -
- -  How to Get Playing:                                                  -
- -                                                                       -
- -  i) Type scummvm to start the game interpreter                        -
- -  ii) Click 'Add Game...', Browse to %%DATADIR%%            -
- -  iii) Click 'Choose' then click 'OK'                                  -
- -  iv) Select 'Flight of the Amazon Queen' from the Menu                -
- -      and click 'Start'                                                -
- -                                                                       -
- -                                         Anything Goes!                -
- -                                                              - atrull -
- - --------------------------------------------------------------------- -
+[
+{ type: install
+  message: <<EOM
+  Flight of the Amazon Queen (fotaq) PORT NOTES        ported by atrull
+
+   How to Get Playing:
+
+   i) Type scummvm to start the game interpreter
+   ii) Click 'Add Game...', Browse to %%DATADIR%%
+   iii) Click 'Choose' then click 'OK'
+   iv) Select 'Flight of the Amazon Queen' from the Menu
+       and click 'Start'
+
+                                          Anything Goes!
+                                                               - atrull
+EOM
+}
+]
diff --git a/games/freeminer/pkg-message b/games/freeminer/pkg-message
index 7e1157455bfb..6c0c3adb50f8 100644
--- a/games/freeminer/pkg-message
+++ b/games/freeminer/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Freeminer engine has been installed.
 
 Note that for offline play or for server hosting you also need
@@ -7,3 +10,6 @@ port.
 
 For online play engine is sufficient as it will downloaded all
 required data automatically.
+EOM
+}
+]
diff --git a/games/freera/files/pkg-message.in b/games/freera/files/pkg-message.in
index 8b5349ef8144..92960a8aa224 100644
--- a/games/freera/files/pkg-message.in
+++ b/games/freera/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 FreeRA requires original .mix files from Red Alert. Copy those files from
 Red Alert CD's to %%DATADIR%%/mix/ directory:
 
@@ -8,5 +9,6 @@ Red Alert CD's to %%DATADIR%%/mix/ directory:
 
 PS. Both files can be found on either Red Alert CD. Both CDs have the
     maps for both campaigns but only the videos for one.
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/freesynd/files/pkg-message.in b/games/freesynd/files/pkg-message.in
index 6dc39fbe6f5a..046c672b1067 100644
--- a/games/freesynd/files/pkg-message.in
+++ b/games/freesynd/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
     Freesynd has been installed.
 
     To actually play the game you need to copy the original game
@@ -9,5 +10,6 @@
     have a different language, you can try setting the test_data
     configuration option to false and see if the game runs with
     that data.
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/fretsonfire/files/pkg-message.in b/games/fretsonfire/files/pkg-message.in
index ff932b76096e..d11c1e93b4bd 100644
--- a/games/fretsonfire/files/pkg-message.in
+++ b/games/fretsonfire/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The Frets On Fire was installed
 
 1) You can read the documentation about FretsOnFire at:
@@ -14,5 +15,6 @@ The Frets On Fire was installed
    # FretsOnFire
 
 4) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/fs2open/pkg-message b/games/fs2open/pkg-message
index f3d55c4414f4..a6fc75a7975f 100644
--- a/games/fs2open/pkg-message
+++ b/games/fs2open/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To play this game, you need to cd to the directory with the game files
 and run fs2_open.
+EOM
+}
+]
diff --git a/games/fteqw/files/pkg-message.in b/games/fteqw/files/pkg-message.in
index e84d1e62fd04..faff1dafabdb 100644
--- a/games/fteqw/files/pkg-message.in
+++ b/games/fteqw/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 FTE QuakeWorld has been installed.
 
 By default it saves configuration to ~/.fte, to avoid run with "-nohome".
@@ -9,5 +10,6 @@ Quake use "-basedir %%Q1DIR%%".
 
 For a complete list of supported games see:
 http://www.fteqw.com/wiki/index.php?title=SupportedGames
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/gemrb/files/pkg-message.in b/games/gemrb/files/pkg-message.in
index 2bd89b811edf..c58d42d857b1 100644
--- a/games/gemrb/files/pkg-message.in
+++ b/games/gemrb/files/pkg-message.in
@@ -1,4 +1,6 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 To use GemRB, you must copy the Chitin.key from your respective Infinity Engine
 game CD to the GemRB directory.  If you do not copy this file, GemRB will not
 work. Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the
@@ -7,4 +9,6 @@ emulators/wine-devel, archivers/unshield, or the custom GemRB game installer:
 http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers/
 
 Please see http://www.gemrb.org/ for additional help and instructions.
-===============================================================================
+EOM
+}
+]
diff --git a/games/glchess/pkg-message b/games/glchess/pkg-message
index 98f3d7d0a660..4c1dc72c586f 100644
--- a/games/glchess/pkg-message
+++ b/games/glchess/pkg-message
@@ -1,5 +1,6 @@
-
------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Please make sure that
 
 Load        "glx"
@@ -10,4 +11,6 @@ of your X config file.
 glChess supports the use of chess playing programs like
 games/crafty and games/gnuchess for you to play against so
 install them manually if you want them.
------------------------------------------------------------
+EOM
+}
+]
diff --git a/games/glest/files/pkg-message.in b/games/glest/files/pkg-message.in
index 3c2f4a1cf0e0..52f4ed264b44 100644
--- a/games/glest/files/pkg-message.in
+++ b/games/glest/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The glest game was installed
 
 1) You can see the glest configuration files into your ~/.glest directory
@@ -12,5 +13,6 @@ The glest game was installed
    directory and try again
 
 4) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/glob2/files/pkg-message.in b/games/glob2/files/pkg-message.in
index 9bb8211100a3..95b6f098faac 100644
--- a/games/glob2/files/pkg-message.in
+++ b/games/glob2/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Globulation 2 has been installed.
 
 You can try to launch it typing
@@ -14,5 +15,6 @@ and read about command lines arguments.
 
 Try to use -G option if you have problems with dri and glx (OpenGL),
 or -m if you have problems with sound, or -C to disable custom cursor.
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/gnurobots/files/pkg-message.in b/games/gnurobots/files/pkg-message.in
index 4a1562b10a33..c22862d09df1 100644
--- a/games/gnurobots/files/pkg-message.in
+++ b/games/gnurobots/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 GNU Robots has been installed.
 
 Where to find things
@@ -8,5 +9,6 @@ Where to find things
   - Example maps:     %%DATADIR%%/maps/
   - Example robots:   %%DATADIR%%/scheme/
   - Binaries:         gnurobots
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/highmoon/files/pkg-message.in b/games/highmoon/files/pkg-message.in
index f576749f2088..af6de96c0e76 100644
--- a/games/highmoon/files/pkg-message.in
+++ b/games/highmoon/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 HighMoon has been installed.
 
 All options are given in the command line or GUI shortcuts
@@ -16,5 +17,6 @@ Or can use desktop file with shortcuts
 
 
 Have fun!
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/holotz-castle/files/pkg-message.in b/games/holotz-castle/files/pkg-message.in
index 580c0411f7b4..60b6d6c76ec6 100644
--- a/games/holotz-castle/files/pkg-message.in
+++ b/games/holotz-castle/files/pkg-message.in
@@ -1,9 +1,11 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Holotz's Castle has been installed.
 
 You can look some Solutions for Holotz's Castle with
 
      %%PREFIX%%/bin/holotz-castle-solutions
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/ioquake3/pkg-message b/games/ioquake3/pkg-message
index ea93cb9d37e5..7b618898698b 100644
--- a/games/ioquake3/pkg-message
+++ b/games/ioquake3/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Should the game freeze when entering a match, try to change the value of
 com_zoneMegs (e.g. to 48).
 
@@ -5,3 +8,6 @@ The configuration files are saved to ~/.ioquake3 instead of ~/.q3a because
 they have additional variables which would be removed if other engines
 overwrite them. But you can safely copy the original directory to the new one
 for the first time.
+EOM
+}
+]
diff --git a/games/iortcw/files/pkg-message.in b/games/iortcw/files/pkg-message.in
index 7c75229633b9..7dde4771a642 100644
--- a/games/iortcw/files/pkg-message.in
+++ b/games/iortcw/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To play Return to Castle Wolfenstein:
 
 1. Install RtCW from your CD using emulators/i386-wine
@@ -8,3 +11,6 @@ To play Return to Castle Wolfenstein:
 4. Extract all patch-data-*.zip in ~/.wolf
 5a. Start a single player game with iowolfsp
 5b. Or a multiplayer game with iowolfmp
+EOM
+}
+]
diff --git a/games/iourbanterror/pkg-message b/games/iourbanterror/pkg-message
index 454d1e35f336..02479309513e 100644
--- a/games/iourbanterror/pkg-message
+++ b/games/iourbanterror/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Note, that the port was switched over to use the original ioquake project
 source code instead of code provided by the UrbanTerror project. The
 UrbanTerror project is switching to a closed source licensing model:
@@ -5,3 +8,6 @@ UrbanTerror project is switching to a closed source licensing model:
 
 Should the game have trouble meeting com_maxfps, set com_busywait 1 to restore
 the old behaviour.
+EOM
+}
+]
diff --git a/games/jaggedalliance2/pkg-message b/games/jaggedalliance2/pkg-message
index 85555303672e..9aeb5aee8db1 100644
--- a/games/jaggedalliance2/pkg-message
+++ b/games/jaggedalliance2/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 This Jagged Alliance 2 port requires data files from the original
 game CD and installation.
+EOM
+}
+]
diff --git a/games/jfk/files/pkg-message.in b/games/jfk/files/pkg-message.in
index b1789a802579..de890e20a920 100644
--- a/games/jfk/files/pkg-message.in
+++ b/games/jfk/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Please create a file .jfkserverrc with a line 'level=<levelfile>' where
 <levelfile> is one from %%DATADIR%%/levels/ or your own and a file
 .jfkclientrc with a line 'name=<yourname>' in your home directory. For more
 information about other variables read %%DOCSDIR%%/jfkserver.sample
 and %%DOCSDIR%%/jfkclient.sample.
+EOM
+}
+]
diff --git a/games/jfsw/files/pkg-message.in b/games/jfsw/files/pkg-message.in
index 9a5f917731e5..c6fa422e4702 100644
--- a/games/jfsw/files/pkg-message.in
+++ b/games/jfsw/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 JonoF's Shadow Warrior is now installed.
 
 Before playing, you need to copy the following files from the original (or
@@ -19,6 +19,6 @@ directory. They must be Ogg Vorbis files and named:
 Launch the game by typing 'jfsw'
 
 Enjoy!
-
-===============================================================================
-
+EOM
+}
+]
diff --git a/games/joequake/pkg-message b/games/joequake/pkg-message
index efcc94902c93..eb6e7e62da1a 100644
--- a/games/joequake/pkg-message
+++ b/games/joequake/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 JoeQuake has been installed.
 
 To start it in full-screen mode you can run it with the "-fullscreen"
@@ -15,5 +16,6 @@ If you have sound problems try running it with the parameter
 If you enable water alpha ("r_wateralpha" or from the menu), set "r_novis" to
 "1" or you will have problems with water/lava. Note that the value of
 "r_novis" will be saved in the configuration file.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/julius/files/pkg-message.in b/games/julius/files/pkg-message.in
index 2535e28eedcf..efe654703d37 100644
--- a/games/julius/files/pkg-message.in
+++ b/games/julius/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To play this game, you need to cd to the directory with the game files
 and run julius or just pass the directory as a 1st argument.
+EOM
+}
+]
diff --git a/games/kye/files/pkg-message.in b/games/kye/files/pkg-message.in
index 6f9d12389948..908288466885 100644
--- a/games/kye/files/pkg-message.in
+++ b/games/kye/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Python Kye has been installed.
 
 
@@ -25,5 +26,6 @@ and other Sites and put it in:
 You could manually change Permissions these Levels with:
 
     /bin/chmod 444 %%DATADIR%%/*.kye
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/leela-zero/pkg-message b/games/leela-zero/pkg-message
index 559970faac33..d6782996df39 100644
--- a/games/leela-zero/pkg-message
+++ b/games/leela-zero/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed leela-zero: the Go engine.
 
 You need at least one OpenCL provider installed in order for leela-zero
@@ -12,4 +14,6 @@ for example:
 * pocl: for a simple CPU provider
 * beignet: for the Intel GPU provider
 * etc.
-======================================================================
+EOM
+}
+]
diff --git a/games/linux-darwinia-demo/pkg-message b/games/linux-darwinia-demo/pkg-message
index 1ab3cd59445c..c268e17949c5 100644
--- a/games/linux-darwinia-demo/pkg-message
+++ b/games/linux-darwinia-demo/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 This game will attempt to obtain some system information by
 accessing files in linux's procfs. You must install the Linux
 emulation procfs filesystem for this to work correctly. This can be
@@ -10,5 +12,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/games/linux-defcon/pkg-message b/games/linux-defcon/pkg-message
index 1ab3cd59445c..c268e17949c5 100644
--- a/games/linux-defcon/pkg-message
+++ b/games/linux-defcon/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 This game will attempt to obtain some system information by
 accessing files in linux's procfs. You must install the Linux
 emulation procfs filesystem for this to work correctly. This can be
@@ -10,5 +12,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/games/linux-doom3/files/pkg-message.in b/games/linux-doom3/files/pkg-message.in
index 55f40250e2b8..64a6fab1f2e8 100644
--- a/games/linux-doom3/files/pkg-message.in
+++ b/games/linux-doom3/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port you need to copy the files
 "base/pak00[0-4].pk4", from the original Doom III distribution to
 "%%DATADIR%%/base".
@@ -7,5 +8,6 @@ To complete the installation of this port you need to copy the files
 If you have the Doom III: Resurrection of Evil expansion copy the file
 "d3xp/pak000.pk4", from the original distribution to
 "%%DATADIR%%/d3xp".
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/linux-nerogame/files/pkg-message.in b/games/linux-nerogame/files/pkg-message.in
index a08595807eae..2a35c2c611c9 100644
--- a/games/linux-nerogame/files/pkg-message.in
+++ b/games/linux-nerogame/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The NERO game was installed
 
 1) Run the game using:
@@ -9,5 +10,6 @@ The NERO game was installed
 2) The config and log files are stored into the ~/.garagegames directory
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/linux-nwnclient/pkg-message b/games/linux-nwnclient/pkg-message
index 8061d8d0034e..b1b11e96c6d2 100644
--- a/games/linux-nwnclient/pkg-message
+++ b/games/linux-nwnclient/pkg-message
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 If the game is installed with movie support (NWMovies), there is a way
 to skip various movies, especially the five introduction movies at the
 start of the game:  create a skip file ($HOME/.nwn/nwmovies.skip) and
@@ -17,5 +18,6 @@ the NWMovies README file:
     The main menu music does not work after starting NWN w/ NWMovies.
     Entering the game, and backing out to the main menu, the music
     works.  Known issue, no known cause, nor resolution.
-
-======================================================================
+EOM
+}
+]
diff --git a/games/linux-quake4/files/pkg-message.in b/games/linux-quake4/files/pkg-message.in
index ce2676da7959..c63e2809ceed 100644
--- a/games/linux-quake4/files/pkg-message.in
+++ b/games/linux-quake4/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 Quake 4 game (Linux version) was installed
 
 1) In order to play Quake 4, you need to copy some data files
@@ -11,5 +12,6 @@ file:
 2) Need minimal 24bits resolution in your desktop for to play it.
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/linux-ssamtfe/files/pkg-message.in b/games/linux-ssamtfe/files/pkg-message.in
index d7787a79e966..56dc8a6d0d5a 100644
--- a/games/linux-ssamtfe/files/pkg-message.in
+++ b/games/linux-ssamtfe/files/pkg-message.in
@@ -1,8 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 You need to edit %%PREFIX%%/etc/ssamtfe.conf
 to set correct CPU frequency in SERIOUS_MHZ variable.
 
 Run the game using:
 
 # ssamtfe
-
+EOM
+}
+]
diff --git a/games/linux-ssamtse/files/pkg-message.in b/games/linux-ssamtse/files/pkg-message.in
index 3b1b0d25bb95..389449dd075c 100644
--- a/games/linux-ssamtse/files/pkg-message.in
+++ b/games/linux-ssamtse/files/pkg-message.in
@@ -1,8 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 You need to edit %%PREFIX%%/etc/ssamtse.conf
 to set correct CPU frequency in SERIOUS_MHZ variable.
 
 Run the game using:
 
 # ssamtse
-
+EOM
+}
+]
diff --git a/games/linux-unrealgold/files/pkg-message.in b/games/linux-unrealgold/files/pkg-message.in
index fd7dbf965fa7..9977cbf7c182 100644
--- a/games/linux-unrealgold/files/pkg-message.in
+++ b/games/linux-unrealgold/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The Unreal Gold game was installed
 
 1) Run the game using:
@@ -14,6 +14,6 @@ The Unreal Gold game was installed
    %%DOCSDIR%%
 
 4) Enjoy it ;)
-
-###############################################################################
-
+EOM
+}
+]
diff --git a/games/linux-uplink-demo/pkg-message b/games/linux-uplink-demo/pkg-message
index 1ab3cd59445c..c268e17949c5 100644
--- a/games/linux-uplink-demo/pkg-message
+++ b/games/linux-uplink-demo/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 This game will attempt to obtain some system information by
 accessing files in linux's procfs. You must install the Linux
 emulation procfs filesystem for this to work correctly. This can be
@@ -10,5 +12,6 @@ and then, as root, executing the commands:
 
 kldload linprocfs
 mount /compat/linux/proc
-
-======================================================================
+EOM
+}
+]
diff --git a/games/linux-ut/pkg-message b/games/linux-ut/pkg-message
index 748b76691bc1..70d053e35b21 100644
--- a/games/linux-ut/pkg-message
+++ b/games/linux-ut/pkg-message
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 If you are experiencing problems reading the Unreal Tournament CD/DVD,
 then try mounting it with the -b option.
 
@@ -9,4 +11,6 @@ WITH_451PATCH		Install the v451 patch.  This patch fixes some
 			patch is completely network compatible with v436,
 			so you do not need it for online play.
 WITHOUT_MAPS		Do not install the maps.
-==========================================================================
+EOM
+}
+]
diff --git a/games/mangband/files/pkg-message.in b/games/mangband/files/pkg-message.in
index 3553b9dfca2e..6f2e4898a942 100644
--- a/games/mangband/files/pkg-message.in
+++ b/games/mangband/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 MAngband has been installed.
 
 The following mangclient directories could be copied to a user-writable
@@ -26,5 +27,6 @@ To run mangband server as an unpriviliged user, such user must be added
 to the games group. For example:
 
     pw usermod <user> -G games
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/marsnomercy/files/pkg-message.in b/games/marsnomercy/files/pkg-message.in
index 9d056510e85a..d09c1cd95abc 100644
--- a/games/marsnomercy/files/pkg-message.in
+++ b/games/marsnomercy/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 1) I renamed this port to marsnomercy (Mars Land of No Mercy), because exist a
    port using mars name (cad/mars).
 
@@ -8,5 +9,6 @@
    # mars-nomercy
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/megaglest/files/pkg-message.in b/games/megaglest/files/pkg-message.in
index e07e44b0fc2c..46964dd84ba8 100644
--- a/games/megaglest/files/pkg-message.in
+++ b/games/megaglest/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The megaglest game has been installed.
 
 1) The megaglest configuration files are stored in ~/.megaglest.
@@ -17,5 +18,6 @@ The megaglest game has been installed.
 5) If you upgraded from version 3.4.0, your personal settings are stored in
    ~/.megaglest3.4.0.  If you copy glestuser.ini and glestuserkeys.ini to
    ~/.megaglest, you will have your old settings again.
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/minecraft-server/files/pkg-message.in b/games/minecraft-server/files/pkg-message.in
index 79980e99c98a..390cf46ca947 100644
--- a/games/minecraft-server/files/pkg-message.in
+++ b/games/minecraft-server/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 When you first run minecraft-server, it will populate the file
 %%ETCDIR%%/eula.txt
 
@@ -17,3 +20,6 @@ With daemon option:
 - To adjust initial memory usage (-Xms), use minecraft_mems= in /etc/rc.conf
 - To add other java parameters, use minecraft_args= in /etc/rc.conf
 - To see the interactive console, type service minecraft console
+EOM
+}
+]
diff --git a/games/mtaserver/files/pkg-message.in b/games/mtaserver/files/pkg-message.in
index 63223119453d..cc1fc8d3d22e 100644
--- a/games/mtaserver/files/pkg-message.in
+++ b/games/mtaserver/files/pkg-message.in
@@ -1,4 +1,8 @@
-***********************************************************************
+[
+{ type: install
+  message: <<EOM
 Edit %%ETCDIR%%/mtaserver.conf before using
 Read %%DOCSDIR%%/README for details
-***********************************************************************
+EOM
+}
+]
diff --git a/games/multimc/pkg-message b/games/multimc/pkg-message
index d90b0ac6ac0e..913036ac1e1e 100644
--- a/games/multimc/pkg-message
+++ b/games/multimc/pkg-message
@@ -1,5 +1,6 @@
-Important note about LWJGL:
-
+[
+{ type: install
+  message: <<EOM
 Minecraft requires LWJGL (the Lightweight Java Game Library) to run.
 Mojang hosts prebuilt LWJGL shared objects for Windows, macOS, and Linux,
 which MultiMC is written to download and add to a new instance. The FreeBSD
@@ -12,3 +13,6 @@ instances in MultiMC, LWJGL 3 will have to be ported, and ideally MultiMC should
 be patched to use version 2 or 3 depending on the Minecraft version of a given instance.
 This is planned for the future, but as of now it is only possible to play versions
 up to 1.12.x with this port.
+EOM
+}
+]
diff --git a/games/mvdsv/pkg-message b/games/mvdsv/pkg-message
index db56e7f90f5c..f6f3ab61cffd 100644
--- a/games/mvdsv/pkg-message
+++ b/games/mvdsv/pkg-message
@@ -1,6 +1,8 @@
-==========================================================
-
+[
+{ type: install
+  message: <<EOM
     Make sure to provide required run-time environment
     and server configuration file first before running
-
-==========================================================
+EOM
+}
+]
diff --git a/games/nehquake/files/pkg-message.in b/games/nehquake/files/pkg-message.in
index ddf428be7b95..af45234bb45f 100644
--- a/games/nehquake/files/pkg-message.in
+++ b/games/nehquake/files/pkg-message.in
@@ -1,9 +1,9 @@
-==============================================================================
-
-NehQuake has been installed.
-
+[
+{ type: install
+  message: <<EOM
 To complete the instalation of this port you have download the Nehahra data
 files from "http://planetquake.com/nehahra/" and extract them to
 "%%Q1DIR%%/nehahra".
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/netrek-BRMH-bin/pkg-message b/games/netrek-BRMH-bin/pkg-message
index 97da69ed2c4e..878232649274 100644
--- a/games/netrek-BRMH-bin/pkg-message
+++ b/games/netrek-BRMH-bin/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The Netrek client is now installed.  You may start it by typing "netrek".
 
 Be sure and read the Netrek web site (http://www.netrek.org/) before you
@@ -12,3 +15,6 @@ file:
 metaserver:		metaserver.netrek.org
 
 Enjoy, have fun, and may you live long and prosper...
+EOM
+}
+]
diff --git a/games/openbor/files/pkg-message.in b/games/openbor/files/pkg-message.in
index b948355fecdf..094510b1c61b 100644
--- a/games/openbor/files/pkg-message.in
+++ b/games/openbor/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To play a game copy its .pak file under ~/.%%PKGBASE%%/Paks/ directory.
 If only one file is there OpenBOR would run the game on startup,
 otherwise game launcher would appear.
@@ -8,3 +11,6 @@ as follows:
   $ cd /path/to/game
   $ cp -R ~/.%%PKGBASE%%/Saves .
   $ OPENBOR_USE_CURDIR=1 %%PKGBASE%%
+EOM
+}
+]
diff --git a/games/openclaw/files/pkg-message.in b/games/openclaw/files/pkg-message.in
index 9ffd3aea46fe..365af7454ae0 100644
--- a/games/openclaw/files/pkg-message.in
+++ b/games/openclaw/files/pkg-message.in
@@ -1,6 +1,9 @@
-==============================================================================
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port you need to copy the file
 "CLAW.REZ" from the original Captain Claw distribution to
 %%DATADIR%%.
-==============================================================================
-
+EOM
+}
+]
diff --git a/games/openjazz/files/pkg-message.in b/games/openjazz/files/pkg-message.in
index a2d53290874d..38d80d57a4b8 100644
--- a/games/openjazz/files/pkg-message.in
+++ b/games/openjazz/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=========================================================
-
+[
+{ type: install
+  message: <<EOM
 OpenJazz is now installed. In order to work, the game
 needs additional files. Please buy the full version or
 download the shareware version (e.g.) here :
@@ -11,6 +11,6 @@ and copy every file of the game *uppercase* to
 %%DATADIR%%
 
 Once this is done, run 'openjazz'. Enjoy !
-
-=========================================================
-
+EOM
+}
+]
diff --git a/games/openjk/pkg-message b/games/openjk/pkg-message
index ba8c4f2096ec..f4fc7b2b7604 100644
--- a/games/openjk/pkg-message
+++ b/games/openjk/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 OpenJK requires the original game files from Star Wars: Jedi Knight:
 Jedi Academy to work properly.  These can come from an original CD or
 from GOG.com.
@@ -26,3 +29,6 @@ is jasp.
 If you own a copy of Star Wars: Jedi Knight: Jedi Outcast, its game
 files may be used to play that game, though upstream makes no
 guarantees on your success in playing this game.
+EOM
+}
+]
diff --git a/games/openmw/pkg-message b/games/openmw/pkg-message
index f0cded09e292..d14698de9472 100644
--- a/games/openmw/pkg-message
+++ b/games/openmw/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 OpenMW requires a set of Morrowind data files.  If you don't own a
 copy of Morrowind, you can buy and download one on e.g. Steam or GOG.
 Steam can be installed on FreeBSD/amd64 via emulators/i386-wine or on
@@ -8,3 +11,6 @@ easiest of the two options).
 Once you have a set of Morrowind data files run openmw-launcher next.
 Answer YES to the question if you want to run the installation wizard.
 Follow the wizard's instruction to select your Morrowind data files.
+EOM
+}
+]
diff --git a/games/openrct2/pkg-message b/games/openrct2/pkg-message
index c1ac6ba42024..1d102cb2ea7e 100644
--- a/games/openrct2/pkg-message
+++ b/games/openrct2/pkg-message
@@ -1,6 +1,8 @@
-================================================================================
-
+[
+{ type: install
+  message: <<EOM
 You need to follow https://openrct2.io/getting-started/index.html to finish
 installation.
-
-================================================================================
+EOM
+}
+]
diff --git a/games/openttd/files/pkg-message.in b/games/openttd/files/pkg-message.in
index 573c895642c0..aa710e3a2c3e 100644
--- a/games/openttd/files/pkg-message.in
+++ b/games/openttd/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
     OpenTTD requires the original Windows version of "Transport Tycoon
     Deluxe" data files in order to function.  Copy the following files
     to %%DATADIR%%/data/ (or better, $HOME/.openttd/data/)
@@ -31,5 +32,6 @@
 	large_font =
 
     Enjoy!!
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/opentyrian/files/pkg-message.in b/games/opentyrian/files/pkg-message.in
index bcd2a60d5d5e..ee09b7e42dbb 100644
--- a/games/opentyrian/files/pkg-message.in
+++ b/games/opentyrian/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 In order to play opentyrian, you need to either install games/tyrian-data
 port (not available as package) or install Tyrian data files manually
 into %%DATADIR%%.
 
 See project documentation or website for instructions on how to get
 the data.
+EOM
+}
+]
diff --git a/games/openxcom/files/pkg-message.in b/games/openxcom/files/pkg-message.in
index e3db20ab2551..8e02a91628cd 100644
--- a/games/openxcom/files/pkg-message.in
+++ b/games/openxcom/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 OpenXcom requires original UFO: Enemy Unknown / X-Com: UFO Defense
 data files. Please copy all subfolders from original game into
 %%DATADIR%%/data directory.
@@ -11,5 +12,6 @@ version. See section `Data Patch' of
   http://openxcom.org/index.php/downloads-extras/
 
 for details.
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/outerspace/pkg-message b/games/outerspace/pkg-message
index 260b3edcd883..9a1a0962227c 100644
--- a/games/outerspace/pkg-message
+++ b/games/outerspace/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 NOTE: This is actually a port of Outer Space Launcher - a program which
 automatically handles downloading and updating of Outer Space client.
 Expect it to download about 2 Mb on the first run (files are stored in
 ~/.ospace).
+EOM
+}
+]
diff --git a/games/pink-pony/pkg-message b/games/pink-pony/pkg-message
index 146c73484e19..20561a4b9928 100644
--- a/games/pink-pony/pkg-message
+++ b/games/pink-pony/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 After updating, game may fail to start unable to find some data
 files. In this case, please remove ~/.config/pony.options left
 from the previous install and retry. Unfortunately, the game
 currently doesn't properly handle config file updating.
+EOM
+}
+]
diff --git a/games/pioneer/files/pkg-message.in b/games/pioneer/files/pkg-message.in
index 442e3460ae39..070c1be6b290 100644
--- a/games/pioneer/files/pkg-message.in
+++ b/games/pioneer/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Pioneer has been installed.
 
 Pioneer is alpha-quality software. Saved games are not guaranteed to load in
@@ -5,3 +8,6 @@ different versions of Pioneer. The universe might not be the same in the next
 version of Pioneer. Anything can change. The game is not finished.
 
 Take a look at %%QUICKSTART_PATH%%/Quickstart.txt for more info.
+EOM
+}
+]
diff --git a/games/prboom/files/pkg-message.in b/games/prboom/files/pkg-message.in
index 9cd13298ea58..16ca4ff14dc8 100644
--- a/games/prboom/files/pkg-message.in
+++ b/games/prboom/files/pkg-message.in
@@ -1,5 +1,6 @@
-#############################################################
-
+[
+{ type: install
+  message: <<EOM
 1) This port does not install any doom .wad ,
 so you have to download it and run prboom -iwad /path/to/doom.wad
 or put it in /usr/local/share/games/doom/ !
@@ -9,4 +10,6 @@ if you like prboom and  want a newer version
 you should look at http://prboom-plus.sourceforge.net!
 
 3)Have fun!
-############################################################
+EOM
+}
+]
diff --git a/games/pydance/files/pkg-message.in b/games/pydance/files/pkg-message.in
index d856d5976188..89d68baec9bb 100644
--- a/games/pydance/files/pkg-message.in
+++ b/games/pydance/files/pkg-message.in
@@ -1,10 +1,12 @@
---------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 The pydance package has been successfully installed.
 
 NB:  A sample configuration file has been installed to %%PREFIX%%/etc as
 "pydance.cfg.sample". This should be renamed to "pydance.cfg" and edited
 to suit the requirements of a particular site (for example in order
 to add song directories).
-
---------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/games/pysycache/files/pkg-message.in b/games/pysycache/files/pkg-message.in
index b661ca6ce082..28eda668bf63 100644
--- a/games/pysycache/files/pkg-message.in
+++ b/games/pysycache/files/pkg-message.in
@@ -1,6 +1,8 @@
-###############################################################
-
+[
+{ type: install
+  message: <<EOM
 1) Install language pack using games/pysycache-lang port
 2) Install additional themes using games/pysycache-themes port
-
-###############################################################
+EOM
+}
+]
diff --git a/games/quake2-3zb2/files/pkg-message.in b/games/quake2-3zb2/files/pkg-message.in
index 69ebad8d9dd5..8dadf3e113bd 100644
--- a/games/quake2-3zb2/files/pkg-message.in
+++ b/games/quake2-3zb2/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 3rd Zigock II bots has been installed.
 
 Due to the fact that game library (i.e. game.so file) is unable to read the
@@ -21,5 +22,6 @@ Then run it from the recently created directory.
 See the docs in %%DOCSDIR%% for help on using it.
 
 Check the website for additional DM and CTF maps (respective routes section).
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/quake2-data/files/pkg-message.in b/games/quake2-data/files/pkg-message.in
index 8ac023de5318..844a9315b3b9 100644
--- a/games/quake2-data/files/pkg-message.in
+++ b/games/quake2-data/files/pkg-message.in
@@ -1,7 +1,9 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port you need to copy the file
 "baseq2/pak0.pak" from the original Quake II distribution to
 %%DATADIR%%/baseq2.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/quake2-rogue/files/pkg-message.in b/games/quake2-rogue/files/pkg-message.in
index 0fd45f29bd41..1d9173c42ef9 100644
--- a/games/quake2-rogue/files/pkg-message.in
+++ b/games/quake2-rogue/files/pkg-message.in
@@ -1,8 +1,10 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port you need to copy the file
 "rogue/pak0.pak" and the directory "rogue/video" with its contents from the
 original Quake II: Ground Zero (Rogue) mission pack distribution to
 %%Q2DIR%%/rogue.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/quake2-xatrix/files/pkg-message.in b/games/quake2-xatrix/files/pkg-message.in
index be69efac89d0..9fd297f097b8 100644
--- a/games/quake2-xatrix/files/pkg-message.in
+++ b/games/quake2-xatrix/files/pkg-message.in
@@ -1,8 +1,10 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port you need to copy the file
 "xatrix/pak0.pak" and the directory "xatrix/video" with its contents from
 the original Quake II: The Reckoning (Xatrix) mission pack distribution to
 %%Q2DIR%%/xatrix.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/quake3-data/files/pkg-message.in b/games/quake3-data/files/pkg-message.in
index 1db0fbde4142..8a3fc6887a3a 100644
--- a/games/quake3-data/files/pkg-message.in
+++ b/games/quake3-data/files/pkg-message.in
@@ -1,5 +1,6 @@
-====================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete the installation of this port you need to copy the file
 "baseq3/pak0.pk3" from the original Quake III Arena distribution to
 %%DATADIR%%/baseq3.
@@ -7,5 +8,6 @@ To complete the installation of this port you need to copy the file
 If you have the expansion pack then you have to copy the file
 "missionpack/pak0.pk3" from the original Quake III Team Arena
 distribution to %%DATADIR%%/missionpack.
-
-====================================================================
+EOM
+}
+]
diff --git a/games/quakeforge/files/pkg-message.in b/games/quakeforge/files/pkg-message.in
index 8e751bd5f5ff..e42eae1ec293 100644
--- a/games/quakeforge/files/pkg-message.in
+++ b/games/quakeforge/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 QuakeForge has been installed.
 
 If you have sound problems try increasing the sound rate. This can be done
@@ -12,5 +13,6 @@ nq-glx +set snd_speed 44100
 Alternatively you can put it in the global configuration file (as root):
 
 echo "set snd_speed 44100" >> %%PREFIX%%/etc/quakeforge.conf
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/reminiscence/files/pkg-message.in b/games/reminiscence/files/pkg-message.in
index 1c59a3989deb..d77eaa289a35 100644
--- a/games/reminiscence/files/pkg-message.in
+++ b/games/reminiscence/files/pkg-message.in
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 REminiscence requires original Flashback datafiles. Copy the following
 files to %%PREFIX%%/share/REminiscence/data/ directory:
 
@@ -14,5 +15,6 @@ If you have a version distributed by SSI, you'll have to rename some files :
   menu1ssi.pal -> menu1.pal
 
 See README for details
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/retroarch/files/pkg-message.in b/games/retroarch/files/pkg-message.in
index ff92753e00c1..f41fc7d73526 100644
--- a/games/retroarch/files/pkg-message.in
+++ b/games/retroarch/files/pkg-message.in
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed RetroArch: libretro-based entertainment platform.
 
 RetroArch is the lowest tier of the entertainment platform. The middle
@@ -9,4 +11,6 @@ You can run the stack with this command:
 $ retroarch -L some-core-libretro.so some-game.game
 
 Enjoy!
-======================================================================
+EOM
+}
+]
diff --git a/games/rnd_jue/files/pkg-message.in b/games/rnd_jue/files/pkg-message.in
index 892293fa5a24..2f0414132d58 100644
--- a/games/rnd_jue/files/pkg-message.in
+++ b/games/rnd_jue/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 R'n'D jue has been installed.
 
 R'n'D jue can use some Rocks'n'Diamonds levels.
@@ -7,5 +8,6 @@ R'n'D jue can use some Rocks'n'Diamonds levels.
 You can install Port Rocks'n'Diamonds data 'games/rocksndiamonds-data'.
 
 Rocks'n'Diamonds data can use Rocks'n'Diamonds and R'n'D jue.
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/robocode-naval/files/pkg-message.in b/games/robocode-naval/files/pkg-message.in
index dac7c5726f5f..8d19243f6475 100644
--- a/games/robocode-naval/files/pkg-message.in
+++ b/games/robocode-naval/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Naval Robocode has been installed.
 
 Naval Robocode requires a java compiler. By default Naval Robocode will
@@ -12,5 +13,6 @@ You can override this in the Naval Robocode compiler preferences menu:
 Attention not all with Rumble games works, this is work in Progress.
 
 Have fun!
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/robocode/files/pkg-message.in b/games/robocode/files/pkg-message.in
index a335633ebb9f..2e2deb1b920c 100644
--- a/games/robocode/files/pkg-message.in
+++ b/games/robocode/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Robocode has been installed.
 
 Robocode requires a java compiler. By default Robocode will look for
@@ -13,5 +14,6 @@ You can override this in the Robocode compiler preferences menu:
 Attention not all with Rumble games works, this is work in Progress.
 
 Have fun!
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/rocksndiamonds-data/files/pkg-message.in b/games/rocksndiamonds-data/files/pkg-message.in
index d968fc4c559b..7c79c1487e7c 100644
--- a/games/rocksndiamonds-data/files/pkg-message.in
+++ b/games/rocksndiamonds-data/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Rocks'n'Diamonds data has been installed.
 
 These levels can use Rocks'n'Diamonds and R'n'D jue.
@@ -32,5 +33,6 @@ If you wish can delete them with
 
     /bin/rm -fr %%PREFIX%%/share/rocksndiamonds
     /bin/rm -fr %%PREFIX%%/share/rnd_jue
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/rocksndiamonds/files/pkg-message.in b/games/rocksndiamonds/files/pkg-message.in
index 23f77ab104bc..e0bcb94bc3f8 100644
--- a/games/rocksndiamonds/files/pkg-message.in
+++ b/games/rocksndiamonds/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Rocks'n'Diamonds has been installed.
 
 Rocks'n'Diamonds can use some R'n'D jue levels.
@@ -7,5 +8,6 @@ Rocks'n'Diamonds can use some R'n'D jue levels.
 You can install Port Rocks'n'Diamonds data 'games/rocksndiamonds-data'.
 
 Rocks'n'Diamonds data can use Rocks'n'Diamonds and R'n'D jue.
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/rottdc/pkg-message b/games/rottdc/pkg-message
index c3e111ade5bc..1a856d747aa5 100644
--- a/games/rottdc/pkg-message
+++ b/games/rottdc/pkg-message
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Rise of the Triad DC has been installed.
 
 There are two binaries: "rott" and "rott-sw", to play the full and shareware
@@ -7,5 +8,6 @@ versions respectively. The game data must reside in the current directory.
 
 The shareware game data is available here:
 http://filesingularity.timedoctor.org/swdata.zip
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/rubygem-vimgolf/pkg-message b/games/rubygem-vimgolf/pkg-message
index 6997b36853d2..ff99ef679281 100644
--- a/games/rubygem-vimgolf/pkg-message
+++ b/games/rubygem-vimgolf/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Run 'vimgolf setup' to start playing
+EOM
+}
+]
diff --git a/games/sampsvr/files/pkg-message.in b/games/sampsvr/files/pkg-message.in
index b91a9084efd2..c3f4290a4d44 100644
--- a/games/sampsvr/files/pkg-message.in
+++ b/games/sampsvr/files/pkg-message.in
@@ -1,5 +1,9 @@
-***********************************************************************
+[
+{ type: install
+  message: <<EOM
 Edit %%PREFIX%%/etc/sampsvr.cfg before using
 Your password must be changed from the default password
 Read %%DOCSDIR%%/README to configure SA-MP Server
-***********************************************************************
+EOM
+}
+]
diff --git a/games/sauerbraten/files/pkg-message.in b/games/sauerbraten/files/pkg-message.in
index b65b1660f1f5..aad6e4834e47 100644
--- a/games/sauerbraten/files/pkg-message.in
+++ b/games/sauerbraten/files/pkg-message.in
@@ -1,10 +1,12 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 1) Config files are in the ~/.sauerbraten directory.
 2) If you want add new bindings into ~/.sauerbraten/config.cfg, see
 
    %%DATADIR%%/data/keymap.cfg.
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/scourge/files/pkg-message.in b/games/scourge/files/pkg-message.in
index 620f59988593..dfd84c46b38c 100644
--- a/games/scourge/files/pkg-message.in
+++ b/games/scourge/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 S.C.O.U.R.G.E was installed
 
 1) You can run the scourge, using:
@@ -11,5 +12,6 @@ S.C.O.U.R.G.E was installed
    # scourge -help
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/sex/pkg-message b/games/sex/pkg-message
index ebe80eced9f0..ec46716b33a5 100644
--- a/games/sex/pkg-message
+++ b/games/sex/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Be advised:
 ===========
 
 The output of this program is of a sexually explicit nature and may
 offend some viewers.
 
+EOM
+}
+]
diff --git a/games/slashem-tty/pkg-message b/games/slashem-tty/pkg-message
index 06dee7137ace..404faae03cd7 100644
--- a/games/slashem-tty/pkg-message
+++ b/games/slashem-tty/pkg-message
@@ -1,8 +1,12 @@
-====================================================
+[
+{ type: install
+  message: <<EOM
 A sample .slashemrc file has been copied to
 ${PREFIX}/share/doc/slashem as sample.slashemrc.
 Copy it to your home directory as .slashemrc and
 edit it to taste.
 The options for it are described in
 ${PREFIX}/share/doc/slashem/Guidebook.txt.
-====================================================
+EOM
+}
+]
diff --git a/games/spring/pkg-message b/games/spring/pkg-message
index f6ff7cb5c848..3dbd2a7cc4cb 100644
--- a/games/spring/pkg-message
+++ b/games/spring/pkg-message
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To finalize installation of Spring, you need to get at least one
 map and at least one mod, and place those into your ~/.spring. Also,
 if you wish to play mods based on Total Annihilation, you'll need
@@ -11,5 +12,6 @@ For further instructions, see:
 
 Alternatively, you can use games/springlobby port which allows you
 to download maps and setup single- and multiplayer games.
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/stratagus/pkg-message b/games/stratagus/pkg-message
index f7802044232e..24330fad15cf 100644
--- a/games/stratagus/pkg-message
+++ b/games/stratagus/pkg-message
@@ -1,5 +1,6 @@
-------------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 NOTE: This is only the engine. If you wish to play a game that uses the
 Stratagus engine, you must manually download the Stratagus game data.
 
@@ -12,5 +13,6 @@ For more information, please take a look at the following URL:
 http://stratagus.sourceforge.net/games.shtml
 
 Enjoy!
-
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/games/tenebrae/pkg-message b/games/tenebrae/pkg-message
index 7a6aaac3056f..81fd54bd4220 100644
--- a/games/tenebrae/pkg-message
+++ b/games/tenebrae/pkg-message
@@ -1,5 +1,6 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Tenebrae has been installed.
 
 If you're having sound problems, try running it with parameter "-sndspeed
@@ -7,5 +8,6 @@ If you're having sound problems, try running it with parameter "-sndspeed
 
 If you're having water rendering problems, try setting variable "r_novis"
 to "1" (one).
-
-==========================================================================
+EOM
+}
+]
diff --git a/games/tetrinet-x/files/pkg-message.in b/games/tetrinet-x/files/pkg-message.in
index bb7b17e7b582..6ebb6aed8a86 100644
--- a/games/tetrinet-x/files/pkg-message.in
+++ b/games/tetrinet-x/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 A startup script for the Tetrinet server has been installed in
 %%PREFIX%%/etc/rc.d/tetrinetx.
 
 Please modify configuration files located in %%DATADIR%%
 before attempting to run Tetrinet server.
+EOM
+}
+]
diff --git a/games/tetrinet/pkg-message b/games/tetrinet/pkg-message
index ad7dd30f80c4..0f74cd920ad9 100644
--- a/games/tetrinet/pkg-message
+++ b/games/tetrinet/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 You must be using at least a 50-line text display to run this version of
 Tetrinet. This is made by either typing 'vidcontrol 80x50' before
 you start tetrinet, or by adding 'allscreens_flags="80x50"' to /etc/rc.conf.
+EOM
+}
+]
diff --git a/games/tome4/files/pkg-message.in b/games/tome4/files/pkg-message.in
index 9dcf1b20f7d7..02f7ad78c44c 100644
--- a/games/tome4/files/pkg-message.in
+++ b/games/tome4/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 The game files for ToME can be found in %%DATADIR%%.
 Launch the game with a wrapper in %%PREFIX%%/tome4
 
 Addons and expansions can be installed per user:
  $ mkdir -p ~/.t-engine/4.0/addons
  $ cp my-addon.teaac ~/.t-engine/4.0/addons/
+EOM
+}
+]
diff --git a/games/tomenet/files/pkg-message.in b/games/tomenet/files/pkg-message.in
index fb026bf8d7bb..b231389ba74b 100644
--- a/games/tomenet/files/pkg-message.in
+++ b/games/tomenet/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To complete your installation of TomeNET, you should create a
 configuration file to suit your needs:
 
@@ -14,5 +15,6 @@ If installed, extensive documentation can be found in
 otherwise the guide is available online at:
 
 http://www.tomenet.eu/guide.php
-
-========================================================================
+EOM
+}
+]
diff --git a/games/traingame/files/pkg-message.in b/games/traingame/files/pkg-message.in
index 09a5de6bfbc4..a3c7378529e9 100644
--- a/games/traingame/files/pkg-message.in
+++ b/games/traingame/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Train Game has been installed.
 
 Now you can play the game by running:
@@ -14,5 +15,6 @@ or manually with
 To use the editor, run:
 
      %%PREFIX%%/bin/traingame edit <map_name_here>
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/tremulous/pkg-message b/games/tremulous/pkg-message
index 8d68c3292add..f8115baff8a7 100644
--- a/games/tremulous/pkg-message
+++ b/games/tremulous/pkg-message
@@ -1,10 +1,12 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you have sound problems with SDL try setting the variable "s_sdlSpeed" to
 "44100".  It will be saved to the configuration file.
 
 If you have sound problems with OpenAL recompile without it.  Also the OPENAL
 option causes the program to omit restoring gamma and mouse sensitivity after
 exiting.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/tuxfighter/files/pkg-message.in b/games/tuxfighter/files/pkg-message.in
index 11c42127c3dc..f46cbb5fb9d9 100644
--- a/games/tuxfighter/files/pkg-message.in
+++ b/games/tuxfighter/files/pkg-message.in
@@ -1,5 +1,6 @@
-========================================================================
-
+[
+{ type: install
+  message: <<EOM
 Tuxfighter has been installed.
 
 Python errors will result in the first run of this game.
@@ -9,5 +10,6 @@ This issue is currently being resolved with upstream developers.
 
 All options are in the config file if you've made changes in the GUI.
     ~/.TuxFighter/TuxFighter.ini
-
-========================================================================
+EOM
+}
+]
diff --git a/games/twitch/files/pkg-message.in b/games/twitch/files/pkg-message.in
index 67b7d8887f46..5d7b95884284 100644
--- a/games/twitch/files/pkg-message.in
+++ b/games/twitch/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Twitch has been installed.
 
 All options are given only in the command line
@@ -16,5 +17,6 @@ Or can use desktop file
 
 
 Have fun!
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/ufoai/files/pkg-message.in b/games/ufoai/files/pkg-message.in
index 3f240a85f950..7b6d724c76c3 100644
--- a/games/ufoai/files/pkg-message.in
+++ b/games/ufoai/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The UFO ALien Invasion was installed
 
 1) Run the UFO Client using:
@@ -22,5 +23,6 @@ The UFO ALien Invasion was installed
    avoids some problems during the game.
 
 6) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/games/uhexen2/files/pkg-message.in b/games/uhexen2/files/pkg-message.in
index eeea10d2b404..30184b4ce641 100644
--- a/games/uhexen2/files/pkg-message.in
+++ b/games/uhexen2/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Hexen II: Hammer of Thyrion has been installed.
 
 To complete the installation of this port you have to copy the original
@@ -8,5 +9,6 @@ To complete the installation of this port you have to copy the original
 
 Then see the documentation about patching the data files in
 "%%DOCSDIR%%". The update files are installed.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/umark/files/pkg-message.in b/games/umark/files/pkg-message.in
index f9ef92d55e73..8ebe658623d7 100644
--- a/games/umark/files/pkg-message.in
+++ b/games/umark/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Before running this software, you need to configure it first.  This is best
 to be done with `install_umark_data.sh' script, which is installed here:
 
@@ -17,3 +20,6 @@ If one of the lines says "n/a|n/a", it means that `install_umark_data.sh'
 did not find where the respective version of the game is installed.  In this
 case, you should manually enter the game build number and root installation
 path.
+EOM
+}
+]
diff --git a/games/unnethack/pkg-message b/games/unnethack/pkg-message
index d5d94374fc53..8261d3d44b86 100644
--- a/games/unnethack/pkg-message
+++ b/games/unnethack/pkg-message
@@ -1,8 +1,12 @@
-====================================================
+[
+{ type: install
+  message: <<EOM
 A sample .unnethackrc file has been copied to
 ${PREFIX}/share/doc/unnethack as sample.unnethackrc.
 Copy it to your home directory as .unnethackrc and
 edit it to taste.
 The options for it are described in
 ${PREFIX}/share/doc/unnethack/Guidebook.txt.
-====================================================
+EOM
+}
+]
diff --git a/games/vavoom/files/pkg-message.in b/games/vavoom/files/pkg-message.in
index 0106dd7266b4..0929266d439d 100644
--- a/games/vavoom/files/pkg-message.in
+++ b/games/vavoom/files/pkg-message.in
@@ -1,5 +1,6 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Vavoom has been installed.
 
 There are 2 wrapper scripts: "vavoom" and "vavoom-dedicated", calling the real
@@ -18,5 +19,6 @@ Refer to %%DOCSDIR%%/vavoom.txt for other options such as
 game selection, network options and so on.
 
 If you enabled LAUNCHER (build option), run "vlaunch" for a launcher GUI.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/vegastrike/pkg-message b/games/vegastrike/pkg-message
index d64ad2328e40..67fa0b523fa0 100644
--- a/games/vegastrike/pkg-message
+++ b/games/vegastrike/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Vega Strike is now installed.
 
 Please run `vssetup` before running the game to tune game settings.
+EOM
+}
+]
diff --git a/games/voadi/pkg-message b/games/voadi/pkg-message
index 43ae0d6ed0cd..2c07e05828f2 100644
--- a/games/voadi/pkg-message
+++ b/games/voadi/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Please keep in mind that Vegan on a Desert Island is a work in
 progress, so the store is not yet complete, and also savegames
 may be incompatible with future game releases.
+EOM
+}
+]
diff --git a/games/wargus/files/pkg-message.in b/games/wargus/files/pkg-message.in
index 52a308ac0ebc..7e36faa83b7a 100644
--- a/games/wargus/files/pkg-message.in
+++ b/games/wargus/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 The Wargus tool has been installed to "%%PREFIX%%/bin/wartool".
 
 You can now use this tool to extract Warcraft 2 data for use with the
@@ -26,5 +27,6 @@ After your Warcraft 2 data has been successfully extracted, run 'wargus' as
 the user you intend to play the game with.
 
 For more information, please visit: http://wargus.sourceforge.net/
-
-------------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/games/wesnoth/pkg-message b/games/wesnoth/pkg-message
index 6aa0cecd7b77..a547ca566d92 100644
--- a/games/wesnoth/pkg-message
+++ b/games/wesnoth/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Wesnoth assumes an UTF-8 charset by default. Using another charset
 will result in a crash. To avoid this situation set the charset
 before starting wesnoth:
 
 env LANG=en_US.UTF-8 wesnoth
+EOM
+}
+]
diff --git a/games/wmshuffle/pkg-message b/games/wmshuffle/pkg-message
index 4239e967e588..5fa10d11060b 100644
--- a/games/wmshuffle/pkg-message
+++ b/games/wmshuffle/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Run 'wmshuffle --help' for the available options
+EOM
+}
+]
diff --git a/games/wolfpack/files/pkg-message.in b/games/wolfpack/files/pkg-message.in
index 1058a2b75678..aeea37ccbe4b 100644
--- a/games/wolfpack/files/pkg-message.in
+++ b/games/wolfpack/files/pkg-message.in
@@ -1,2 +1,8 @@
- [!]  Please read the documentation in %%DATADIR%%/README
- [!]  about configuring the server and creating a world.
+[
+{ type: install
+  message: <<EOM
+   Please read the documentation in %%DATADIR%%/README
+   about configuring the server and creating a world.
+EOM
+}
+]
diff --git a/games/worldofpadman/pkg-message b/games/worldofpadman/pkg-message
index 8d68c3292add..f8115baff8a7 100644
--- a/games/worldofpadman/pkg-message
+++ b/games/worldofpadman/pkg-message
@@ -1,10 +1,12 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 If you have sound problems with SDL try setting the variable "s_sdlSpeed" to
 "44100".  It will be saved to the configuration file.
 
 If you have sound problems with OpenAL recompile without it.  Also the OPENAL
 option causes the program to omit restoring gamma and mouse sensitivity after
 exiting.
-
-==============================================================================
+EOM
+}
+]
diff --git a/games/xjump/pkg-message b/games/xjump/pkg-message
index e01065d362a9..e190b7546404 100644
--- a/games/xjump/pkg-message
+++ b/games/xjump/pkg-message
@@ -1,5 +1,6 @@
-
----  NOTICE ---
+[
+{ type: install
+  message: <<EOM
 xjump is set to use /var/games/xjump.record for its scorekeeping.
 However, due to security concerns, xjump is not installed setgid
 games, and thus cannot write this file.  In order to enable keeping
@@ -12,3 +13,6 @@ scores, you will need to run these commands:
 where ${PREFIX} is the prefix that xjump was installed under,
 which is usually /usr/X11R6.
 
+EOM
+}
+]
diff --git a/games/xjumpx/files/pkg-message.in b/games/xjumpx/files/pkg-message.in
index 519a7b1aaf03..18b9e5c17bc7 100644
--- a/games/xjumpx/files/pkg-message.in
+++ b/games/xjumpx/files/pkg-message.in
@@ -1,4 +1,6 @@
----  NOTICE ---
+[
+{ type: install
+  message: <<EOM
 Original xjumpx is setgid games to protect scorefiles.
 However, due to security concerns, xjumpx is not installed setgid games,
 so everybody can change scorefiles.
@@ -7,3 +9,6 @@ In order to protect scorefiles, you will need to run these commands:
 	chgrp games %%PREFIX%%/bin/xjumpx %%PREFIX%%/lib/X11/xjumpx
 	chmod g+s %%PREFIX%%/bin/xjumpx
 	chmod 770 %%PREFIX%%/lib/X11/xjumpx
+EOM
+}
+]
diff --git a/games/xonotic/pkg-message b/games/xonotic/pkg-message
index 433e827ee8b2..6fc124d27e87 100644
--- a/games/xonotic/pkg-message
+++ b/games/xonotic/pkg-message
@@ -1,9 +1,11 @@
---------------------
-
+[
+{ type: install
+  message: <<EOM
 Xonotic has now been installed. If you installed the server, you can
 configure it by running /usr/local/bin/xonotic-dedicated, which will
 generate a .xonotic folder in the current user's home folder. Then, copy
 /usr/local/share/xonotic/server/server.cfg to .xonotic/data/server.cfg.
 You may additionally be interested in copying help.cfg.
-
----------------------
+EOM
+}
+]
diff --git a/games/xye/files/pkg-message.in b/games/xye/files/pkg-message.in
index 0668330479c6..0cbc23dcd5a9 100644
--- a/games/xye/files/pkg-message.in
+++ b/games/xye/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Xye has been installed.
 
 Xye can use Kye and Sokoban levels.
@@ -27,5 +28,6 @@ In addition, you can use skins
 and other Sites and put it in:
 
     ~/.xye/res
-
-===============================================================================
+EOM
+}
+]
diff --git a/games/yadex/files/pkg-message.in b/games/yadex/files/pkg-message.in
index dc2cae997d63..5f4e0a8cacd4 100644
--- a/games/yadex/files/pkg-message.in
+++ b/games/yadex/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
   Yadex is now installed.
 
   Before you run it, enter the paths to your IWADs in
@@ -6,3 +9,6 @@
   If you're confused, take a look at %%DOCSDIR%%/index.html.
 
   Happy editing!
+EOM
+}
+]
diff --git a/games/zangband/files/pkg-message.in b/games/zangband/files/pkg-message.in
index fdc6faa71449..2d165740f581 100644
--- a/games/zangband/files/pkg-message.in
+++ b/games/zangband/files/pkg-message.in
@@ -1,4 +1,6 @@
- ============================================================================
+[
+{ type: install
+  message: <<EOM
  To reduce the number of term windows opened, use -n:
    %%PREFIX%%/%%ANGBANDBIN%% -- -n2
 
@@ -11,4 +13,6 @@
  You now have the following world-writable (mode 1777) directories:
    %%PREFIX%%/%%ANGBANDLIB%%/save
    %%PREFIX%%/%%ANGBANDLIB%%/user
- ============================================================================
+EOM
+}
+]
diff --git a/german/BBBike/pkg-message b/german/BBBike/pkg-message
index b71cda8b2466..a00817a5e1a9 100644
--- a/german/BBBike/pkg-message
+++ b/german/BBBike/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 BBBike
 ------
 
 Zusätzliche Anpassung für KDE mit
 
     ${PREFIX}/BBBike/install.pl
+EOM
+}
+]
diff --git a/german/bugzilla44/pkg-message b/german/bugzilla44/pkg-message
index 85bfbab9ec7b..b9286a224aeb 100644
--- a/german/bugzilla44/pkg-message
+++ b/german/bugzilla44/pkg-message
@@ -1,5 +1,9 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
   German localization for Bugzilla has now been installed.
 
   Please run "checksetup.pl" to re-generate templates.
-==========================================================================
+EOM
+}
+]
diff --git a/german/wordpress/files/pkg-message.in b/german/wordpress/files/pkg-message.in
index 11afe3fec699..a3d0617e38e0 100644
--- a/german/wordpress/files/pkg-message.in
+++ b/german/wordpress/files/pkg-message.in
@@ -1,6 +1,11 @@
-                  **** NOTE ****
+[
+{ type: install
+  message: <<EOM
 Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
 in %%WWWDIR%% and modify it to fit your MySQL.
 Maybe you need 'mysqladmin create wordpress' first.
 If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
 http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
+EOM
+}
+]
diff --git a/graphics/aoi/files/pkg-message.in b/graphics/aoi/files/pkg-message.in
index f0941cc4e3b7..f7c41e5efb9e 100644
--- a/graphics/aoi/files/pkg-message.in
+++ b/graphics/aoi/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Art of Illusion has been installed.
 
 This package does not include all Plugins and Scripts.
@@ -17,5 +18,6 @@ and other Sites and put it in:
 
     %%DATADIR%%/Plugins
     %%DATADIR%%/Scripts/...
-
-===============================================================================
+EOM
+}
+]
diff --git a/graphics/aseprite/pkg-message b/graphics/aseprite/pkg-message
index f3e1bc6fcd6c..98b8acbcd09d 100644
--- a/graphics/aseprite/pkg-message
+++ b/graphics/aseprite/pkg-message
@@ -1,7 +1,11 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 Some users have reported mouse lag problem with aseprite.
 
 Please add the argument -F 250 or -F 500 for moused(8) to work around
 such problems. These options  can be added in the  variable
 moused_flags in /etc/rc.conf
-======================================================================
+EOM
+}
+]
diff --git a/graphics/blender-doc/files/pkg-message.in b/graphics/blender-doc/files/pkg-message.in
index 2e8b6fab1ed4..a7253b3b9c27 100644
--- a/graphics/blender-doc/files/pkg-message.in
+++ b/graphics/blender-doc/files/pkg-message.in
@@ -1,6 +1,8 @@
-###########################################################
-
+[
+{ type: install
+  message: <<EOM
 You can start browsing documentation here:
 %%DOCSDIR%%/htmlI/index.html
-
-###########################################################
+EOM
+}
+]
diff --git a/graphics/deegree-csw/files/pkg-message.in b/graphics/deegree-csw/files/pkg-message.in
index 86538ba4a3c9..39209b7ee5d2 100644
--- a/graphics/deegree-csw/files/pkg-message.in
+++ b/graphics/deegree-csw/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-csw
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/deegree-igeoportal/files/pkg-message.in b/graphics/deegree-igeoportal/files/pkg-message.in
index c2555f83df04..25e140b4374c 100644
--- a/graphics/deegree-igeoportal/files/pkg-message.in
+++ b/graphics/deegree-igeoportal/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-igeoportal
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/deegree-wcs/files/pkg-message.in b/graphics/deegree-wcs/files/pkg-message.in
index 45764bcf9961..78bc72f7846b 100644
--- a/graphics/deegree-wcs/files/pkg-message.in
+++ b/graphics/deegree-wcs/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-wcs
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/deegree-wfs/files/pkg-message.in b/graphics/deegree-wfs/files/pkg-message.in
index e322d5843ff5..ac73362eb651 100644
--- a/graphics/deegree-wfs/files/pkg-message.in
+++ b/graphics/deegree-wfs/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-wfs
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/deegree-wms/files/pkg-message.in b/graphics/deegree-wms/files/pkg-message.in
index 767b60b31330..a8193aa6391a 100644
--- a/graphics/deegree-wms/files/pkg-message.in
+++ b/graphics/deegree-wms/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-wms
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/deegree-wps/files/pkg-message.in b/graphics/deegree-wps/files/pkg-message.in
index 91b6e72ec672..ad83b7dd8425 100644
--- a/graphics/deegree-wps/files/pkg-message.in
+++ b/graphics/deegree-wps/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-wps
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/deegree-wpvs/files/pkg-message.in b/graphics/deegree-wpvs/files/pkg-message.in
index 5416450f4fda..6983ab3f6052 100644
--- a/graphics/deegree-wpvs/files/pkg-message.in
+++ b/graphics/deegree-wpvs/files/pkg-message.in
@@ -1,4 +1,6 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 To start DeeGree correctly, please set the variable JAVA_OPTS with:
 
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
@@ -7,4 +9,6 @@ Now you should start your Tomcat server and browse with:
    http://your-server:%%TCPORT%%/deegree-wpvs
 
 Enjoy it !
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/drm-current-kmod/pkg-message b/graphics/drm-current-kmod/pkg-message
index 7e446f6b7abf..4a315dcf3fc0 100644
--- a/graphics/drm-current-kmod/pkg-message
+++ b/graphics/drm-current-kmod/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The experimental drm-current-kmod port can be enabled for amdgpu (for AMD
 GPUs starting with the HD7000 series / Tahiti) or i915kms (for Intel
 APUs starting with HD3000 / Sandy Bridge) through kld_list in
@@ -13,3 +16,6 @@ Please ensure that all users requiring graphics are members of the
 
 Older generations are supported by the legacy kms modules (radeonkms / 
 i915kms) in base or by installing graphics/drm-legacy-kmod.
+EOM
+}
+]
diff --git a/graphics/drm-devel-kmod/pkg-message b/graphics/drm-devel-kmod/pkg-message
index 509efb8b61d0..04e639ba68f5 100644
--- a/graphics/drm-devel-kmod/pkg-message
+++ b/graphics/drm-devel-kmod/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The experimental drm-devel-kmod port can be enabled for amdgpu (for AMD
 GPUs starting with the HD7000 series / Tahiti), radeonkms for older AMD GPUs
 or i915kms (for Intel APUs starting with HD3000 / Sandy Bridge, possibly even
@@ -17,3 +20,6 @@ Please ensure that all users requiring graphics are members of the
 
 Older generations are supported by the legacy kms modules by installing
 graphics/drm-legacy-kmod.
+EOM
+}
+]
diff --git a/graphics/drm-fbsd11.2-kmod/pkg-message b/graphics/drm-fbsd11.2-kmod/pkg-message
index 8b20db234f08..9ffa33a92063 100644
--- a/graphics/drm-fbsd11.2-kmod/pkg-message
+++ b/graphics/drm-fbsd11.2-kmod/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The drm-fbsd11.2-kmod port can be enabled for amdgpu (for AMD GPUs starting
 with the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
 HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf. radeonkms for older
@@ -13,3 +16,6 @@ Please ensure that all users requiring graphics are members of the
 
 Older generations are supported by the legacy kms modules (radeonkms / 
 i915kms) in base or by installing graphics/drm-legacy-kmod.
+EOM
+}
+]
diff --git a/graphics/drm-fbsd12.0-kmod/pkg-message b/graphics/drm-fbsd12.0-kmod/pkg-message
index 589d0fadb211..78212176161b 100644
--- a/graphics/drm-fbsd12.0-kmod/pkg-message
+++ b/graphics/drm-fbsd12.0-kmod/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The drm-fbsd12.0-kmod port can be enabled for amdgpu (for AMD GPUs starting
 with the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
 HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf. radeonkms for older
@@ -13,3 +16,6 @@ Please ensure that all users requiring graphics are members of the
 
 Older generations are supported by the legacy kms modules (radeonkms / 
 i915kms) in base or by installing graphics/drm-legacy-kmod.
+EOM
+}
+]
diff --git a/graphics/drm-legacy-kmod/pkg-message b/graphics/drm-legacy-kmod/pkg-message
index 52d647bafa16..f737e5c61c16 100644
--- a/graphics/drm-legacy-kmod/pkg-message
+++ b/graphics/drm-legacy-kmod/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The drm-legacy-kmod port can be enabled for older Intel and ATI/AMD graphics
 adapters as well as legacy graphics adapters through kld_list in /etc/rc.conf.
 
@@ -10,3 +13,6 @@ Please ensure that all users requiring graphics are members of the
 
 If you are having trouble with ATI/AMD graphics cards and X, try installing
 xf86-video-ati-legacy instead of xf86-video-ati.
+EOM
+}
+]
diff --git a/graphics/entangle/pkg-message b/graphics/entangle/pkg-message
index c71dacc7ee04..27c714f6e7a4 100644
--- a/graphics/entangle/pkg-message
+++ b/graphics/entangle/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 To be able to access camera under normal user, you might want to add the
 following line:
 
 	add path 'usb/*' mode 0660
 
 to your local devfs.rules(5) configuration.
+EOM
+}
+]
diff --git a/graphics/freeglut/pkg-message b/graphics/freeglut/pkg-message
index 1e73804f97b9..9d5597e10241 100644
--- a/graphics/freeglut/pkg-message
+++ b/graphics/freeglut/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Joystick support is untested and it is unknown if it works.
 
 Do not hesitate to contact x11@FreeBSD.org if this causes issues.
+EOM
+}
+]
diff --git a/graphics/geoserver/files/pkg-message.in b/graphics/geoserver/files/pkg-message.in
index 185191208c94..a749e0c6d614 100644
--- a/graphics/geoserver/files/pkg-message.in
+++ b/graphics/geoserver/files/pkg-message.in
@@ -1,6 +1,6 @@
-Post-install of GeoServer
-=========================
-
+[
+{ type: install
+  message: <<EOM
 To run geoserver at startup, add
   geoserver_enable="YES"
 in you /etc/rc.conf .
@@ -15,3 +15,6 @@ On your client machine, open the browser with:
 to configure the GIS server.
 
 Enjoy it!
+EOM
+}
+]
diff --git a/graphics/giftool/pkg-message b/graphics/giftool/pkg-message
index b87eb7c7d2dc..392b7ee94cf1 100644
--- a/graphics/giftool/pkg-message
+++ b/graphics/giftool/pkg-message
@@ -1,9 +1,13 @@
-
-** GIFTOOL is shareware for PERSONAL USE only.  You may use GIFTOOL for
-** your own amusement, and if you find it nifty, useful, generally cool,
-** or of some value to you, your non-deductable donation would be greatly
-** appreciated.  $10 is the suggested donation, though, of course,
-** larger donations are quite welcome.
+[
+{ type: install
+  message: <<EOM
+ GIFTOOL is shareware for PERSONAL USE only.  You may use GIFTOOL for
+ your own amusement, and if you find it nifty, useful, generally cool,
+ or of some value to you, your non-deductable donation would be greatly
+ appreciated.  $10 is the suggested donation, though, of course,
+ larger donations are quite welcome.
 
 Type 'giftool -help' for usage information.
-
+EOM
+}
+]
diff --git a/graphics/gimp-lqr-plugin/pkg-message b/graphics/gimp-lqr-plugin/pkg-message
index 0183c1417b71..1a38d636a294 100644
--- a/graphics/gimp-lqr-plugin/pkg-message
+++ b/graphics/gimp-lqr-plugin/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 After restarting the Gimp you should find the following new item
 in the menu:
 
  * Layer/Liquid rescale
+EOM
+}
+]
diff --git a/graphics/gimp-resynthesizer/pkg-message b/graphics/gimp-resynthesizer/pkg-message
index 38fd204493a3..b969857ba607 100644
--- a/graphics/gimp-resynthesizer/pkg-message
+++ b/graphics/gimp-resynthesizer/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 After restarting the Gimp you should find the following new items
 in the menu:
 
@@ -10,3 +13,6 @@ in the menu:
  * Filters/Map/Resynthesize
  * Filters/Map/Style
  * Filters/Render/Texture
+EOM
+}
+]
diff --git a/graphics/gimp/pkg-message b/graphics/gimp/pkg-message
index 7ff99254350f..e0124d72fb92 100644
--- a/graphics/gimp/pkg-message
+++ b/graphics/gimp/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Only the english gimp manual is supplied with this port. But other
 translations are available. Please use "pkg search gimp-help" or check
 the graphics/gimp-help meta port.
+EOM
+}
+]
diff --git a/graphics/gracula/files/pkg-message.in b/graphics/gracula/files/pkg-message.in
index 27a8a4f6a3a6..2a5ff1bec9c2 100644
--- a/graphics/gracula/files/pkg-message.in
+++ b/graphics/gracula/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
         Please read the file %%DOCSDIR%%/README
         to learn how to use Graphic Counter Language (if you haven't
 	installed WITHOUT=DOCS).
@@ -11,4 +13,6 @@
         Also, sample scripts and graphics are available from
         Count Gracula's Gallery,
         http://www.whizkidtech.redprince.net/gcl/gallery/
-
+EOM
+}
+]
diff --git a/graphics/instant-meshes/pkg-message b/graphics/instant-meshes/pkg-message
index 02eb83de8c76..2d7217c09c50 100644
--- a/graphics/instant-meshes/pkg-message
+++ b/graphics/instant-meshes/pkg-message
@@ -1,8 +1,12 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 You installed instant-meshes: interactive field-aligned mesh generator
 
 You can also download and unzip 'Datasets' using the link on this site:
 https://github.com/wjakob/instant-meshes
 
 You can open these datasets (*.ply files) in the application.
-======================================================================
+EOM
+}
+]
diff --git a/graphics/inventor/files/pkg-message.in b/graphics/inventor/files/pkg-message.in
index 0eb31adfcaf2..18eeff6fcb89 100644
--- a/graphics/inventor/files/pkg-message.in
+++ b/graphics/inventor/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-*******************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Please set the environment variable FL_FONT_PATH to the directory where your
 TrueType fonts are installed. If you do not set this variable, Open Inventor(TM)
 will use %%PREFIX%%/share/fonts/TTF as default.
@@ -18,6 +18,6 @@ font names if they are not available:
     # ln -s times.ttf Times-Roman
     # ln -s arial.ttf Helvetica
     # ln -s cour.ttf Utopia-Regular
-
-*******************************************************************************
-
+EOM
+}
+]
diff --git a/graphics/jave6/files/pkg-message.in b/graphics/jave6/files/pkg-message.in
index f41e50d88d50..cf3bd2765178 100644
--- a/graphics/jave6/files/pkg-message.in
+++ b/graphics/jave6/files/pkg-message.in
@@ -1,6 +1,8 @@
-=============================================================
-
+[
+{ type: install
+  message: <<EOM
 Errors may occur while running the program, as it will try to
 access %%DATADIR%%/tmp/ for output.
-
-=============================================================
+EOM
+}
+]
diff --git a/graphics/kix-kmod/files/pkg-message.in b/graphics/kix-kmod/files/pkg-message.in
index 66a8007a9b8f..d51f71dd4bc4 100644
--- a/graphics/kix-kmod/files/pkg-message.in
+++ b/graphics/kix-kmod/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 The qix_saver.ko module has been installed to %%PREFIX%%/lib. You
 may wish to add this to your kern.module_path sysctl string or copy it
 to another location.
 
 For best results, recompile your kernel with the VESA option.
-
+EOM
+}
+]
diff --git a/graphics/leptonica/pkg-message b/graphics/leptonica/pkg-message
index 6fbb780c16ff..1d25e7bcc534 100644
--- a/graphics/leptonica/pkg-message
+++ b/graphics/leptonica/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To use gplot (the optional programmatic interface to gnuplot),
 the math/gnuplot port must be installed.
+EOM
+}
+]
diff --git a/graphics/liblqr-1/files/pkg-message.in b/graphics/liblqr-1/files/pkg-message.in
index fbd3be954cad..7a0e243fa21c 100644
--- a/graphics/liblqr-1/files/pkg-message.in
+++ b/graphics/liblqr-1/files/pkg-message.in
@@ -1,5 +1,9 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
 NOTE: In order to compile examples for liblqr, you will
 also need pngwriter port (%%PORTSDIR%%/graphics/pngwriter).
 Examples are located in %%EXAMPLESDIR%%
-==========================================================================
+EOM
+}
+]
diff --git a/graphics/linux-c7-dri/pkg-message b/graphics/linux-c7-dri/pkg-message
index 4950cd833796..254b4f3f8f29 100644
--- a/graphics/linux-c7-dri/pkg-message
+++ b/graphics/linux-c7-dri/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 This package needs linsysfs mounted on /compat/linux/sys.  Add the
 following line to /etc/fstab:
 
 linsysfs    /compat/linux/sys	linsysfs	rw	0	0
 
 Then run "mount /compat/linux/sys".
+EOM
+}
+]
diff --git a/graphics/mapyrus/files/pkg-message.in b/graphics/mapyrus/files/pkg-message.in
index 4d41d677f4d3..167e355ed7e4 100644
--- a/graphics/mapyrus/files/pkg-message.in
+++ b/graphics/mapyrus/files/pkg-message.in
@@ -1,5 +1,6 @@
-****************************************************************
-
+[
+{ type: install
+  message: <<EOM
     Start Mapyrus from a terminal window with a command like:
 
 java -classpath %%DATADIR%%/%%MAPYRUSJAR%% org.mapyrus.Mapyrus myfile.mapyrus
@@ -10,5 +11,6 @@ java -classpath %%DATADIR%%/%%MAPYRUSJAR%% org.mapyrus.Mapyrus myfile.mapyrus
     or simply:
 
 mapyrus myfile.mapyrus
-
-****************************************************************
+EOM
+}
+]
diff --git a/graphics/opendx/files/pkg-message.in b/graphics/opendx/files/pkg-message.in
index a60be631967e..6c849c38855f 100644
--- a/graphics/opendx/files/pkg-message.in
+++ b/graphics/opendx/files/pkg-message.in
@@ -1,5 +1,6 @@
----------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 If you cannot connect to dxexec, try this:
 
 # Start the user interface by typing "dx -uionly &"
@@ -7,4 +8,6 @@ If you cannot connect to dxexec, try this:
 # Use the connect menu in the user interface to "Connect
 to server", click the Options button, and select connect
 to already running server.
-
+EOM
+}
+]
diff --git a/graphics/piglit/files/pkg-message.in b/graphics/piglit/files/pkg-message.in
index adddf3931bb3..ef2bc27a0824 100644
--- a/graphics/piglit/files/pkg-message.in
+++ b/graphics/piglit/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Piglit opens and closes a lot of files during a run, putting pressure
 on FreeBSD's VFS. To keep Piglit smooth, you will have to increase the
 default maxvnodes:
@@ -8,3 +11,6 @@ Instructions to use Piglit are available in:
 
 The same documentation is also available online:
   http://cgit.freedesktop.org/piglit/tree/README
+EOM
+}
+]
diff --git a/graphics/py-gvgen/pkg-message b/graphics/py-gvgen/pkg-message
index bb11785f4bb0..fdbe7e47404f 100644
--- a/graphics/py-gvgen/pkg-message
+++ b/graphics/py-gvgen/pkg-message
@@ -1,4 +1,6 @@
--------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 GvGen is installed.
 
 For a quick start:
@@ -9,4 +11,6 @@ Generate your graph require the graphics/graphviz port to be
 installed.
 
 Review the ChangeLog document in the documentation directory.
--------------------------------------------------------------
+EOM
+}
+]
diff --git a/graphics/qtawesome/pkg-message b/graphics/qtawesome/pkg-message
index 72e3797f1bb1..e82a683b1963 100644
--- a/graphics/qtawesome/pkg-message
+++ b/graphics/qtawesome/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 For the library to be useful, fontawesome-*.ttf must be known to
 fontconfig.
+EOM
+}
+]
diff --git a/graphics/rawtherapee/pkg-message b/graphics/rawtherapee/pkg-message
index 13771e9481b2..7f94bb1375b9 100644
--- a/graphics/rawtherapee/pkg-message
+++ b/graphics/rawtherapee/pkg-message
@@ -1,4 +1,6 @@
-=======================================================================
+[
+{ type: install
+  message: <<EOM
 DISK SPACE WARNING:
 
 Note that RawTherapee uses version-dependent cache and configuration
@@ -8,4 +10,6 @@ remove older cache directories.
 
 Also, after configurations have been moved to the new version's
 directory, older $HOME/.config/RawTherapee* directories may be removed.
-=======================================================================
+EOM
+}
+]
diff --git a/graphics/sane-backends/files/pkg-message.in b/graphics/sane-backends/files/pkg-message.in
index 29545707ed2a..077943c64a5c 100644
--- a/graphics/sane-backends/files/pkg-message.in
+++ b/graphics/sane-backends/files/pkg-message.in
@@ -1,5 +1,6 @@
-==================================================================
-
+[
+{ type: install
+  message: <<EOM
 saned will log to the 'daemon' facility; this is a hard-coded
 default. Also, saned has no support for SSL/TLS or cryptographic
 authentication; you may wish to deploy security/stunnel to wrap
@@ -40,5 +41,6 @@ on client machines; be sure to point it at your scan server.
 If you are setting up a scan server, you may also wish to edit
 %%PREFIX%%/etc/sane.d/saned.conf
 to only permit specific machines.
-
-==================================================================
+EOM
+}
+]
diff --git a/graphics/sane-frontends/files/pkg-message.in b/graphics/sane-frontends/files/pkg-message.in
index 82c6b1796900..d8ffba76acb2 100644
--- a/graphics/sane-frontends/files/pkg-message.in
+++ b/graphics/sane-frontends/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Congratulations, SANE-FRONTENDS is now installed.
 
 If you built it with WITH_GIMP set to yes, you can use
@@ -9,3 +12,6 @@ Then run the GIMP, and a new "xscanimage" menu item should appear in the
 "File->Acquire" menu.  Use this to access your scanner.
 
 Have fun!
+EOM
+}
+]
diff --git a/graphics/separate/pkg-message b/graphics/separate/pkg-message
index f2705ca6082a..5f2cd073209d 100644
--- a/graphics/separate/pkg-message
+++ b/graphics/separate/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 You can download and install Adobe's ICC profiles from:
 http://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesWin_bundler.zip
+EOM
+}
+]
diff --git a/graphics/simpleviewer/files/pkg-message.in b/graphics/simpleviewer/files/pkg-message.in
index 7395cf13ea80..963509594fb9 100644
--- a/graphics/simpleviewer/files/pkg-message.in
+++ b/graphics/simpleviewer/files/pkg-message.in
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 You can put default command line switches into a configuration file,
 please see %%EXAMPLESDIR%%/config.example
 for how to do it.
+EOM
+}
+]
diff --git a/graphics/telak/pkg-message b/graphics/telak/pkg-message
index b6cc8d93995c..29d5627bafd8 100644
--- a/graphics/telak/pkg-message
+++ b/graphics/telak/pkg-message
@@ -1,4 +1,8 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 To install an example config file, log into your user account and type
 'make install-user'.
-===============================================================================
+EOM
+}
+]
diff --git a/graphics/xoris/files/pkg-message.in b/graphics/xoris/files/pkg-message.in
index 9f033f662b68..e23233823213 100644
--- a/graphics/xoris/files/pkg-message.in
+++ b/graphics/xoris/files/pkg-message.in
@@ -1,3 +1,7 @@
-*******************************************************************************
+[
+{ type: install
+  message: <<EOM
 * See %%DOCSDIR%%/README before using xoris!
-*******************************************************************************
+EOM
+}
+]
diff --git a/graphics/xpdf3/pkg-message b/graphics/xpdf3/pkg-message
index e8baf67674ee..a74ae38f79bd 100644
--- a/graphics/xpdf3/pkg-message
+++ b/graphics/xpdf3/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please note: The binaries in this package -- pdffonts, pdfimages, pdfinfo,
 pdfdetach, pdftohtml, pdftopng, pdftoppm, pdftops, pdftotext -- are
 installed in ${LOCALBASE}/libexec/xpdf. The reason for this is to not
@@ -6,3 +9,6 @@ other packages. If you need to use any of these utilites,
 
 a) create symlinks in ${LOCALBASE}/bin or some other directory in $PATH, or
 b) install graphics/poppler-utils.
+EOM
+}
+]
diff --git a/graphics/xpdf4/pkg-message b/graphics/xpdf4/pkg-message
index e8baf67674ee..a74ae38f79bd 100644
--- a/graphics/xpdf4/pkg-message
+++ b/graphics/xpdf4/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please note: The binaries in this package -- pdffonts, pdfimages, pdfinfo,
 pdfdetach, pdftohtml, pdftopng, pdftoppm, pdftops, pdftotext -- are
 installed in ${LOCALBASE}/libexec/xpdf. The reason for this is to not
@@ -6,3 +9,6 @@ other packages. If you need to use any of these utilites,
 
 a) create symlinks in ${LOCALBASE}/bin or some other directory in $PATH, or
 b) install graphics/poppler-utils.
+EOM
+}
+]
diff --git a/graphics/xsane/files/pkg-message.in b/graphics/xsane/files/pkg-message.in
index a2be7039f83e..d1c2d7817cfd 100644
--- a/graphics/xsane/files/pkg-message.in
+++ b/graphics/xsane/files/pkg-message.in
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 To install XSane as a GIMP plug-in, please type:
 
     ln -sf %%LOCALBASE%%/bin/xsane ~/.gimp-*/plug-ins/xsane
 
 Then run the GIMP, and a new "XSane" menu item should appear in the
 "File -> Create" menu.
+EOM
+}
+]
diff --git a/graphics/zathura/pkg-message b/graphics/zathura/pkg-message
index baa39f5e6958..0060b13c3208 100644
--- a/graphics/zathura/pkg-message
+++ b/graphics/zathura/pkg-message
@@ -1,7 +1,9 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
     In order to read documents, zathura need at least one plugin. Such
     plugins are in graphics/zathura-* ports. If you want to read pdf files,
     install the graphics/zathura-pdf-poppler port.
-
-===============================================================================
+EOM
+}
+]
diff --git a/graphics/zphoto/pkg-message b/graphics/zphoto/pkg-message
index d46ced720913..2b83a3e52252 100644
--- a/graphics/zphoto/pkg-message
+++ b/graphics/zphoto/pkg-message
@@ -1,4 +1,6 @@
-******************************************************************************
+[
+{ type: install
+  message: <<EOM
  This port requires a kernel built with
  the directive:
 
@@ -24,4 +26,6 @@
   % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/all (both)
   % setenv ZPHOTO_FONT %%PREFIX%%/share/zphoto/fonts/EfontSerifB.fdb
 
-******************************************************************************
+EOM
+}
+]