From d2f3167e02df98ddbed29cbbc2c5ada42eb80e27 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 14 Aug 2019 12:14:42 +0000
Subject: [PATCH] Convert to UCL & cleanup pkg-message (categories [p-r])

---
 ports-mgmt/chucky/files/pkg-message.in        | 14 +++----
 ports-mgmt/lsknobs/files/pkg-message.in       |  6 +++
 ports-mgmt/pkg-devel/pkg-message              |  6 +++
 ports-mgmt/pkg-provides/files/pkg-message.in  | 14 +++++--
 ports-mgmt/pkg_replace/files/pkg-message.in   | 10 +++--
 ports-mgmt/pkgcompare/files/pkg-message.in    | 14 +++----
 ports-mgmt/portconf/files/pkg-message.in      | 14 ++++---
 ports-mgmt/portsreinstall/pkg-message         |  8 +++-
 print/auctex/files/pkg-message.in             | 10 +++--
 print/cloud-print-connector/pkg-message       |  6 +++
 print/cups-smb-backend/files/pkg-message.in   |  6 +++
 .../files/pkg-message.in                      |  7 +++-
 print/epsonepl/files/pkg-message.in           | 10 +++--
 print/foo2zjs/files/pkg-message.in            | 10 +++--
 print/fpdf/files/pkg-message.in               |  6 +++
 print/freetype2/files/pkg-message.in          |  6 +++
 print/ghostscript7-base/pkg-message           |  6 +++
 .../files/pkg-message.in                      |  8 +++-
 print/ghostscript8-base/files/pkg-message.in  |  8 +++-
 print/ghostscript9-agpl-base/pkg-message      |  6 +++
 print/ghostscript9-base/files/pkg-message.in  |  8 +++-
 print/lyx/pkg-message                         | 13 ++++--
 print/openprinting/pkg-message                | 14 +++----
 print/pmw/files/pkg-message.in                | 10 +++--
 print/pnm2ppa/pkg-message                     |  6 +++
 print/splix/pkg-message                       | 41 ++++++++++++++-----
 print/yatex/files/pkg-message.in              |  7 +++-
 russian/artwiz-ru/files/pkg-message.in        |  8 +++-
 russian/bugzilla44/pkg-message                |  8 +++-
 russian/emkatic/pkg-message                   |  6 +++
 russian/koi8r-ps/pkg-message                  |  6 +++
 russian/mueller-dic/files/pkg-message.in      |  8 +++-
 russian/stardict-mueller7/files/pkg-message   | 10 +++--
 russian/wordpress/files/pkg-message.in        |  7 +++-
 34 files changed, 243 insertions(+), 84 deletions(-)

diff --git a/ports-mgmt/chucky/files/pkg-message.in b/ports-mgmt/chucky/files/pkg-message.in
index f60c5fd85de6..e16c35069467 100644
--- a/ports-mgmt/chucky/files/pkg-message.in
+++ b/ports-mgmt/chucky/files/pkg-message.in
@@ -1,14 +1,12 @@
-************************************************************************
-
-NOTICE
-
+[
+{ type: install
+  message: <<EOM
 man page is installed in %%MAN7PREFIX%%/man/man7, if you do not yet
 have the configuration in /etc/man.conf, add
 
 MANPATH /usr/local/share/man
 
 to view all man pages which are installed in /usr/local/share/man/manX/
-
-
-************************************************************************
-
+EOM
+}
+]
diff --git a/ports-mgmt/lsknobs/files/pkg-message.in b/ports-mgmt/lsknobs/files/pkg-message.in
index 0c0b94674483..314b840a5954 100644
--- a/ports-mgmt/lsknobs/files/pkg-message.in
+++ b/ports-mgmt/lsknobs/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 Typical use :
 
   1) Choose a port
@@ -10,3 +13,6 @@ Typical use :
 
   3) Install everything
 # make install clean
+EOM
+}
+]
diff --git a/ports-mgmt/pkg-devel/pkg-message b/ports-mgmt/pkg-devel/pkg-message
index 26542252dfaa..7bc049d0ca7f 100644
--- a/ports-mgmt/pkg-devel/pkg-message
+++ b/ports-mgmt/pkg-devel/pkg-message
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 If you are upgrading from the old package format, first run:
 
   # pkg2ng
