From owner-svn-ports-head@freebsd.org  Wed Aug 14 12:14:49 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D224BA9641;
 Wed, 14 Aug 2019 12:14:49 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 467pRs5sLWz4DRq;
 Wed, 14 Aug 2019 12:14:49 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 917F927B79;
 Wed, 14 Aug 2019 12:14:49 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7ECEnwr065487;
 Wed, 14 Aug 2019 12:14:49 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7ECEhTs065451;
 Wed, 14 Aug 2019 12:14:43 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201908141214.x7ECEhTs065451@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 14 Aug 2019 12:14:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r508908 - in head: ports-mgmt/chucky/files
 ports-mgmt/lsknobs/files ports-mgmt/pkg-devel ports-mgmt/pkg-provides/files
 ports-mgmt/pkg_replace/files ports-mgmt/pkgcompare/files ports-mgm...
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: in head: ports-mgmt/chucky/files ports-mgmt/lsknobs/files
 ports-mgmt/pkg-devel ports-mgmt/pkg-provides/files
 ports-mgmt/pkg_replace/files ports-mgmt/pkgcompare/files
 ports-mgmt/portconf/files ports-mg...
X-SVN-Commit-Revision: 508908
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Aug 2019 12:14:49 -0000

Author: mat
Date: Wed Aug 14 12:14:42 2019
New Revision: 508908
URL: https://svnweb.freebsd.org/changeset/ports/508908

Log:
  Convert to UCL & cleanup pkg-message (categories [p-r])

Modified:
  head/ports-mgmt/chucky/files/pkg-message.in   (contents, props changed)
  head/ports-mgmt/lsknobs/files/pkg-message.in   (contents, props changed)
  head/ports-mgmt/pkg-devel/pkg-message   (contents, props changed)
  head/ports-mgmt/pkg-provides/files/pkg-message.in   (contents, props changed)
  head/ports-mgmt/pkg_replace/files/pkg-message.in   (contents, props changed)
  head/ports-mgmt/pkgcompare/files/pkg-message.in   (contents, props changed)
  head/ports-mgmt/portconf/files/pkg-message.in   (contents, props changed)
  head/ports-mgmt/portsreinstall/pkg-message   (contents, props changed)
  head/print/auctex/files/pkg-message.in   (contents, props changed)
  head/print/cloud-print-connector/pkg-message   (contents, props changed)
  head/print/cups-smb-backend/files/pkg-message.in   (contents, props changed)
  head/print/epson-inkjet-printer-escpr/files/pkg-message.in   (contents, props changed)
  head/print/epsonepl/files/pkg-message.in   (contents, props changed)
  head/print/foo2zjs/files/pkg-message.in   (contents, props changed)
  head/print/fpdf/files/pkg-message.in   (contents, props changed)
  head/print/freetype2/files/pkg-message.in   (contents, props changed)
  head/print/ghostscript7-base/pkg-message   (contents, props changed)
  head/print/ghostscript7-commfont/files/pkg-message.in   (contents, props changed)
  head/print/ghostscript8-base/files/pkg-message.in   (contents, props changed)
  head/print/ghostscript9-agpl-base/pkg-message   (contents, props changed)
  head/print/ghostscript9-base/files/pkg-message.in   (contents, props changed)
  head/print/lyx/pkg-message   (contents, props changed)
  head/print/openprinting/pkg-message   (contents, props changed)
  head/print/pmw/files/pkg-message.in   (contents, props changed)
  head/print/pnm2ppa/pkg-message   (contents, props changed)
  head/print/splix/pkg-message   (contents, props changed)
  head/print/yatex/files/pkg-message.in   (contents, props changed)
  head/russian/artwiz-ru/files/pkg-message.in   (contents, props changed)
  head/russian/bugzilla44/pkg-message   (contents, props changed)
  head/russian/emkatic/pkg-message   (contents, props changed)
  head/russian/koi8r-ps/pkg-message   (contents, props changed)
  head/russian/mueller-dic/files/pkg-message.in   (contents, props changed)
  head/russian/stardict-mueller7/files/pkg-message   (contents, props changed)
  head/russian/wordpress/files/pkg-message.in   (contents, props changed)

Modified: head/ports-mgmt/chucky/files/pkg-message.in
==============================================================================
--- head/ports-mgmt/chucky/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/chucky/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/ports-mgmt/lsknobs/files/pkg-message.in
==============================================================================
--- head/ports-mgmt/lsknobs/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/lsknobs/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/ports-mgmt/pkg-devel/pkg-message
==============================================================================
--- head/ports-mgmt/pkg-devel/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/pkg-devel/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -1,3 +1,9 @@
+[
+{ type: install
+  message: <<EOM
 If you are upgrading from the old package format, first run:
 
   # pkg2ng
+EOM
+}
+]

