121 files changed, 728 insertions, 196 deletions

diff --git a/x11-clocks/cairo-clock/pkg-message b/x11-clocks/cairo-clock/pkg-message
index 49a33d08ea1f..70576d7f5359 100644
--- a/x11-clocks/cairo-clock/pkg-message
+++ b/x11-clocks/cairo-clock/pkg-message
@@ -1,3 +1,7 @@
-************************************************************************
+[
+{ type: install
+  message: <<EOM
  Please note that you need composite extension enabled in X.org or Xgl.
-************************************************************************
+EOM
+}
+]
diff --git a/x11-drivers/xf86-input-wacom/files/pkg-message.in b/x11-drivers/xf86-input-wacom/files/pkg-message.in
index c5fd4113706c..5ec8de9fabf8 100644
--- a/x11-drivers/xf86-input-wacom/files/pkg-message.in
+++ b/x11-drivers/xf86-input-wacom/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 wacom(4x) is configured automatically via devd or HAL. However, if you
 prefer to do so manually copy and edit the sample:
 
@@ -7,3 +10,6 @@ prefer to do so manually copy and edit the sample:
 moused(8) may interfere with tablet input by attaching to fake /dev/ums*.
 To prevent that add a usb_quirk(4) then detach and attach the tablet.
 %%PREFIX%%/etc/rc.d/wacom is an example how preserve quirks across reboot.
+EOM
+}
+]
diff --git a/x11-fm/krusader2/pkg-message b/x11-fm/krusader2/pkg-message
index 15358dc3c1b5..333a3f43fb2c 100644
--- a/x11-fm/krusader2/pkg-message
+++ b/x11-fm/krusader2/pkg-message
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Krusader can use several external programs for additional functionality, from
 diff utilities to email programs.
 
@@ -8,3 +10,6 @@ contains a list of programs Krusader optionally looks for.
 To use 'update DB' button in the locate dialog, open "Settings->Configure
 Krusader -> Dependencies" and write '/usr/libexec/locate.updatedb' into the
 field 'updatedb'.
+EOM
+}
+]
diff --git a/x11-fm/rox-filer/pkg-message b/x11-fm/rox-filer/pkg-message
index 31e83563ce7f..01650a3e33c8 100644
--- a/x11-fm/rox-filer/pkg-message
+++ b/x11-fm/rox-filer/pkg-message
@@ -1,4 +1,6 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 Please note: if you get the following error while running ROX-Filer,
 you may be browsing a directory containing filenames that do not
 comply with UTF-8.
@@ -8,4 +10,6 @@ comply with UTF-8.
 
 To fix that, just set your CHARSET variable to any preferred fallback
 encoding (like CHARSET=iso-8859-1).
-======================================================================
+EOM
+}
+]
diff --git a/x11-fonts/andika/files/pkg-message.in b/x11-fonts/andika/files/pkg-message.in
index 66a3d98c1032..0b3cc2d3ff66 100644
--- a/x11-fonts/andika/files/pkg-message.in
+++ b/x11-fonts/andika/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,4 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
-
+EOM
+}
+]
diff --git a/x11-fonts/anonymous-pro/files/pkg-message.in b/x11-fonts/anonymous-pro/files/pkg-message.in
index 0ffb5123397e..d4d5abb4fd72 100644
--- a/x11-fonts/anonymous-pro/files/pkg-message.in
+++ b/x11-fonts/anonymous-pro/files/pkg-message.in
@@ -1,4 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Add the following line to the "Files" section of xorg.conf or XF86Config:
 
 	FontPath "%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in b/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in
index 68a0e7225b1f..c64bb24b7b4d 100644
--- a/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in
+++ b/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  To get XFree86 to recognise your new fonts you will need to
  add a line to your XF86Config file. XFree86 4 usually keeps its
  XF86Config file in /etc or /etc/X11.
@@ -7,5 +8,6 @@
  Add the following line to the "Files" section and restart XFree86.
 
  FontPath "%%FONTSDIR%%"
-
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in b/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
index 68a0e7225b1f..c64bb24b7b4d 100644
--- a/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
+++ b/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  To get XFree86 to recognise your new fonts you will need to
  add a line to your XF86Config file. XFree86 4 usually keeps its
  XF86Config file in /etc or /etc/X11.
@@ -7,5 +8,6 @@
  Add the following line to the "Files" section and restart XFree86.
 
  FontPath "%%FONTSDIR%%"
-
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11-fonts/artwiz-aleczapka/files/pkg-message.in b/x11-fonts/artwiz-aleczapka/files/pkg-message.in
index 68a0e7225b1f..c64bb24b7b4d 100644
--- a/x11-fonts/artwiz-aleczapka/files/pkg-message.in
+++ b/x11-fonts/artwiz-aleczapka/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  To get XFree86 to recognise your new fonts you will need to
  add a line to your XF86Config file. XFree86 4 usually keeps its
  XF86Config file in /etc or /etc/X11.
@@ -7,5 +8,6 @@
  Add the following line to the "Files" section and restart XFree86.
 
  FontPath "%%FONTSDIR%%"
-
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11-fonts/artwiz-fonts/files/pkg-message.in b/x11-fonts/artwiz-fonts/files/pkg-message.in
index 68a0e7225b1f..c64bb24b7b4d 100644
--- a/x11-fonts/artwiz-fonts/files/pkg-message.in
+++ b/x11-fonts/artwiz-fonts/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  To get XFree86 to recognise your new fonts you will need to
  add a line to your XF86Config file. XFree86 4 usually keeps its
  XF86Config file in /etc or /etc/X11.
@@ -7,5 +8,6 @@
  Add the following line to the "Files" section and restart XFree86.
 
  FontPath "%%FONTSDIR%%"
-
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11-fonts/bitstream-vera/files/pkg-message.in b/x11-fonts/bitstream-vera/files/pkg-message.in
index b8a87e071618..c25bc317df81 100644
--- a/x11-fonts/bitstream-vera/files/pkg-message.in
+++ b/x11-fonts/bitstream-vera/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
 before using.  The copyright can be found at %%FONTSDIR%%/COPYRIGHT.TXT.  To
 use these fonts, follow the instructions below.
@@ -12,3 +15,6 @@ Add the following line to the "Files" section of X Windows configuration file:
 	FontPath "%%FONTSDIR%%/"
 
 Note: your X Windows configuration file is typically /etc/X11/xorg.conf
+EOM
+}
+]
diff --git a/x11-fonts/charis-compact/files/pkg-message.in b/x11-fonts/charis-compact/files/pkg-message.in
index 9ce0ab9fbb48..0b3cc2d3ff66 100644
--- a/x11-fonts/charis-compact/files/pkg-message.in
+++ b/x11-fonts/charis-compact/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,3 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
+EOM
+}
+]
diff --git a/x11-fonts/charis/files/pkg-message.in b/x11-fonts/charis/files/pkg-message.in
index 9ce0ab9fbb48..0b3cc2d3ff66 100644
--- a/x11-fonts/charis/files/pkg-message.in
+++ b/x11-fonts/charis/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,3 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
+EOM
+}
+]
diff --git a/x11-fonts/code2000/files/pkg-message.in b/x11-fonts/code2000/files/pkg-message.in
index 104433538946..c2acd624cfbc 100644
--- a/x11-fonts/code2000/files/pkg-message.in
+++ b/x11-fonts/code2000/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 IMPORTANT - READ CAREFULLY: Code2000 is *NOT* free software!
 It is offered as a shareware demo. If you like it and use it after a
 reasonable evaluation period, you are obliged to register the
@@ -13,3 +16,6 @@ line to the "Modules" section of your X11 / x.org configuration file:
 Add the following line to the "Files" section of XF86Config:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in b/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/crosextrafonts-carlito-ttf/files/pkg-message.in b/x11-fonts/crosextrafonts-carlito-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/crosextrafonts-carlito-ttf/files/pkg-message.in