+EOM
+}
+]
diff --git a/ports-mgmt/pkg-provides/files/pkg-message.in b/ports-mgmt/pkg-provides/files/pkg-message.in
index 0a0b89a6b70c..d9bd915293cd 100644
--- a/ports-mgmt/pkg-provides/files/pkg-message.in
+++ b/ports-mgmt/pkg-provides/files/pkg-message.in
@@ -1,4 +1,6 @@
-  ======================= pkg plugin activation ========================
+[
+{ type: install
+  message: <<EOM
   In order to use the pkg-provides plugin you need to enable plugins in pkg.
   To do this, uncomment the following lines in %%LOCALBASE%%/etc/pkg.conf file
   and add pkg-provides to the supported plugin list
@@ -8,7 +10,11 @@
   PLUGINS [ provides ];
 
   After that run `pkg plugins' to see the plugins handled by pkg`.
-
+EOM
+}
+{ type: upgrade
+  message: <<EOM
   To update the provides database run `pkg provides -u`
-
-  ====================================================================
+EOM
+}
+]
diff --git a/ports-mgmt/pkg_replace/files/pkg-message.in b/ports-mgmt/pkg_replace/files/pkg-message.in
index 24b1317a6fab..82afa571bead 100644
--- a/ports-mgmt/pkg_replace/files/pkg-message.in
+++ b/ports-mgmt/pkg_replace/files/pkg-message.in
@@ -1,9 +1,10 @@
-!!! ATTENTION !!!
-
+[
+{ type: install
+  message: <<EOM
 pkg_replace options changed. For more information,
 refer to pkg_replace(1).
 
------------------------------------------------------
+
 You can use various features.
 
 -IGNORE, USE_PKGS
@@ -14,3 +15,6 @@ See examples in %%ETCDIR%%/pkg_replace.conf.sample.
 
 If you want to use those features,
 edit "%%ETCDIR%%/pkg_replace.conf".
+EOM
+}
+]
diff --git a/ports-mgmt/pkgcompare/files/pkg-message.in b/ports-mgmt/pkgcompare/files/pkg-message.in
index cc9fde9adae1..7cb8a33e9493 100644
--- a/ports-mgmt/pkgcompare/files/pkg-message.in
+++ b/ports-mgmt/pkgcompare/files/pkg-message.in
@@ -1,14 +1,12 @@
-************************************************************************
-
-NOTICE
-
+[
+{ type: install
+  message: <<EOM
 man page is installed in %%LOCALBASE%%/man/man8, if you do not yet
 have the configuration in /etc/manpath.config, add
 
 OPTIONAL_MANPATH        %%LOCALBASE%%/man
 
 to view all man pages which are installed in /usr/local/man/manX/
-
-
-************************************************************************
-
+EOM
+}
+]
diff --git a/ports-mgmt/portconf/files/pkg-message.in b/ports-mgmt/portconf/files/pkg-message.in
index 37ee60ebb7db..015a2d4eadbc 100644
--- a/ports-mgmt/portconf/files/pkg-message.in
+++ b/ports-mgmt/portconf/files/pkg-message.in
@@ -1,10 +1,11 @@
-*********************************************************
-
+[
+{ type: install
+  message: <<EOM
 To set port-specific make variables, create the
 %%PREFIX%%/etc/ports.conf configuration file
 with the following syntax:
 
----------------------------------------------------------
+
 # this is a comment
 *: NOPORTDOCS
 editors/openoffice-3: WITH_CCACHE|LOCALIZED_LANG=it
@@ -12,11 +13,12 @@ print/ghostscript-* print/lpr-wrapper: A4
 sysutils/fusefs-kmod*: !KERNCONF | !NOPORTDOCS
 www/firefox-i18n: WITHOUT_SWITCHER | FIREFOX_I18N=fr it
 x11/fakeport: CONFIGURE_ARGS=--with-modules="aaa bbb ccc"
----------------------------------------------------------
+
 
 Global port directory patterns and blanks around the
 pipe "|" symbol are allowed.
 Values shouldn't be quoted even if they contain spaces.
 Lines beginning with a '#' are comments.
-
-*********************************************************
+EOM
+}
+]
diff --git a/ports-mgmt/portsreinstall/pkg-message b/ports-mgmt/portsreinstall/pkg-message
index 357adc44b792..77543c9e667d 100644
--- a/ports-mgmt/portsreinstall/pkg-message
+++ b/ports-mgmt/portsreinstall/pkg-message
@@ -1,6 +1,10 @@
-=====================================================================
+[
+{ type: install
+  message: <<EOM
 This software invokes some installed files of portupgrade(1)
 if it is installed for parsing pkgtools.conf(5) although dependency
 to it is intendedly refrained. If you fail to parse pkgtools.conf(5),
 try to upgrade this port first.
-=====================================================================
+EOM
+}
+]
diff --git a/print/auctex/files/pkg-message.in b/print/auctex/files/pkg-message.in
index b1d48843ada9..6365c6208765 100644
--- a/print/auctex/files/pkg-message.in
+++ b/print/auctex/files/pkg-message.in
@@ -1,5 +1,6 @@
-Customizing
-===========
+[
+{ type: install
+  message: <<EOM
    You should edit the file
 `%%PREFIX%%/share/emacs/site-lisp/tex-site.el' to fit your local site.
 You do this by looking at the customization section in the beginning
@@ -13,11 +14,14 @@ all your customizations.
    You probably want to copy and edit `TeX-printer-list' to contain the
 printers available at your site.
 
+
 Enabling AUC TeX
-================
    You can now tell your users to enable AUC TeX by adding
 
      (load "auctex.el" nil t t)
      (load "preview-latex.el" nil t t)
 
 to their `~/.emacs' file.
+EOM
+}
+]
diff --git a/print/cloud-print-connector/pkg-message b/print/cloud-print-connector/pkg-message
index 86f1a9c18d46..dc7f9a07c652 100644
--- a/print/cloud-print-connector/pkg-message
+++ b/print/cloud-print-connector/pkg-message
@@ -1,6 +1,12 @@
+[
+{ type: install
+  message: <<EOM
 Run the following command to create a config file called gcp-cups-connector.config.json before the starting service:
 
 # gcp-connector-util init --log-file-name "/var/log/cloud-print-connectord"
 # mv /root/gcp-cups-connector.config.json /usr/local/etc/gcp-cups-connector.config.json
 
 More info at: https://github.com/google/cloud-print-connector/wiki/Configuration
+EOM
+}
+]
diff --git a/print/cups-smb-backend/files/pkg-message.in b/print/cups-smb-backend/files/pkg-message.in
index 02f336ddda79..e9c557016e15 100644
--- a/print/cups-smb-backend/files/pkg-message.in
+++ b/print/cups-smb-backend/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 CUPS smb backend is now installed.
 
 Please configure your samba environment if
@@ -15,3 +18,6 @@ smb://username:password@workgroup/server/printer
 
 But a CUPS article describes another syntax,
 so beware.
+EOM
+}
+]
diff --git a/print/epson-inkjet-printer-escpr/files/pkg-message.in b/print/epson-inkjet-printer-escpr/files/pkg-message.in
index fce00a4ec049..a5a828058431 100644
--- a/print/epson-inkjet-printer-escpr/files/pkg-message.in
+++ b/print/epson-inkjet-printer-escpr/files/pkg-message.in
@@ -1,4 +1,6 @@
-
+[
+{ type: install
+  message: <<EOM
 Examples to add printer for EP-803AW
 Start cupsd and then do the following:
 
@@ -17,3 +19,6 @@ lpadmin -p EPSON_EP-803AW -m "`lpinfo --make-and-model 'EPSON EP-803A' -m | cut
 # The printer joined network (using port 9100)
 
 lpadmin -p EPSON_EP-803AW -m "`lpinfo --make-and-model 'EPSON EP-803A' -m | cut -f 1 -w | grep escpr | head -n 1`" -v 'socket://192.0.2.100:9100' -D 'EPSON EP-803AW (RAW)' -E
+EOM
+}
+]
diff --git a/print/epsonepl/files/pkg-message.in b/print/epsonepl/files/pkg-message.in
index 46181226bb3d..9a0479643278 100644
--- a/print/epsonepl/files/pkg-message.in
+++ b/print/epsonepl/files/pkg-message.in
@@ -1,9 +1,11 @@
--------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 You need to copy and customize
 %%PREFIX%%/etc/epsonepl.conf[.sample]
 
 If you're using apsfilter then have a look
 at %%DATADIR%%/epsonepl.apsfilter
