14 files changed, 84 insertions, 30 deletions

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
+}
+]