+++ b/x11-fonts/crosextrafonts-carlito-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/cyberbit-ttfonts/files/pkg-message.in b/x11-fonts/cyberbit-ttfonts/files/pkg-message.in
index c793d50b7fdb..d2b9b3293251 100644
--- a/x11-fonts/cyberbit-ttfonts/files/pkg-message.in
+++ b/x11-fonts/cyberbit-ttfonts/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the font(s) by following these instructions:
 
 Eiter type the following in an X terminal:
@@ -8,3 +11,6 @@ Or, more permanently, add the following line to the "Files" section of your
 X.Org configuration file:
 	FontPath "%%FONTSDIR%%/"
 and make sure you have the "freetype" module loaded, then restart X.
+EOM
+}
+]
diff --git a/x11-fonts/cyr-rfx/files/pkg-message.in b/x11-fonts/cyr-rfx/files/pkg-message.in
index cfe5c11b7149..eae0096b8969 100644
--- a/x11-fonts/cyr-rfx/files/pkg-message.in
+++ b/x11-fonts/cyr-rfx/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 
 This port provides Cyrillic replacements for most of the standard
 	%%PREFIX%%/share/fonts/misc
@@ -8,3 +11,6 @@ fonts.
 You may want to make sure, the
 	%%FONTSDIR%%
 is listed in your fontpath before those two paths.
+EOM
+}
+]
diff --git a/x11-fonts/dejavu/files/pkg-message.in b/x11-fonts/dejavu/files/pkg-message.in
index f2c54fcf0dc6..716ad08885ef 100644
--- a/x11-fonts/dejavu/files/pkg-message.in
+++ b/x11-fonts/dejavu/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
 
@@ -9,3 +12,6 @@ Add the following line to the "Files" section of X Windows configuration file:
 
 Note: your X Windows configuration file is typically /etc/X11/XF86Config
 if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org.
+EOM
+}
+]
diff --git a/x11-fonts/doulos-compact/files/pkg-message.in b/x11-fonts/doulos-compact/files/pkg-message.in
index 9ce0ab9fbb48..0b3cc2d3ff66 100644
--- a/x11-fonts/doulos-compact/files/pkg-message.in
+++ b/x11-fonts/doulos-compact/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,3 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
+EOM
+}
+]
diff --git a/x11-fonts/doulos/files/pkg-message.in b/x11-fonts/doulos/files/pkg-message.in
index 9ce0ab9fbb48..0b3cc2d3ff66 100644
--- a/x11-fonts/doulos/files/pkg-message.in
+++ b/x11-fonts/doulos/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,3 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
+EOM
+}
+]
diff --git a/x11-fonts/fira/files/pkg-message.in b/x11-fonts/fira/files/pkg-message.in
index 71f4cc085a44..d84b4a24f1a3 100644
--- a/x11-fonts/fira/files/pkg-message.in
+++ b/x11-fonts/fira/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Fira has been installed.
 
 Fira has advanced Open Type typographic layout features and language support.
@@ -17,5 +18,6 @@ or
     http://en.wikipedia.org/wiki/List_of_typographic_features
 
 For Web Font please use www/fira-webfont port.
-
-===============================================================================
+EOM
+}
+]
diff --git a/x11-fonts/firago/files/pkg-message.in b/x11-fonts/firago/files/pkg-message.in
index fc2bd34998c7..14fedb148593 100644
--- a/x11-fonts/firago/files/pkg-message.in
+++ b/x11-fonts/firago/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 FiraGO has been installed.
 
 FiraGO has advanced Open Type typographic layout features and language support.
@@ -15,5 +16,6 @@ or
 
     https://www.fontfont.com/staticcontent/downloads/FF_OT_User_Guide.pdf
     http://en.wikipedia.org/wiki/List_of_typographic_features
-
-===============================================================================
+EOM
+}
+]
diff --git a/x11-fonts/font-awesome/files/pkg-message.in b/x11-fonts/font-awesome/files/pkg-message.in
index 9b1f07906973..b4a35d05db90 100644
--- a/x11-fonts/font-awesome/files/pkg-message.in
+++ b/x11-fonts/font-awesome/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
 
@@ -9,3 +12,6 @@ Add the following line to the "Files" section of X Windows configuration file:
 
 If you're upgrading from Font Awesome v4, you may need to update your configs
 to the new font families "Font Awesome 5 Free" and "Font Awesome 5 Free Solid".
+EOM
+}
+]
diff --git a/x11-fonts/font-gost/files/pkg-message.in b/x11-fonts/font-gost/files/pkg-message.in
index d8ead78a7ffa..9be9e9a0e2f5 100644
--- a/x11-fonts/font-gost/files/pkg-message.in
+++ b/x11-fonts/font-gost/files/pkg-message.in
@@ -1,10 +1,10 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Standart GOST font. GOST 2.304-81
 Pay attention to copyright issues before any commercial use of this fonts.
 Copyright (c) 1996-2010. ASCON. All Rights Reserved.
 
-===============================================================================
 
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
@@ -14,3 +14,6 @@ line to the "Modules" section of your X Windows configuration file:
 Add the following line to the "Files" section of X Windows configuration file:
 
         FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/freefonts/files/pkg-message.in b/x11-fonts/freefonts/files/pkg-message.in
index 4615e916fac8..91f012c102dd 100644
--- a/x11-fonts/freefonts/files/pkg-message.in
+++ b/x11-fonts/freefonts/files/pkg-message.in
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add %%FONTSDIR%%
 to your X font path by either:
 
@@ -7,4 +9,6 @@ $ xset fp rehash
 
 or by adding it to your X-server configuration file and
 restarting the X-server.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message
index a113f3a5fd14..13e9bb285950 100644
--- a/x11-fonts/geminifonts/pkg-message
+++ b/x11-fonts/geminifonts/pkg-message
@@ -1,8 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 	For  your X-server  to use  the fonts,  you have  to add
 	the  ${LOCALBASE}/share/fonts/koi8-u-gemini (LOCALBASE is,
 	usually, /usr/local)  to  the server's  font-path.  Use
 	``xset fp+''  to do this  for the current  X-session and
 	consult  your  X-server's  documentation  to  make  this
 	permanent.
-
+EOM
+}
+]
diff --git a/x11-fonts/gentium-basic/files/pkg-message.in b/x11-fonts/gentium-basic/files/pkg-message.in
index 66a3d98c1032..0b3cc2d3ff66 100644
--- a/x11-fonts/gentium-basic/files/pkg-message.in
+++ b/x11-fonts/gentium-basic/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,4 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
-
+EOM
+}
+]
diff --git a/x11-fonts/gentium-plus/files/pkg-message.in b/x11-fonts/gentium-plus/files/pkg-message.in
index 3bd3784c8c88..0b3cc2d3ff66 100644
--- a/x11-fonts/gentium-plus/files/pkg-message.in
+++ b/x11-fonts/gentium-plus/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,5 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
-
-
+EOM
+}
+]
diff --git a/x11-fonts/google-fonts/files/pkg-message.in b/x11-fonts/google-fonts/files/pkg-message.in
index 82f1671ede7a..3119aaad62e6 100644
--- a/x11-fonts/google-fonts/files/pkg-message.in
+++ b/x11-fonts/google-fonts/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
 
@@ -6,3 +9,6 @@ line to the "Modules" section of your X Windows configuration file:
 Add the following line to the "Files" section of X Windows configuration file:
 
         FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/hanazono-fonts-ttf/files/pkg-message.in b/x11-fonts/hanazono-fonts-ttf/files/pkg-message.in
index 5b2177630d03..28dbcbe7daf6 100644
--- a/x11-fonts/hanazono-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/hanazono-fonts-ttf/files/pkg-message.in
@@ -1,8 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your X.org configuration
 file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/x11-fonts/indic-ttf/files/pkg-message.in b/x11-fonts/indic-ttf/files/pkg-message.in