-
--------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/print/foo2zjs/files/pkg-message.in b/print/foo2zjs/files/pkg-message.in
index 7775adb5e060..fc9db3195d96 100644
--- a/print/foo2zjs/files/pkg-message.in
+++ b/print/foo2zjs/files/pkg-message.in
@@ -1,5 +1,6 @@
-###############################################################################
-
+[
+{ type: install
+  message: <<EOM
 1) Please read the detailed installation instructions in the file:
 
    * %%DOCSDIR%%/INSTALL
@@ -19,5 +20,6 @@
    and restart devd.
 
 5) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/print/fpdf/files/pkg-message.in b/print/fpdf/files/pkg-message.in
index f104876c6c59..0da40e076ffe 100644
--- a/print/fpdf/files/pkg-message.in
+++ b/print/fpdf/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 You should add the FPDF path %%PREFIX%%/%%FPDF_DIR%%
 to the "include_path=" directive in your php.ini.
+EOM
+}
+]
diff --git a/print/freetype2/files/pkg-message.in b/print/freetype2/files/pkg-message.in
index 06c3909fcf04..fb3d65f9d16a 100644
--- a/print/freetype2/files/pkg-message.in
+++ b/print/freetype2/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 The 2.7.x series now uses the new subpixel hinting mode (V40 port's option) as
 the default, emulating a modern version of ClearType. This change inevitably
 leads to different rendering results, and you might change port's options to
@@ -28,3 +31,6 @@ if needed:
 The controllable properties are listed in the section "Controlling FreeType
 Modules" in the reference's table of contents
 (%%DOCSDIR%%/reference/site/index.html, if documentation was installed).
+EOM
+}
+]
diff --git a/print/ghostscript7-base/pkg-message b/print/ghostscript7-base/pkg-message
index bfeb977fcb01..db72e9696830 100644
--- a/print/ghostscript7-base/pkg-message
+++ b/print/ghostscript7-base/pkg-message
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Note: dvipdf script requires dvips program installed by print/tex-dvipsk.
+EOM
+}
+]
diff --git a/print/ghostscript7-commfont/files/pkg-message.in b/print/ghostscript7-commfont/files/pkg-message.in
index 34170fbf1815..8905df8592b9 100644
--- a/print/ghostscript7-commfont/files/pkg-message.in
+++ b/print/ghostscript7-commfont/files/pkg-message.in
@@ -1,5 +1,6 @@
-=== NOTE ===
-
+[
+{ type: install
+  message: <<EOM
 The CJK font selection will be performed in the following order:
 
  1. %%PREFIX%%/%%GS_RESDIR%%/Font/<fontname>
@@ -11,3 +12,6 @@ The CJK font selection will be performed in the following order:
 So, to use CIDFnmap you have to make sure that there is no font file that
 has the same name as you want to customize in Resource/Font and
 Resource/CIDFont.
+EOM
+}
+]
diff --git a/print/ghostscript8-base/files/pkg-message.in b/print/ghostscript8-base/files/pkg-message.in
index ff7c18d05a86..846b4f8a1868 100644
--- a/print/ghostscript8-base/files/pkg-message.in
+++ b/print/ghostscript8-base/files/pkg-message.in
@@ -1,5 +1,11 @@
-Note: in order to use the script "dvipdf", dvips must be installed.
+[
+{ type: install
+  message: <<EOM
+In order to use the script "dvipdf", dvips must be installed.
 This program is provided by another package print/tex-dvipsk.
 
 FAPIfontmap and FAPIcidfmap in %%DATADIR%%/Resource/Init
 have to be configured if you want to use FAPI feature.
+EOM
+}
+]
diff --git a/print/ghostscript9-agpl-base/pkg-message b/print/ghostscript9-agpl-base/pkg-message
index b33f90c366fd..b8b347553512 100644
--- a/print/ghostscript9-agpl-base/pkg-message
+++ b/print/ghostscript9-agpl-base/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 This package installs a script named dvipdf that depends on dvips.  If you
 want to use this script you need to install print/tex-dvipsk.