Modified: head/ports-mgmt/pkg-provides/files/pkg-message.in
==============================================================================
--- head/ports-mgmt/pkg-provides/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/pkg-provides/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/ports-mgmt/pkg_replace/files/pkg-message.in
==============================================================================
--- head/ports-mgmt/pkg_replace/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/pkg_replace/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/ports-mgmt/pkgcompare/files/pkg-message.in
==============================================================================
--- head/ports-mgmt/pkgcompare/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/pkgcompare/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/ports-mgmt/portconf/files/pkg-message.in
==============================================================================
--- head/ports-mgmt/portconf/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/portconf/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/ports-mgmt/portsreinstall/pkg-message
==============================================================================
--- head/ports-mgmt/portsreinstall/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/ports-mgmt/portsreinstall/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/auctex/files/pkg-message.in
==============================================================================
--- head/print/auctex/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/auctex/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/cloud-print-connector/pkg-message
==============================================================================
--- head/print/cloud-print-connector/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/cloud-print-connector/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/cups-smb-backend/files/pkg-message.in
==============================================================================
--- head/print/cups-smb-backend/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/cups-smb-backend/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/epson-inkjet-printer-escpr/files/pkg-message.in
==============================================================================
--- head/print/epson-inkjet-printer-escpr/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/epson-inkjet-printer-escpr/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
 # 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
+}
+]

Modified: head/print/epsonepl/files/pkg-message.in
==============================================================================
--- head/print/epsonepl/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/epsonepl/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/foo2zjs/files/pkg-message.in
==============================================================================
--- head/print/foo2zjs/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/foo2zjs/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/fpdf/files/pkg-message.in
==============================================================================
--- head/print/fpdf/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/fpdf/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/freetype2/files/pkg-message.in
==============================================================================
--- head/print/freetype2/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/freetype2/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/ghostscript7-base/pkg-message
==============================================================================
--- head/print/ghostscript7-base/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/ghostscript7-base/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Note: dvipdf script requires dvips program installed by print/tex-dvipsk.
+EOM
+}
+]

Modified: head/print/ghostscript7-commfont/files/pkg-message.in
==============================================================================
--- head/print/ghostscript7-commfont/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/ghostscript7-commfont/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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 follow
 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
+}
+]

Modified: head/print/ghostscript8-base/files/pkg-message.in
==============================================================================
--- head/print/ghostscript8-base/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/ghostscript8-base/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/ghostscript9-agpl-base/pkg-message
==============================================================================
--- head/print/ghostscript9-agpl-base/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/ghostscript9-agpl-base/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/ghostscript9-base/files/pkg-message.in
==============================================================================
--- head/print/ghostscript9-base/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/ghostscript9-base/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/lyx/pkg-message
==============================================================================
--- head/print/lyx/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/lyx/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/openprinting/pkg-message
==============================================================================
--- head/print/openprinting/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/openprinting/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/pmw/files/pkg-message.in
==============================================================================
--- head/print/pmw/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/pmw/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/pnm2ppa/pkg-message
==============================================================================
--- head/print/pnm2ppa/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/pnm2ppa/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/print/splix/pkg-message
==============================================================================
--- head/print/splix/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/splix/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -1,15 +1,33 @@
-  +=======================================================================+
-  |                  !!!      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
+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
+}
+{ 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"
@@ -22,3 +40,6 @@ directory. Install them with the command:
                 (Then use MANUFACTURER=samsung)
 
                 http://splix.ap2c.org/samsung_cms.tar.bz2
+EOM
+}
+]

Modified: head/print/yatex/files/pkg-message.in
==============================================================================
--- head/print/yatex/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/print/yatex/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/russian/artwiz-ru/files/pkg-message.in
==============================================================================
--- head/russian/artwiz-ru/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/artwiz-ru/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/russian/bugzilla44/pkg-message
==============================================================================
--- head/russian/bugzilla44/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/bugzilla44/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/russian/emkatic/pkg-message
==============================================================================
--- head/russian/emkatic/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/emkatic/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To enable PC speaker sound output support, install `audio/beep' package or
 from the ports.
+EOM
+}
+]

Modified: head/russian/koi8r-ps/pkg-message
==============================================================================
--- head/russian/koi8r-ps/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/koi8r-ps/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/russian/mueller-dic/files/pkg-message.in
==============================================================================
--- head/russian/mueller-dic/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/mueller-dic/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -1,4 +1,8 @@
-==============================================
+[
+{ type: install
+  message: <<EOM
 You can look up a word at the dictionary with:
 %%PREFIX%%/bin/mueller word
-==============================================
+EOM
+}
+]

Modified: head/russian/stardict-mueller7/files/pkg-message
==============================================================================
--- head/russian/stardict-mueller7/files/pkg-message	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/stardict-mueller7/files/pkg-message	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]

Modified: head/russian/wordpress/files/pkg-message.in
==============================================================================
--- head/russian/wordpress/files/pkg-message.in	Wed Aug 14 10:53:15 2019	(r508907)
+++ head/russian/wordpress/files/pkg-message.in	Wed Aug 14 12:14:42 2019	(r508908)
@@ -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
+}
+]