index 088f212c6ed7..5524619da09f 100644
--- a/x11-fonts/indic-ttf/files/pkg-message.in
+++ b/x11-fonts/indic-ttf/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the "freetype" module is loaded. If it is not, add
 the following line to the "Modules" section of your X server
 configuration file:
@@ -27,3 +30,6 @@ For each font collection information and the copyright can be
 found in the font subdirectories at:
 
 	"%%FONTSDIR%%"
+EOM
+}
+]
diff --git a/x11-fonts/jmk-x11-fonts/pkg-message b/x11-fonts/jmk-x11-fonts/pkg-message
index 88c180bac678..abfc96107620 100644
--- a/x11-fonts/jmk-x11-fonts/pkg-message
+++ b/x11-fonts/jmk-x11-fonts/pkg-message
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add /usr/local/lib/X11/fonts/jmk
 to your X font path by either:
 
@@ -7,4 +9,6 @@ $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
 /etc/X11/XF86Config) and restarting the X-server.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/lfpfonts-fix/pkg-message b/x11-fonts/lfpfonts-fix/pkg-message
index ba9e6c53c817..b153946d1cdc 100644
--- a/x11-fonts/lfpfonts-fix/pkg-message
+++ b/x11-fonts/lfpfonts-fix/pkg-message
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add /usr/local/lib/X11/fonts/lfpfonts-fix
 to your X font path by either:
 
@@ -7,4 +9,6 @@ $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
 /etc/X11/XF86Config) and restarting the X-server.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/lfpfonts-var/pkg-message b/x11-fonts/lfpfonts-var/pkg-message
index 1b56e6752495..6500ec1141f5 100644
--- a/x11-fonts/lfpfonts-var/pkg-message
+++ b/x11-fonts/lfpfonts-var/pkg-message
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add /usr/local/lib/X11/fonts/lfpfonts-var
 to your X font path by either:
 
@@ -7,4 +9,6 @@ $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
 /etc/X11/XF86Config) and restarting the X-server.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/liberation-fonts-ttf/files/pkg-message.in b/x11-fonts/liberation-fonts-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/liberation-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/liberation-fonts-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/lohit/files/pkg-message.in b/x11-fonts/lohit/files/pkg-message.in
index 6c989372b5f8..72d1201289c3 100644
--- a/x11-fonts/lohit/files/pkg-message.in
+++ b/x11-fonts/lohit/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,4 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Module" section of xorg.conf:
 
 	Load "freetype"
-
+EOM
+}
+]
diff --git a/x11-fonts/material-icons-ttf/files/pkg-message.in b/x11-fonts/material-icons-ttf/files/pkg-message.in
index 0054ed7dd7d4..833a976960b5 100644
--- a/x11-fonts/material-icons-ttf/files/pkg-message.in
+++ b/x11-fonts/material-icons-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/materialdesign-ttf/files/pkg-message.in b/x11-fonts/materialdesign-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/materialdesign-ttf/files/pkg-message.in
+++ b/x11-fonts/materialdesign-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/mgopen/files/pkg-message.in b/x11-fonts/mgopen/files/pkg-message.in
index 754b5462d75d..f928422df38c 100644
--- a/x11-fonts/mgopen/files/pkg-message.in
+++ b/x11-fonts/mgopen/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, follow the instructions below.
 
 Make sure that the freetype module is loaded. If it is not, add the following
@@ -11,3 +14,6 @@ Add the following line to the "Files" section of your X configuration file:
 
 Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/xorg.conf
 if you are using X.Org.
+EOM
+}
+]
diff --git a/x11-fonts/ohsnap/files/pkg-message.in b/x11-fonts/ohsnap/files/pkg-message.in
index 68a0e7225b1f..c64bb24b7b4d 100644
--- a/x11-fonts/ohsnap/files/pkg-message.in
+++ b/x11-fonts/ohsnap/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  To get XFree86 to recognise your new fonts you will need to
  add a line to your XF86Config file. XFree86 4 usually keeps its
  XF86Config file in /etc or /etc/X11.
@@ -7,5 +8,6 @@
  Add the following line to the "Files" section and restart XFree86.
 
  FontPath "%%FONTSDIR%%"
-
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11-fonts/paratype/files/pkg-message.in b/x11-fonts/paratype/files/pkg-message.in
index 9ce0ab9fbb48..0b3cc2d3ff66 100644
--- a/x11-fonts/paratype/files/pkg-message.in
+++ b/x11-fonts/paratype/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
@@ -9,3 +12,6 @@ messages.  If freetype is required, add the following line to the
 "Modules" section of xorg.conf:
 
 	Load "freetype"
+EOM
+}
+]
diff --git a/x11-fonts/pingwi/files/pkg-message.in b/x11-fonts/pingwi/files/pkg-message.in
index 7814b8381476..95f6869c5b95 100644
--- a/x11-fonts/pingwi/files/pkg-message.in
+++ b/x11-fonts/pingwi/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
 
@@ -9,3 +12,6 @@ Add the following line to the "Files" section of X Windows configuration file:
 
 Note: your X Windows configuration file is typically /etc/X11/XF86Config
 if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org.
+EOM
+}
+]
diff --git a/x11-fonts/powerline-fonts/files/pkg-message.in b/x11-fonts/powerline-fonts/files/pkg-message.in
index 0ffb5123397e..d4d5abb4fd72 100644
--- a/x11-fonts/powerline-fonts/files/pkg-message.in
+++ b/x11-fonts/powerline-fonts/files/pkg-message.in
@@ -1,4 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Add the following line to the "Files" section of xorg.conf or XF86Config:
 
 	FontPath "%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/x11-fonts/roboto-fonts-ttf/files/pkg-message.in b/x11-fonts/roboto-fonts-ttf/files/pkg-message.in
index 5b2177630d03..28dbcbe7daf6 100644
--- a/x11-fonts/roboto-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/roboto-fonts-ttf/files/pkg-message.in
@@ -1,8 +1,12 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your X.org configuration
 file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/x11-fonts/sgifonts/files/pkg-message.in b/x11-fonts/sgifonts/files/pkg-message.in
index 0949aa3c69b8..46f8d5d8505c 100644
--- a/x11-fonts/sgifonts/files/pkg-message.in
+++ b/x11-fonts/sgifonts/files/pkg-message.in
@@ -1,6 +1,10 @@
-******************************************
+[
+{ type: install
+  message: <<EOM
 Add a line
 FontPath "%%FONTSDIR%%
 to your xorg.conf.
 Then, restart the X server or do "xset fp rehash".
-*****************************************
+EOM
+}
+]
diff --git a/x11-fonts/sharefonts/files/pkg-message.in b/x11-fonts/sharefonts/files/pkg-message.in
index e13f4aca376b..40a4e6498bcf 100644
--- a/x11-fonts/sharefonts/files/pkg-message.in
+++ b/x11-fonts/sharefonts/files/pkg-message.in
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add %%FONTSDIR%%
 to your X font path by either:
 
@@ -12,4 +14,6 @@ NOTE: These fonts are SHAREWARE. You must pay a fee if you
 find that you are using them a lot. Please read the
 *.shareware files in %%FONTSDIR%%
 for each font's licensing restrictions.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/sourcecodepro-ttf/files/pkg-message.in b/x11-fonts/sourcecodepro-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/sourcecodepro-ttf/files/pkg-message.in
+++ b/x11-fonts/sourcecodepro-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/sourcesanspro-ttf/files/pkg-message.in b/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
+++ b/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/sourceserifpro-ttf/files/pkg-message.in b/x11-fonts/sourceserifpro-ttf/files/pkg-message.in
index 58071a80c57f..0e913d65fa5b 100644
--- a/x11-fonts/sourceserifpro-ttf/files/pkg-message.in
+++ b/x11-fonts/sourceserifpro-ttf/files/pkg-message.in
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/stix-fonts/files/pkg-message.in b/x11-fonts/stix-fonts/files/pkg-message.in
index b61ca8aad6d0..9d393e65aa7f 100644
--- a/x11-fonts/stix-fonts/files/pkg-message.in
+++ b/x11-fonts/stix-fonts/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Make sure that the freetype module is loaded.  If it is not, add the following
@@ -8,3 +11,6 @@ line to the "Modules" section of your X11 / x.org configuration file:
 Add the following line to the "Files" section:
 
 	FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/suxus/files/pkg-message.in b/x11-fonts/suxus/files/pkg-message.in
