14 files changed, 84 insertions, 22 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
+}
+]