+EOM
+}
+]
diff --git a/print/ghostscript9-base/files/pkg-message.in b/print/ghostscript9-base/files/pkg-message.in
index ff7c18d05a86..846b4f8a1868 100644
--- a/print/ghostscript9-base/files/pkg-message.in
+++ b/print/ghostscript9-base/files/pkg-message.in
@@ -1,5 +1,11 @@
-Note: in order to use the script "dvipdf", dvips must be installed.
+[
+{ type: install
+  message: <<EOM
+In order to use the script "dvipdf", dvips must be installed.
 This program is provided by another package print/tex-dvipsk.
 
 FAPIfontmap and FAPIcidfmap in %%DATADIR%%/Resource/Init
 have to be configured if you want to use FAPI feature.
+EOM
+}
+]
diff --git a/print/lyx/pkg-message b/print/lyx/pkg-message
index dcb75149357e..21027de69091 100644
--- a/print/lyx/pkg-message
+++ b/print/lyx/pkg-message
@@ -1,9 +1,16 @@
+[
+{ type: install
+  message: <<EOM
 For LyX to work you need to install some kind of TeX distribution. See the
 print/texlive-* ports in the ports tree.
-
-***
-
+EOM
+}
+{ type: upgrade, maximum_version: 2
+  message: <<EOM
 As of version 2.0.0, LyX depends on the textproc/mythes ports for
 thesaurus support. Even though the LyX port depends on textproc/mythes,
 it is up to the user to install the thesaurus ports for her languages
 of preference.
+EOM
+}
+]
diff --git a/print/openprinting/pkg-message b/print/openprinting/pkg-message
index 61d840c9b1ba..24a40cfdc237 100644
--- a/print/openprinting/pkg-message
+++ b/print/openprinting/pkg-message
@@ -1,11 +1,9 @@
-==================================================================
-
-USE THIS PORT STRICTLY AT YOUR OWN RISK!
-
+[
+{ type: install
+  message: <<EOM
 The mod_ipp module dumps core, and the psm_cups.so does not
 compile with these sources as shipped. Therefore, this port
 defaults to shipping the include files and libraries only.
-
-USE THIS PORT STRICTLY AT YOUR OWN RISK!
-
-==================================================================
+EOM
+}
+]
diff --git a/print/pmw/files/pkg-message.in b/print/pmw/files/pkg-message.in
index 32423e3862e7..d10f7b21e757 100644
--- a/print/pmw/files/pkg-message.in
+++ b/print/pmw/files/pkg-message.in
@@ -1,5 +1,6 @@
----------------------------------------------------------------------------
-
+[
+{ type: install
+  message: <<EOM
 If you wish to use ghostview to view or print the Postscript output
 from PMW, then you need to create symlinks for the font files:
 
@@ -9,5 +10,6 @@ and also add the following line to
 %%LOCALBASE%%/share/ghostscript/x.xx/lib/Fontmap.GS
 
     /PMW-Music		(PMW-Music.pfa) ;
-
----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/print/pnm2ppa/pkg-message b/print/pnm2ppa/pkg-message
index 744c5cc990eb..7d3bf4ac50bc 100644
--- a/print/pnm2ppa/pkg-message
+++ b/print/pnm2ppa/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To configure your printcap to print either ascii"
 or Postscript files, add the following lines to your"
 /etc/printcap file"
@@ -15,3 +18,6 @@ or Postscript files, add the following lines to your"
 	        :if=/usr/local/bin/ppafilter:\\"
 	        :mx#0:\\"
 	        :sh:"
+EOM
+}
+]
diff --git a/print/splix/pkg-message b/print/splix/pkg-message
index 3b7af4afa6b4..37ba85d04770 100644
--- a/print/splix/pkg-message
+++ b/print/splix/pkg-message
@@ -1,14 +1,7 @@
-  +=======================================================================+
-  |                  !!!      IMPORTANT NOTICE      !!!                   |
-  +=======================================================================+
-  |      If you are upgrading your current version, you MUST delete       |
-  |     your printer in the CUPS interface and install it again. This     |
-  |   operation MUST be done since CUPS make a copy of the PPD file and   |
-  |                this file is modified between versions.                |
-  +=======================================================================+
-
+[
+{ type: install
+  message: <<EOM
 Installation of the color profile for color printers:
------------------------------------------------------
 
         Color printers needs color profile files to get better results. These
 files are provided by your printer manufacturer and you have to install them
@@ -22,3 +15,31 @@ directory. Install them with the command:
                 (Then use MANUFACTURER=samsung)
 
                 http://splix.ap2c.org/samsung_cms.tar.bz2
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+        If you are upgrading your current version, you MUST delete
+       your printer in the CUPS interface and install it again. This
+     operation MUST be done since CUPS make a copy of the PPD file and
+                  this file is modified between versions.
+
+
+Installation of the color profile for color printers:
+
+
+        Color printers needs color profile files to get better results. These
+files are provided by your printer manufacturer and you have to install them
+manually. To do that, download the linux official drivers and locate the "cms"
+directory. Install them with the command:
+
+                # make installcms CMSDIR=/path/to/cms/directory \
+                        MANUFACTURER=samsung or xerox or dell
+
+        Samsung color profile files are available at:
+                (Then use MANUFACTURER=samsung)
+
+                http://splix.ap2c.org/samsung_cms.tar.bz2
+EOM
+}
+]
diff --git a/print/yatex/files/pkg-message.in b/print/yatex/files/pkg-message.in
index 56a190734d6f..6a75aab61905 100644
--- a/print/yatex/files/pkg-message.in
+++ b/print/yatex/files/pkg-message.in
@@ -1,4 +1,6 @@
-==============================================================================
+[
+{ type: install
+  message: <<EOM
 To use YaTeX, add the next line into your .emacs:
 
     (require 'yatex-startup)
@@ -6,3 +8,6 @@ To use YaTeX, add the next line into your .emacs:
 yatex-startup.el in %%PREFIX%%/%%EMACS_SITE_LISPDIR%% also includes
 configuration examples.  To get more information, see the info file
 of YaTeX.
+EOM
+}
+]
diff --git a/russian/artwiz-ru/files/pkg-message.in b/russian/artwiz-ru/files/pkg-message.in
index 98a60b220247..f8ad68cf156e 100644
--- a/russian/artwiz-ru/files/pkg-message.in
+++ b/russian/artwiz-ru/files/pkg-message.in
@@ -1,4 +1,6 @@
-============================================================
+[
+{ type: install
+  message: <<EOM
 You'll have to add LOCALBASE/share/fonts/artwiz-ru
 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/russian/bugzilla44/pkg-message b/russian/bugzilla44/pkg-message
index 356e24d70c10..bb73c50db899 100644
--- a/russian/bugzilla44/pkg-message
+++ b/russian/bugzilla44/pkg-message
@@ -1,5 +1,9 @@
-==========================================================================
+[
+{ type: install
+  message: <<EOM
   Russian localization for Bugzilla has now been installed.
 
   Please run "checksetup.pl" to re-generate templates.
-==========================================================================
+EOM
+}
+]
diff --git a/russian/emkatic/pkg-message b/russian/emkatic/pkg-message
index 9eae275f84e5..885ed6cd228d 100644
--- a/russian/emkatic/pkg-message
+++ b/russian/emkatic/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To enable PC speaker sound output support, install `audio/beep' package or
 from the ports.
+EOM
+}
+]
diff --git a/russian/koi8r-ps/pkg-message b/russian/koi8r-ps/pkg-message
index 018a93b65843..e2f8466c4128 100644
--- a/russian/koi8r-ps/pkg-message
+++ b/russian/koi8r-ps/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 	This  port  tries  to patch  the  GhostScript's  Fontmap
 	automaticly, so unless you have non-standard GhostScript
 	installation   (or   if    you   installed   GhostScript
@@ -25,3 +28,6 @@
 	on PostScript printers --  they use their own PostScript
 	engines  (not GhostScript).  The port  russian/koify may
 	help you with those.
+EOM
+}
+]
diff --git a/russian/mueller-dic/files/pkg-message.in b/russian/mueller-dic/files/pkg-message.in
index 66134ea3c9da..7fbc8c6ce8cb 100644
--- a/russian/mueller-dic/files/pkg-message.in
+++ b/russian/mueller-dic/files/pkg-message.in
@@ -1,4 +1,8 @@
-==============================================
+[
+{ type: install
+  message: <<EOM
 You can look up a word at the dictionary with:
 %%PREFIX%%/bin/mueller word
-==============================================
+EOM
+}
+]
diff --git a/russian/stardict-mueller7/files/pkg-message b/russian/stardict-mueller7/files/pkg-message
index d58f28ee0adb..dd306adbb801 100644
--- a/russian/stardict-mueller7/files/pkg-message
+++ b/russian/stardict-mueller7/files/pkg-message
@@ -1,10 +1,12 @@
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 This dictionary can be used with any of the following dictionary
 programs (consider to install one of them):
 
 textproc/goldendict	Goldendict (Qt4)
 textproc/qstardict	StarDict clone (Qt4)
 textproc/stardict3	StarDict 3.x (GTK2)
-
-=====================================================================
+EOM
+}
+]
diff --git a/russian/wordpress/files/pkg-message.in b/russian/wordpress/files/pkg-message.in
index a3c01e1be0d6..1ed45373bff3 100644
--- a/russian/wordpress/files/pkg-message.in
+++ b/russian/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 to 3.x, please run
 http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
+EOM
+}
+]