index 8077012130cd..c1dc83d4c252 100644
--- a/x11-fonts/suxus/files/pkg-message.in
+++ b/x11-fonts/suxus/files/pkg-message.in
@@ -1,8 +1,11 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add %%FONTSDIR%%
 to your X font path:
 
 $ xset fp+ %%FONTSDIR%%
 $ xset fp rehash
-
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/terminus-font/files/pkg-message.in b/x11-fonts/terminus-font/files/pkg-message.in
index 0ffb5123397e..d4d5abb4fd72 100644
--- a/x11-fonts/terminus-font/files/pkg-message.in
+++ b/x11-fonts/terminus-font/files/pkg-message.in
@@ -1,4 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 Add the following line to the "Files" section of xorg.conf or XF86Config:
 
 	FontPath "%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/x11-fonts/terminus-ttf/files/pkg-message.in b/x11-fonts/terminus-ttf/files/pkg-message.in
index fc2d15e420cb..97ce0cad1a58 100644
--- a/x11-fonts/terminus-ttf/files/pkg-message.in
+++ b/x11-fonts/terminus-ttf/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your X.Org
@@ -17,3 +20,6 @@ following sizes:
         24 px or 18 pt
         28 px or 21 pt
         32 px or 24 pt
+EOM
+}
+]
diff --git a/x11-fonts/ubuntu-font/files/pkg-message.in b/x11-fonts/ubuntu-font/files/pkg-message.in
index 82f1671ede7a..3119aaad62e6 100644
--- a/x11-fonts/ubuntu-font/files/pkg-message.in
+++ b/x11-fonts/ubuntu-font/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of your X Windows configuration file:
 
@@ -6,3 +9,6 @@ line to the "Modules" section of your X Windows configuration file:
 Add the following line to the "Files" section of X Windows configuration file:
 
         FontPath "%%FONTSDIR%%/"
+EOM
+}
+]
diff --git a/x11-fonts/urwfonts-ttf/files/pkg-message.in b/x11-fonts/urwfonts-ttf/files/pkg-message.in
index e0ed5126b972..54816a84216f 100644
--- a/x11-fonts/urwfonts-ttf/files/pkg-message.in
+++ b/x11-fonts/urwfonts-ttf/files/pkg-message.in
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add %%FONTSDIR%%
 to your X font path by either:
 
@@ -7,4 +9,6 @@ $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
 /etc/X11/xorg.conf) and restarting the X-server.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/urwfonts/files/pkg-message.in b/x11-fonts/urwfonts/files/pkg-message.in
index e0ed5126b972..54816a84216f 100644
--- a/x11-fonts/urwfonts/files/pkg-message.in
+++ b/x11-fonts/urwfonts/files/pkg-message.in
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add %%FONTSDIR%%
 to your X font path by either:
 
@@ -7,4 +9,6 @@ $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
 /etc/X11/xorg.conf) and restarting the X-server.
-============================================================
+EOM
+}
+]
diff --git a/x11-fonts/webfonts/files/pkg-message.in b/x11-fonts/webfonts/files/pkg-message.in
index 505a0c8eab39..56cc1b28a246 100644
--- a/x11-fonts/webfonts/files/pkg-message.in
+++ b/x11-fonts/webfonts/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 IMPORTANT - READ CAREFULLY: You may not use these fonts if you do not agree to
 the terms of the Microsoft End-User License Agreement ("EULA").  You will find
 the EULA at %%DOCSDIR%%/LICENSE.  If you read and agree
@@ -15,3 +18,6 @@ Add the following line to the "Files" section of xorg.conf or XF86Config:
 NOTE: Due to known freetype bug some glyphs (N, W) of y2006 Verdana Bold
       font are not rendered correctly in anti-aliased mode within the range
       9-16 ppem
+EOM
+}
+]
diff --git a/x11-fonts/wqy/files/pkg-message.in b/x11-fonts/wqy/files/pkg-message.in
index fa512f770cc2..3ed646d119e0 100644
--- a/x11-fonts/wqy/files/pkg-message.in
+++ b/x11-fonts/wqy/files/pkg-message.in
@@ -1,4 +1,6 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 Please add %%FONTSDIR%% for your X server by either:
 
 # xset fp+ %%FONTSDIR%%
@@ -13,5 +15,6 @@ Section "Files"
     FontPath   "%%FONTSDIR%%"
 ...
 EndSection
-
-**************************************************************************
+EOM
+}
+]
diff --git a/x11-servers/Xfstt/files/pkg-message.in b/x11-servers/Xfstt/files/pkg-message.in
index 835e75213218..da2d47ec3490 100644
--- a/x11-servers/Xfstt/files/pkg-message.in
+++ b/x11-servers/Xfstt/files/pkg-message.in
@@ -1,4 +1,6 @@
-******************************************************************
+[
+{ type: install
+  message: <<EOM
 You will have to install your TrueType fonts in
 
 	%%PREFIX%%/share/fonts/TrueType
@@ -10,4 +12,6 @@ You should also add the following line to the "Files"
 section of your xorg.conf file:
 
 	FontPath   "unix/:7101"
-******************************************************************
+EOM
+}
+]
diff --git a/x11-themes/cursor-chameleon-white/pkg-message b/x11-themes/cursor-chameleon-white/pkg-message
index 26cbf11baaf6..47f122916c97 100644
--- a/x11-themes/cursor-chameleon-white/pkg-message
+++ b/x11-themes/cursor-chameleon-white/pkg-message
@@ -1,7 +1,11 @@
-=============================================================
+[
+{ type: install
+  message: <<EOM
 If the animations are flickering on your nvidia card, add the
 following line to your xorg.conf file, into the nvidia device
 section, to fix it:
 
         Option "HWCursor" "off"
-=============================================================
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-black-and-white/pkg-message b/x11-themes/kde-icons-black-and-white/pkg-message
index 881f24bb1b34..8e20c69ede3d 100644
--- a/x11-themes/kde-icons-black-and-white/pkg-message
+++ b/x11-themes/kde-icons-black-and-white/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select black and white iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-gartoon-blue-svg/pkg-message b/x11-themes/kde-icons-gartoon-blue-svg/pkg-message
index 290252020522..6cec3bfdfb88 100644
--- a/x11-themes/kde-icons-gartoon-blue-svg/pkg-message
+++ b/x11-themes/kde-icons-gartoon-blue-svg/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Gartoon Blue theme iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-gartoon-svg/pkg-message b/x11-themes/kde-icons-gartoon-svg/pkg-message
index b7b7c1a847f5..64d242226c54 100644
--- a/x11-themes/kde-icons-gartoon-svg/pkg-message
+++ b/x11-themes/kde-icons-gartoon-svg/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Gartoon theme iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-graphite-rade8/pkg-message b/x11-themes/kde-icons-graphite-rade8/pkg-message
index a120edb2be62..ddad2ae346ba 100644
--- a/x11-themes/kde-icons-graphite-rade8/pkg-message
+++ b/x11-themes/kde-icons-graphite-rade8/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Graphite-Rade8-1.03 iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-kool-gorilla/pkg-message b/x11-themes/kde-icons-kool-gorilla/pkg-message
index 20a3c803e0ec..c8c012a10a5f 100644
--- a/x11-themes/kde-icons-kool-gorilla/pkg-message
+++ b/x11-themes/kde-icons-kool-gorilla/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Korilla theme iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-lime-rade8/pkg-message b/x11-themes/kde-icons-lime-rade8/pkg-message
index c997e5f83583..d4d9e9b7389a 100644
--- a/x11-themes/kde-icons-lime-rade8/pkg-message
+++ b/x11-themes/kde-icons-lime-rade8/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Lime-Rade8-1.01 iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-lush/pkg-message b/x11-themes/kde-icons-lush/pkg-message
index 53dff30fe497..f170a2bc7fb1 100644
--- a/x11-themes/kde-icons-lush/pkg-message
+++ b/x11-themes/kde-icons-lush/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Lush theme iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-noia/pkg-message b/x11-themes/kde-icons-noia/pkg-message
index 86a710dd8001..bcef457a04ae 100644
--- a/x11-themes/kde-icons-noia/pkg-message
+++ b/x11-themes/kde-icons-noia/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Noia KDE iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-nuovext2/pkg-message b/x11-themes/kde-icons-nuovext2/pkg-message
index d979c6c747ac..8eb140b290d3 100644
--- a/x11-themes/kde-icons-nuovext2/pkg-message
+++ b/x11-themes/kde-icons-nuovext2/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select nuoveXT 2.2.2 iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/kde-icons-nuvola/pkg-message b/x11-themes/kde-icons-nuvola/pkg-message
index af216c2c43a1..3a1735dc342d 100644
--- a/x11-themes/kde-icons-nuvola/pkg-message
+++ b/x11-themes/kde-icons-nuvola/pkg-message
@@ -1,5 +1,6 @@
-	ATTENTIONATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 How to install a new icon theme
 
 1) Open the KDE-Menu and start the Control Center
@@ -7,3 +8,6 @@ How to install a new icon theme
 3) Select Nuvola theme iconset
 4) Click "Apply"
 5) Have fun! :-)
+EOM
+}
+]
diff --git a/x11-themes/sddm-freebsd-black-theme/files/pkg-message.in b/x11-themes/sddm-freebsd-black-theme/files/pkg-message.in
index 1cc6bd8ade5f..71de54ddc5da 100644
--- a/x11-themes/sddm-freebsd-black-theme/files/pkg-message.in
+++ b/x11-themes/sddm-freebsd-black-theme/files/pkg-message.in
@@ -1,5 +1,6 @@
-------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
  To enable this theme edit:
 
  %%PREFIX%%/etc/sddm.conf
@@ -8,5 +9,6 @@
  can be changed to any desired font editing:
 
  %%PREFIX%%/share/sddm/themes/sddm-freebsd-black-theme/theme.conf
-
-------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11-themes/slim-freebsd-black-theme/files/pkg-message.in b/x11-themes/slim-freebsd-black-theme/files/pkg-message.in
index d0b0fab17b61..e511317897ef 100644
--- a/x11-themes/slim-freebsd-black-theme/files/pkg-message.in
+++ b/x11-themes/slim-freebsd-black-theme/files/pkg-message.in
@@ -1,5 +1,6 @@
-##################################################################
-
+[
+{ type: install
+  message: <<EOM
  To enable this theme edit:
 
  %%PREFIX%%/etc/slim.conf
@@ -8,5 +9,6 @@
  that can be changed to any desired font editing:
 
  %%PREFIX%%/share/slim/themes/slim-freebsd-black-theme/slim.theme
-
-##################################################################
+EOM
+}
+]
diff --git a/x11-themes/xfce-evolution/pkg-message b/x11-themes/xfce-evolution/pkg-message
index 9dd9ad129764..7e5b19068691 100644
--- a/x11-themes/xfce-evolution/pkg-message
+++ b/x11-themes/xfce-evolution/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Users of Qt5 programs that need the Gtk2 theme must define an
 environment variable:
 
 	export QT_QPA_PLATFORMTHEME=gtk2
 
 which can be done in your shell's .profile file. 
+EOM
+}
+]
diff --git a/x11-toolkits/Xaw3d/files/pkg-message.in b/x11-toolkits/Xaw3d/files/pkg-message.in
index 524bf4343d50..c45da02646d8 100644
--- a/x11-toolkits/Xaw3d/files/pkg-message.in
+++ b/x11-toolkits/Xaw3d/files/pkg-message.in
@@ -1,8 +1,12 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 If you want Xaw3d to replace the default Athena Widget Set
 so most X applications will get a 3-D look, do this (as root):
 
 cd %%LOCALBASE%%/lib
 mv libXaw.so.%%XAWVER%% libXaw2d.so.%%XAWVER%%
 ln -s libXaw3d.so.%%XAWVER%% libXaw.so.%%XAWVER%%
-*******************************************************************
+EOM
+}
+]
diff --git a/x11-toolkits/irrlicht/files/pkg-message.in b/x11-toolkits/irrlicht/files/pkg-message.in
index a5ce1518ce4f..9e0b110448b7 100644
--- a/x11-toolkits/irrlicht/files/pkg-message.in
+++ b/x11-toolkits/irrlicht/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 The Irrlicht Engine was installed
 
 1) See the complete documentation at:
@@ -11,5 +12,6 @@ The Irrlicht Engine was installed
    %%EXAMPLESDIR%%
 
 3) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/x11-toolkits/iwidgets/files/pkg-message.in b/x11-toolkits/iwidgets/files/pkg-message.in
index 0e115d181b06..0541557ab6e5 100644
--- a/x11-toolkits/iwidgets/files/pkg-message.in
+++ b/x11-toolkits/iwidgets/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Iwidgets is a "mega-widget" set built using itk.  It includes
 a set of megawidgets, installed in %%PREFIX%%/lib/iwidgets4.0.1
 (and symlinked to %%PREFIX%%/lib/iwidgets), a set of man pages
@@ -18,4 +20,6 @@ that are available to you.
 Finally, you may want to read iwidgets.ps (use a Postcript viewer),
 installed in %%DOCSDIR%%, which is a comprehensive
 explanation of iwidgets.
-
+EOM
+}
+]
diff --git a/x11-toolkits/lesstif/pkg-message b/x11-toolkits/lesstif/pkg-message
index 81471bb339f2..669f8684f430 100644
--- a/x11-toolkits/lesstif/pkg-message
+++ b/x11-toolkits/lesstif/pkg-message
@@ -1,3 +1,7 @@
-
+[
+{ type: install
+  message: <<EOM
 Make sure to set HAVE_MOTIF=yes in /etc/make.conf
-
+EOM
+}
+]
diff --git a/x11-toolkits/v/pkg-message b/x11-toolkits/v/pkg-message
index 7b95406b790c..f193d202d01e 100644
--- a/x11-toolkits/v/pkg-message
+++ b/x11-toolkits/v/pkg-message
@@ -1,4 +1,10 @@
+[
+{ type: install
+  message: <<EOM
 Full documentation, many code examples, and the V toolkit for Windows
 systems is available at the V web site:
 
 http://objectcentral.com/
+EOM
+}
+]
diff --git a/x11-toolkits/xview/files/pkg-message.in b/x11-toolkits/xview/files/pkg-message.in
index ebe6857daede..7958f4060021 100644
--- a/x11-toolkits/xview/files/pkg-message.in
+++ b/x11-toolkits/xview/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Please add the following paths to your X11 font path:
 
 %%PREFIX%%/lib/X11/fonts/ol100dpi
@@ -8,4 +11,6 @@ Otherwise you will get the following error:
 XView warning: Cannot load font '-b&h-lucida-medium-r-*-*-*-120-*-*-*-*-*-*' (Font package)
 XView warning: Cannot load font '-b&h-lucida-medium-r-normal-sans-*-120-*-*-*-*-*-*' (Font package)
 XView error: Cannot open connection to window server: :0.0 (Server package)
-
+EOM
+}
+]
diff --git a/x11-wm/bspwm/files/pkg-message.in b/x11-wm/bspwm/files/pkg-message.in
index 73a57ce48b47..21b09864d295 100644
--- a/x11-wm/bspwm/files/pkg-message.in
+++ b/x11-wm/bspwm/files/pkg-message.in
@@ -1,4 +1,6 @@
-#######################################################################
+[
+{ type: install
+  message: <<EOM
 Copy the files bspwmrc and sxhkdrc from %%EXAMPLESDIR%% to
 ~/.config/bspwm/ and ~/.config/sxhkd/ and configure them as you wish.
 
@@ -7,4 +9,6 @@ sxhkd &
 exec bspwm
 
 Then type startx from tty to run bspwm.
-#######################################################################
+EOM
+}
+]
diff --git a/x11-wm/clementine-wm/pkg-message b/x11-wm/clementine-wm/pkg-message
index 1cb3c35e3f66..85fcb3c4a901 100644
--- a/x11-wm/clementine-wm/pkg-message
+++ b/x11-wm/clementine-wm/pkg-message
@@ -1,4 +1,8 @@
-*
-* To customize clementine, copy the keys file to ~/keys and
-* copy one of the look- files to ~/look; edit them as needed.
-*
+[
+{ type: install
+  message: <<EOM
+ To customize clementine, copy the keys file to ~/keys and
+ copy one of the look- files to ~/look; edit them as needed.
+EOM
+}
+]
diff --git a/x11-wm/compiz/pkg-message b/x11-wm/compiz/pkg-message
index b7f68ab5fd79..45690a3f3737 100644
--- a/x11-wm/compiz/pkg-message
+++ b/x11-wm/compiz/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This port has installed compiz-manager which is a wrapper to start
 compiz.
 
@@ -7,3 +10,6 @@ value of:
 desktop->gnome->session->required_components->windowmanager = compiz-manager
 
 This will enable compiz as your default window manager.
+EOM
+}
+]
diff --git a/x11-wm/echinus/files/pkg-message.in b/x11-wm/echinus/files/pkg-message.in
index 9b0087c67d12..69e2bee74f1c 100644
--- a/x11-wm/echinus/files/pkg-message.in
+++ b/x11-wm/echinus/files/pkg-message.in
@@ -1,9 +1,11 @@
-==============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Echinus has been installed.
 
 A standard config file with its pixmaps has been installed to:
  %%PREFIX%%/etc/echinus/
 Copy this folder to ~/.echinus/ and modify the echinusrc as you wish.
-
-==============================================================================
+EOM
+}
+]
diff --git a/x11-wm/enlightenment/files/pkg-message.in b/x11-wm/enlightenment/files/pkg-message.in
index 35367dc85672..95fd7b1b71e7 100644
--- a/x11-wm/enlightenment/files/pkg-message.in
+++ b/x11-wm/enlightenment/files/pkg-message.in
@@ -1,4 +1,6 @@
-********************************************************
+[
+{ type: install
+  message: <<EOM
 NOTE: If you want "Shutdown" and "Restart"
 menu actions to work properly, manually set SUID bit on
 "%%PREFIX%%/lib/enlightenment/utils/enlightenment_sys"
@@ -7,4 +9,6 @@ executable.
 WARNING: this program might be vulnerable so do not
 set suid bit if you do not trust all the users of this 
 machine.
-********************************************************
+EOM
+}
+]
diff --git a/x11-wm/lxsession/files/pkg-message.in b/x11-wm/lxsession/files/pkg-message.in
index c66a2afcdc83..d4c75adf2dd5 100644
--- a/x11-wm/lxsession/files/pkg-message.in
+++ b/x11-wm/lxsession/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To be able to shutdown or reboot your system, you'll have to add .rules
 files in %%LOCALBASE%%/etc/polkit-1/rules.d directory. Which looks
 like this (replace PUTYOURGROUPHERE by your group):
@@ -9,3 +12,6 @@ polkit.addRule(function (action, subject) {
     return polkit.Result.YES;
   }
 });
+EOM
+}
+]
diff --git a/x11-wm/mcwm/pkg-message b/x11-wm/mcwm/pkg-message
index 4dfa4faea19a..92f151ac39d5 100644
--- a/x11-wm/mcwm/pkg-message
+++ b/x11-wm/mcwm/pkg-message
@@ -1,5 +1,6 @@
-****************************************************
-
+[
+{ type: install
+  message: <<EOM
 With default config.h mcwm uses urxvt as terminal.
 
 You can define your own custom config with
@@ -7,5 +8,6 @@ MCWM_CONF=/path/to/mcwm/config.h or you can use
 flags for basic configuration.
 
 See man mcwm(1) for details.
-
-****************************************************
+EOM
+}
+]
diff --git a/x11-wm/obmenu/files/pkg-message.in b/x11-wm/obmenu/files/pkg-message.in
index a5ce8692cb9a..caa28f154be1 100644
--- a/x11-wm/obmenu/files/pkg-message.in
+++ b/x11-wm/obmenu/files/pkg-message.in
@@ -1,5 +1,6 @@
-===============================================================================
-
+[
+{ type: install
+  message: <<EOM
 Obmenu has been installed.
 
 If you don't have ~/.config/openbox/menu.xml
@@ -15,5 +16,6 @@ the Obmenu config can be copied, please type as user:
     exit
 
 Have fun!
-
-===============================================================================
+EOM
+}
+]
diff --git a/x11-wm/pager/pkg-message b/x11-wm/pager/pkg-message
index 26243d27043e..9c275f4ab8ae 100644
--- a/x11-wm/pager/pkg-message
+++ b/x11-wm/pager/pkg-message
@@ -1,7 +1,11 @@
-********************************************************************************
+[
+{ type: install
+  message: <<EOM
 To start the pager at the startup of sawfish add the following to
 your sawfish resource file (e.g. ~/.sawfishrc):
 
   (require 'sawfish.wm.ext.pager)
   (add-hook 'after-initialization-hook pager t)
-********************************************************************************
+EOM
+}
+]
diff --git a/x11-wm/wmfs/files/pkg-message.in b/x11-wm/wmfs/files/pkg-message.in
index 7184a2d69841..86674b214a85 100644
--- a/x11-wm/wmfs/files/pkg-message.in
+++ b/x11-wm/wmfs/files/pkg-message.in
@@ -1,6 +1,10 @@
-
+[
+{ type: install
+  message: <<EOM
 A default wmfsrc has been installed to:
 	%%PREFIX%%/etc/xdg/wmfs/wmfsrc
 
 You may copy it to ~/.config/wmfs and modify it
-
+EOM
+}
+]
diff --git a/x11-wm/xfce4-session/files/pkg-message.in b/x11-wm/xfce4-session/files/pkg-message.in
index 85e1199bdd53..037d0de3ad71 100644
--- a/x11-wm/xfce4-session/files/pkg-message.in
+++ b/x11-wm/xfce4-session/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To be able to shutdown or reboot your system, you'll have to add .rules
 files in %%LOCALBASE%%/etc/polkit-1/rules.d directory. Which looks
 like this (replace PUTYOURGROUPHERE by your group):
@@ -18,3 +21,6 @@ polkit.addRule(function (action, subject) {
     return polkit.Result.YES;
   }
 });
+EOM
+}
+]
diff --git a/x11/cde/files/pkg-message.in b/x11/cde/files/pkg-message.in
index 48ac065295fb..305052fb0389 100644
--- a/x11/cde/files/pkg-message.in
+++ b/x11/cde/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 This is ancient software that is ported for curiosity purposes.  It is
 unlikely to be useful in everyday use, and should not be used in untrusted
 environments as there are highly likely to be unresolved security issues.
@@ -17,3 +20,6 @@ the calendar to work).
 To start the Common Desktop Environment,
 % ln -s %%PREFIX%%/dt/bin/Xsession ~/.Xsession
 % env LANG=C startx
+EOM
+}
+]
diff --git a/x11/deforaos-panel/pkg-message b/x11/deforaos-panel/pkg-message
index eee2afdbfa76..274dae92bbca 100644
--- a/x11/deforaos-panel/pkg-message
+++ b/x11/deforaos-panel/pkg-message
@@ -1,5 +1,9 @@
-======================================================
+[
+{ type: install
+  message: <<EOM
 Note regarding the suspend feature :
 
 Your user need sudo right for executing /usr/sbin/zzz
-======================================================
+EOM
+}
+]
diff --git a/x11/dsbautostart/pkg-message b/x11/dsbautostart/pkg-message
index d7c998c767d9..b51fcb6b4dcf 100644
--- a/x11/dsbautostart/pkg-message
+++ b/x11/dsbautostart/pkg-message
@@ -1,8 +1,10 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Add the following command to your window manager's startup script (e.g.
 ~/.config/openbox/autostart.sh or ~/.fluxbox/startup):
 
 	sh ~/.config/DSB/autostart.sh&
-
-**************************************************************************
+EOM
+}
+]
diff --git a/x11/fluxbg/files/pkg-message.in b/x11/fluxbg/files/pkg-message.in
index 2c122f123e98..ad91f4ff6285 100644
--- a/x11/fluxbg/files/pkg-message.in
+++ b/x11/fluxbg/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Execution of %%PREFIX%%/bin/%%PORTNAME%%_conf is a prerequisite of running
 %%PORTNAME%%!
+EOM
+}
+]
diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message
index 99ecdf8ddfa6..b6d1e4e91f7d 100644
--- a/x11/gdm/pkg-message
+++ b/x11/gdm/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 GDM is installed.
 
 Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm
 hanging or restarting constantly. Instead, add gdm_enable="YES" to
 /etc/rc.conf. GDM will be started automatic on the next reboot.
+EOM
+}
+]
diff --git a/x11/gnome-pie/files/pkg-message.in b/x11/gnome-pie/files/pkg-message.in
index 1fdd40519836..6a900aee24ed 100644
--- a/x11/gnome-pie/files/pkg-message.in
+++ b/x11/gnome-pie/files/pkg-message.in
@@ -1,10 +1,12 @@
-***************************************************************
-
+[
+{ type: install
+  message: <<EOM
 If you do not see any pie, create keyboard shortcuts manually
 binding commands such as:
 
   gnome-pie -o ID
 
 (Open Preferences to take the value of the pie ID)
-
-***************************************************************
+EOM
+}
+]
diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message
index 42f1f2ba077b..47d33bee49d9 100644
--- a/x11/gnome-shell/pkg-message
+++ b/x11/gnome-shell/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Gnome-shell requires acceleration of to work. For this a nvidia card
 with the nvidia-driver, or a Intel/ATI KMS enabled card is needed.
 
@@ -9,3 +12,6 @@ gdm user also needs this access.
 Access can be granted by adding the user(s) to the video group.
 
 % pw groupmod video -m jerry
+EOM
+}
+]
diff --git a/x11/gnome3-lite/pkg-message b/x11/gnome3-lite/pkg-message
index 8dd90c99f3bf..a0b493deeb8d 100644
--- a/x11/gnome3-lite/pkg-message
+++ b/x11/gnome3-lite/pkg-message
@@ -1,5 +1,6 @@
-************************************************************
-
+[
+{ type: install
+  message: <<EOM
 The GNOME 3 desktop Lite edition has been successfully installed.
 
 The Lite edition only includes the minimal components to get a working GNOME 3
@@ -17,5 +18,6 @@ using either their ports or packages.
 
 For more help on using GNOME on FreeBSD, please see the FreeBSD GNOME project
 site at http://www.FreeBSD.org/gnome.
-
-************************************************************
+EOM
+}
+]
diff --git a/x11/gnome3/pkg-message b/x11/gnome3/pkg-message
index a93129857d6b..dc8acef35b33 100644
--- a/x11/gnome3/pkg-message
+++ b/x11/gnome3/pkg-message
@@ -1,8 +1,11 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 Congratulations!  GNOME 3 has been successfully installed on your system.
 For help on starting it up, as well as answers to common questions, and
 some known issues, please see the FreeBSD GNOME homepage at:
 
                        http://www.FreeBSD.org/gnome/
-
-**************************************************************************
+EOM
+}
+]
diff --git a/x11/gsynaptics/pkg-message b/x11/gsynaptics/pkg-message
index fd2bcf2c6bb2..e2c14336b53d 100644
--- a/x11/gsynaptics/pkg-message
+++ b/x11/gsynaptics/pkg-message
@@ -1,7 +1,6 @@
-===============================================================================
-
-			* SETUP NOTE * SETUP NOTE *
-
+[
+{ type: install
+  message: <<EOM
 o Enable "SHMConfig on" in /etc/X11/xorg.conf
   This tools can be used only if "SHMConfig" "on" in the section
   of synaptics driver in /etc/X11/xorg.conf.
@@ -27,5 +26,6 @@ o To use your setting value at each time of starting of Xserver,
   non GNOME users,
     you have to add gsynaptics-init in .xinitrc or
     .xsession.
-
-===============================================================================
+EOM
+}
+]
diff --git a/x11/idesk/files/pkg-message.in b/x11/idesk/files/pkg-message.in
index 598127aaa761..cd54a03c9ad9 100644
--- a/x11/idesk/files/pkg-message.in
+++ b/x11/idesk/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 Idesk was installed
 
 You need to configure idesk before you can use it. A detailed explanation can
@@ -8,5 +9,6 @@ be found in the README file which resides in:
 %%PREFIX%%/share/doc/idesk
 
 Unless you have chosen not to install it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/x11/ipager/files/pkg-message.in b/x11/ipager/files/pkg-message.in
index f5c5cd0337d7..bfc9d48454ef 100644
--- a/x11/ipager/files/pkg-message.in
+++ b/x11/ipager/files/pkg-message.in
@@ -1,10 +1,10 @@
-
-********************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Some additional themes (config files) you may find in the
 %%DATADIR%%/themes directory.
 Just copy any of them instead of your ~./ipager/ipager.conf config
 file or you can define other config file via '-c'" command line option.
-
-********************************************************************************
-
+EOM
+}
+]
diff --git a/x11/keyboardcast/pkg-message b/x11/keyboardcast/pkg-message
index 00cd0a3cdde9..c661d72d2a36 100644
--- a/x11/keyboardcast/pkg-message
+++ b/x11/keyboardcast/pkg-message
@@ -1,5 +1,9 @@
-======================================================================
+[
+{ type: install
+  message: <<EOM
 keyboardcast requires /proc to be mounted!
 
 See man procfs for more information.
-======================================================================
+EOM
+}
+]
diff --git a/x11/keylaunch/files/pkg-message.in b/x11/keylaunch/files/pkg-message.in
index 7220b1551613..8141f7426d91 100644
--- a/x11/keylaunch/files/pkg-message.in
+++ b/x11/keylaunch/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 See %%LOCALBASE%%/share/examples/keylaunch/keylaunch.rc for a sample
 configuration.
+EOM
+}
+]
diff --git a/x11/lumina-core/pkg-message b/x11/lumina-core/pkg-message
index c3742ad9e57c..df59b385e306 100644
--- a/x11/lumina-core/pkg-message
+++ b/x11/lumina-core/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The Lumina Desktop Environment has been installed!
 
 An entry for for launching Lumina from a graphical login manager has already been added to the system, but if you with to start Lumina manually, you will need to do one of the following:
@@ -5,3 +8,6 @@ An entry for for launching Lumina from a graphical login manager has already bee
 2) Put the line "exec start-lumina-desktop" at the end of your user's "~/.xinitrc" file before running startx with any special X11 flags
 
 Also note that the system-wide default settings for Lumina are contained in ${PREFIX}/etc/luminaDesktop.conf[.dist]. While it is possible to customize the desktop to the user's liking after logging in, you may want to adjust the default settings as necessary if there are multiple user accounts on this system.
+EOM
+}
+]
diff --git a/x11/mate-base/pkg-message b/x11/mate-base/pkg-message
index 4264054b795e..7910ec2e781a 100644
--- a/x11/mate-base/pkg-message
+++ b/x11/mate-base/pkg-message
@@ -1,8 +1,11 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 Congratulations!  MATE base has been successfully installed on your system.
 For help on starting it up, as well as answers to common questions, and
 some known issues, please see the FreeBSD GNOME homepage at:
 
                        http://www.FreeBSD.org/gnome/
-
-**************************************************************************
+EOM
+}
+]
diff --git a/x11/mate/pkg-message b/x11/mate/pkg-message
index 4264054b795e..7910ec2e781a 100644
--- a/x11/mate/pkg-message
+++ b/x11/mate/pkg-message
@@ -1,8 +1,11 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 Congratulations!  MATE base has been successfully installed on your system.
 For help on starting it up, as well as answers to common questions, and
 some known issues, please see the FreeBSD GNOME homepage at:
 
                        http://www.FreeBSD.org/gnome/
-
-**************************************************************************
+EOM
+}
+]
diff --git a/x11/mrxvt-devel/files/pkg-message.in b/x11/mrxvt-devel/files/pkg-message.in
index b82045669d94..c0aa31c1b722 100644
--- a/x11/mrxvt-devel/files/pkg-message.in
+++ b/x11/mrxvt-devel/files/pkg-message.in
@@ -1,5 +1,8 @@
-===================================================================================
+[
+{ type: install
+  message: <<EOM
 Sample configuration files have been installed to %%PREFIX%%/etc/mrxvt
 Useful scripts have been installed to %%EXAMPLESDIR%%/scripts
-===================================================================================
-
+EOM
+}
+]
diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in
index 165c50347e48..cba763682db0 100644
--- a/x11/nvidia-driver/files/pkg-message.in
+++ b/x11/nvidia-driver/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use these drivers, make sure that you have loaded the NVidia kernel
 module, by doing
 
@@ -43,3 +46,6 @@ in their /boot/loader.conf or /etc/rc.conf configuration files, depending
 on how they prefer to load NVidia driver kernel module.
 
 See %%DOCSDIR%%/README for more information.
+EOM
+}
+]
diff --git a/x11/plasma5-plasma-workspace/pkg-message b/x11/plasma5-plasma-workspace/pkg-message
index 479c5c01926d..29f14a701406 100644
--- a/x11/plasma5-plasma-workspace/pkg-message
+++ b/x11/plasma5-plasma-workspace/pkg-message
@@ -1,4 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 To start plasma5 via x11/startx add the following to your .xinitrc file:
 
     exec ck-launch-session startkde
-
+EOM
+}
+]
diff --git a/x11/polybar/pkg-message b/x11/polybar/pkg-message
index 6fca0b6858ec..ed6bc5b10f26 100644
--- a/x11/polybar/pkg-message
+++ b/x11/polybar/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Polybar was originally built with Linux in mind, so certain modules do
 not function in FreeBSD.
 
@@ -27,3 +30,6 @@ Unknown:
 - backlight
 - battery
 - xbacklight
+EOM
+}
+]
diff --git a/x11/sddm/pkg-message b/x11/sddm/pkg-message
index 902e8dc954a7..c2a862a36f21 100644
--- a/x11/sddm/pkg-message
+++ b/x11/sddm/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 SDDM does not support login.conf(5), and no special restrictions
 or settings from login.conf are enforced or applied.
+EOM
+}
+]
diff --git a/x11/slim/files/pkg-message.in b/x11/slim/files/pkg-message.in
index 4b3099605586..86d04c9f3562 100644
--- a/x11/slim/files/pkg-message.in
+++ b/x11/slim/files/pkg-message.in
@@ -1,5 +1,6 @@
-*************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Thanks to Nikos Ntarmos, it is now possible to start slim from /etc/ttys.
 Please see %%PREFIX%%/etc/rc.d/slim for instructions on how to do that.
 
@@ -15,5 +16,6 @@ Now you need to put session files in the directory specified by option
 "sessiondir". They should be xdg-style .desktop files.
 The "Name" entry in the session file would be used as session name.
 The "Exec" entry would replace %session in login_cmd.
-
-*************************************************************************
+EOM
+}
+]
diff --git a/x11/urxvt-font-size/files/pkg-message.in b/x11/urxvt-font-size/files/pkg-message.in
index 61c91e6687db..10ba41821705 100644
--- a/x11/urxvt-font-size/files/pkg-message.in
+++ b/x11/urxvt-font-size/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To enable this urxvt extension, modify ~/.Xresources as follows:
 
 URxvt.perl-ext-common: ...,font-size
@@ -10,3 +13,6 @@ The extension automatically binds:
 
 For further customization consult
 %%DOCSDIR%%/README
+EOM
+}
+]
diff --git a/x11/wmbutton/files/pkg-message.in b/x11/wmbutton/files/pkg-message.in
index 12b281e9c352..506de04c8bdd 100644
--- a/x11/wmbutton/files/pkg-message.in
+++ b/x11/wmbutton/files/pkg-message.in
@@ -1,4 +1,8 @@
-*******************************************************************************
+[
+{ type: install
+  message: <<EOM
 Installing .wmbutton as %%PREFIX%%/share/examples/wmbutton/dot.wmbutton
 Modify if you wish and copy to ~/.wmbutton
-*******************************************************************************
+EOM
+}
+]
diff --git a/x11/wmcliphist/files/pkg-message.in b/x11/wmcliphist/files/pkg-message.in
index 6bdae0d079f8..53a31c9d7683 100644
--- a/x11/wmcliphist/files/pkg-message.in
+++ b/x11/wmcliphist/files/pkg-message.in
@@ -1,7 +1,11 @@
----------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Before using this program, edit
 
 %%EXAMPLESDIR%%/wmcliphistrc
 
 and copy it to ~/.wmcliphistrc
----------------------------------------------------------------------
+EOM
+}
+]
diff --git a/x11/wmdrawer/files/pkg-message.in b/x11/wmdrawer/files/pkg-message.in
index 509299bd0eed..c6eefe246c2c 100644
--- a/x11/wmdrawer/files/pkg-message.in
+++ b/x11/wmdrawer/files/pkg-message.in
@@ -1,4 +1,8 @@
-===============================================================================
+[
+{ type: install
+  message: <<EOM
 Use %%DOCSDIR%%/wmdrawerrc.example as a base
 for your ~/.wmdrawerrc
-===============================================================================
+EOM
+}
+]
diff --git a/x11/wmsystemtray/pkg-message b/x11/wmsystemtray/pkg-message
index 2af864fd137c..bddf2cff4a4a 100644
--- a/x11/wmsystemtray/pkg-message
+++ b/x11/wmsystemtray/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 To use wmsystemtray outside of WindowMaker WM, use --non-wmaker flag.
+EOM
+}
+]
diff --git a/x11/xfce4-terminal/files/pkg-message.in b/x11/xfce4-terminal/files/pkg-message.in
index 28d1b26e4de9..5590f07dcb1e 100644
--- a/x11/xfce4-terminal/files/pkg-message.in
+++ b/x11/xfce4-terminal/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Some options could need manual change to ~/.config/xfce4/terminal/terminalrc:
 
 To reduce the height of tabs, add the hidden 'MiscSlimTabs' option:
@@ -15,3 +18,6 @@ in the GUI.
 
 Keep in mind, when you change an option in Preferences window, this file
 is overwritten. 
+EOM
+}
+]
diff --git a/x11/xterm/pkg-message.wchar b/x11/xterm/pkg-message.wchar
index 1de1a06ed8d6..519dc24ac1cb 100644
--- a/x11/xterm/pkg-message.wchar
+++ b/x11/xterm/pkg-message.wchar
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 You installed xterm with wide chars support. This introduces some limitations
 comparing to the plain single chars version: this version of xterm will use
 UTF-8 charset for selection buffers, breaking 8-bit copy/paste support unless
@@ -7,4 +9,6 @@ work as before, use "eightBitSelectTypes" XTerm resource setting.
 
 For further information refer to the SELECT/PASTE section of xterm(1) manual
 page.
-================================================================================
+EOM
+}
+]