Convert to UCL & cleanup pkg-message (categories a-c)

24 files changed, 144 insertions, 67 deletions

diff --git a/chinese/CNS11643-font/pkg-message b/chinese/CNS11643-font/pkg-message
index 51b0bf5f1001..f6c6ef45b615 100644
--- a/chinese/CNS11643-font/pkg-message
+++ b/chinese/CNS11643-font/pkg-message
@@ -1,5 +1,11 @@
+[
+{ type: install
+  message: <<EOM
 Copyright (c) 2012 RDEC, Executive Yuan, ROC.
 
 These fonts are licensed under Creative Commons Attribution-NoDerivs 3.0
 Taiwan License, and allowed for redistribution, as long as they are passed
 along unchanged with the original font name and copyright notice.
+EOM
+}
+]
diff --git a/chinese/auto-cn-l10n/files/pkg-message.in b/chinese/auto-cn-l10n/files/pkg-message.in
index 1f3ed074302c..de2f864a572c 100644
--- a/chinese/auto-cn-l10n/files/pkg-message.in
+++ b/chinese/auto-cn-l10n/files/pkg-message.in
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 English Instructions:
  Please tell your users to merge their old dotfiles with the new ones, in
     %%PREFIX%%/share/skel/zh_CN.eucCN/dot.*
@@ -15,6 +16,6 @@ English Instructions:
 
  如果以后需要新增用户,请用类似以下的方式:
     # adduser -k %%PREFIX%%/share/skel/zh_CN.eucCN
-
-**************************************************************************
-
+EOM
+}
+]
diff --git a/chinese/auto-tw-l10n/files/pkg-message.in b/chinese/auto-tw-l10n/files/pkg-message.in
index be95885510e9..5d9170831fdf 100644
--- a/chinese/auto-tw-l10n/files/pkg-message.in
+++ b/chinese/auto-tw-l10n/files/pkg-message.in
@@ -1,5 +1,6 @@
-**************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 English Instructions:
  Please tell your users to merge their old dotfiles with the new ones, in
  	%%PREFIX%%/share/skel/zh_TW.UTF-8/dot.*
@@ -21,5 +22,6 @@ English Instructions:
 
  鏈�寰岋紝璜嬪弮鑰冧笅闈㈤�欐獢妗堜締淇敼 /etc/make.conf 浠ュ仛鏇村ソ鐨勮ō瀹氾細
  ==> %%PREFIX%%/share/skel/zh_TW.UTF-8/make.conf
-
-**************************************************************************
+EOM
+}
+]
diff --git a/chinese/big5width/pkg-message b/chinese/big5width/pkg-message
index e2f157d9fb78..aedf4e4db24c 100644
--- a/chinese/big5width/pkg-message
+++ b/chinese/big5width/pkg-message
@@ -1,5 +1,9 @@
-==
+[
+{ type: install
+  message: <<EOM
 Because FreeBSD's installworld target cleans all locale
 stuffs up, you'll need to reinstall the port after every
 installworld operations.
-==
+EOM
+}
+]
diff --git a/chinese/dictd-database/files/pkg-message.in b/chinese/dictd-database/files/pkg-message.in
index a51994b04156..8c716b1df1bb 100644
--- a/chinese/dictd-database/files/pkg-message.in
+++ b/chinese/dictd-database/files/pkg-message.in
@@ -1,5 +1,6 @@
-*****************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You need to add following to /etc/rc.conf:
 
 dictd_flags="--locale zh_TW.UTF-8"
@@ -14,5 +15,6 @@ database pydict    { data "%%PREFIX%%/lib/dict/pydict.dict.dz"
                      index "%%PREFIX%%/lib/dict/pydict.index" }
 database cedict    { data "%%PREFIX%%/lib/dict/cedict.dict.dz"
                      index "%%PREFIX%%/lib/dict/cedict.index" }
-
-*****************************************************************************
+EOM
+}
+]
diff --git a/chinese/enscript/pkg-message b/chinese/enscript/pkg-message
index 958b02db33ba..ce58908ad157 100644
--- a/chinese/enscript/pkg-message
+++ b/chinese/enscript/pkg-message
@@ -1,8 +1,12 @@
-========================================================================
+[
+{ type: install
+  message: <<EOM
 For BIG5 users, use commands like this to generate PS documents:
 
 enscript -X big5 -f ShanHeiSun-Light-B5pc-H@12 -o [output.ps] [file]
 
 Make sure to use those fonts having "B5pc" in their names.
 If you don't have them, install chinese/arphicttf with WANT_GS=yes.
-========================================================================
+EOM
+}
+]
diff --git a/chinese/fandol/files/pkg-message.in b/chinese/fandol/files/pkg-message.in
index 8500b4de3597..179ae1205f0e 100644
--- a/chinese/fandol/files/pkg-message.in
+++ b/chinese/fandol/files/pkg-message.in
@@ -1,4 +1,6 @@
-**************************************************************************
+[
+{ type: install
+  message: <<EOM
 For old programs that use XLFD, please add %%FONTSDIR%%
 to your X server either by:
 
@@ -14,5 +16,6 @@ Section "Files"
     FontPath   "%%FONTSDIR%%"
 ...
 EndSection
-
-**************************************************************************
+EOM
+}
+]
diff --git a/chinese/fcitx-sunpinyin/pkg-message b/chinese/fcitx-sunpinyin/pkg-message
index af2284019076..bbdb50c0a1e5 100644
--- a/chinese/fcitx-sunpinyin/pkg-message
+++ b/chinese/fcitx-sunpinyin/pkg-message
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 You probably need to remove the old configurations, i.e,
 	rm -fr $HOME/.config/fcitx
 before switching to the fcitx-sunpinyin back-end!
-
-************************************************************************
+EOM
+}
+]
diff --git a/chinese/fcitx-ui-light/pkg-message b/chinese/fcitx-ui-light/pkg-message
index c5bcf35be5d9..ed4a435b7a38 100644
--- a/chinese/fcitx-ui-light/pkg-message
+++ b/chinese/fcitx-ui-light/pkg-message
@@ -1,7 +1,9 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Replace your `fcitx` command with
 	fcitx -u fcitx-light-ui
 to start Fcitx with this lightweight UI.
-
-************************************************************************
+EOM
+}
+]
diff --git a/chinese/fcitx/files/pkg-message.in b/chinese/fcitx/files/pkg-message.in
index 2c13f3178948..645a4af9f80b 100644
--- a/chinese/fcitx/files/pkg-message.in
+++ b/chinese/fcitx/files/pkg-message.in
@@ -1,5 +1,6 @@
-************************************************************************
-
+[
+{ type: install
+  message: <<EOM
 Remember to set the environment variable XMODIFIERS:
 
 	csh/tcsh:	setenv XMODIFIERS @im=fcitx
@@ -22,5 +23,6 @@ To start fcitx with your desktop, just
 
 	cp %%PREFIX%%/share/applications/fcitx.desktop \
 	    ~/.config/autostart/
-
-************************************************************************
+EOM
+}
+]
diff --git a/chinese/gcin-gtk3/pkg-message b/chinese/gcin-gtk3/pkg-message
index 4bbe064cb63c..1f11d630c5f6 100644
--- a/chinese/gcin-gtk3/pkg-message
+++ b/chinese/gcin-gtk3/pkg-message
@@ -1,4 +1,6 @@
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+[
+{ type: install
+  message: <<EOM
 Remember to set these environment varibles (such as your ~/.xinitrc):
 
   export XMODIFIERS='@im=gcin'
@@ -6,5 +8,6 @@ Remember to set these environment varibles (such as your ~/.xinitrc):
 
   # Finally, to start the GCIN input method daemon, use command:
   exec gcin &
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+EOM
+}
+]
diff --git a/chinese/gcin-qt5/pkg-message b/chinese/gcin-qt5/pkg-message
index d1a19ea81c9d..dfdaa7f1a81b 100644
--- a/chinese/gcin-qt5/pkg-message
+++ b/chinese/gcin-qt5/pkg-message
@@ -1,4 +1,6 @@
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+[
+{ type: install
+  message: <<EOM
 Remember to set these environment varibles (such as your ~/.xinitrc):
 
   export XMODIFIERS='@im=gcin'
@@ -6,5 +8,6 @@ Remember to set these environment varibles (such as your ~/.xinitrc):
 
   # Finally, to start the GCIN input method daemon, use command:
   exec gcin &
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+EOM
+}
+]
diff --git a/chinese/gcin/pkg-message b/chinese/gcin/pkg-message
index 4bbe064cb63c..1f11d630c5f6 100644
--- a/chinese/gcin/pkg-message
+++ b/chinese/gcin/pkg-message
@@ -1,4 +1,6 @@
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+[
+{ type: install
+  message: <<EOM
 Remember to set these environment varibles (such as your ~/.xinitrc):
 
   export XMODIFIERS='@im=gcin'
@@ -6,5 +8,6 @@ Remember to set these environment varibles (such as your ~/.xinitrc):
 
   # Finally, to start the GCIN input method daemon, use command:
   exec gcin &
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+EOM
+}
+]
diff --git a/chinese/phpbb-tw/files/pkg-message.in b/chinese/phpbb-tw/files/pkg-message.in
index 16c8b0d31054..aa19c6d04b29 100644
--- a/chinese/phpbb-tw/files/pkg-message.in
+++ b/chinese/phpbb-tw/files/pkg-message.in
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 phpBB2 has been installed, but is not quite ready to be used yet!
 
 You have to ensure that you have a database server (or ODBC access to a
@@ -41,4 +43,6 @@ delete the following files manually for security purposes:
 
 Duplicates of these files have been installed to %%DATADIR%%.
 %%DATADIR%%/contrib contains contributed software for phpBB2.
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/chinese/phpbb3-tw/files/pkg-message.in b/chinese/phpbb3-tw/files/pkg-message.in
index cd5e465dad12..e57f867431b9 100644
--- a/chinese/phpbb3-tw/files/pkg-message.in
+++ b/chinese/phpbb3-tw/files/pkg-message.in
@@ -1,4 +1,6 @@
-----------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 phpBB3 has been installed, but is not quite ready to be used yet!
 
 You have to ensure that you have a database server (or ODBC access to a
@@ -18,5 +20,6 @@ configure your installation of phpBB3:
 
 After configuring phpBB3 and ensuring that it is operational, you MUST
 remove or rename the install/ directory from %%PREFIX%%/%%PHPBBDIR%%:
-
-----------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/chinese/scim-fcitx/files/pkg-message.in b/chinese/scim-fcitx/files/pkg-message.in
index f964719f3f01..cc52e4c1b529 100644
--- a/chinese/scim-fcitx/files/pkg-message.in
+++ b/chinese/scim-fcitx/files/pkg-message.in
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment varible XMODIFIERS:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM
@@ -16,5 +18,6 @@ and set LANG, LC_CTYPE to one of the following values:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/chinese/scim-pinyin/pkg-message b/chinese/scim-pinyin/pkg-message
index 9e61f11cd1b4..41a970f1ef3e 100644
--- a/chinese/scim-pinyin/pkg-message
+++ b/chinese/scim-pinyin/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variable XMODIFIERS:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM
@@ -16,5 +18,6 @@ and set LANG, LC_CTYPE to one of the following values:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/chinese/scim-tables/pkg-message b/chinese/scim-tables/pkg-message
index 9e61f11cd1b4..41a970f1ef3e 100644
--- a/chinese/scim-tables/pkg-message
+++ b/chinese/scim-tables/pkg-message
@@ -1,4 +1,6 @@
---------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 Remember to set environment variable XMODIFIERS:
 
   csh/tcsh: setenv XMODIFIERS @im=SCIM
@@ -16,5 +18,6 @@ and set LANG, LC_CTYPE to one of the following values:
 To start the SCIM input method daemon, use command:
 
   scim -d
-
---------------------------------------------------------------------
+EOM
+}
+]
diff --git a/chinese/sourcehansans-sc-otf/files/pkg-message.in b/chinese/sourcehansans-sc-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/chinese/sourcehansans-sc-otf/files/pkg-message.in
+++ b/chinese/sourcehansans-sc-otf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/chinese/sourcehansans-tc-otf/files/pkg-message.in b/chinese/sourcehansans-tc-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/chinese/sourcehansans-tc-otf/files/pkg-message.in
+++ b/chinese/sourcehansans-tc-otf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/chinese/sourcehanserif-sc-otf/files/pkg-message.in b/chinese/sourcehanserif-sc-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/chinese/sourcehanserif-sc-otf/files/pkg-message.in
+++ b/chinese/sourcehanserif-sc-otf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/chinese/sourcehanserif-tc-otf/files/pkg-message.in b/chinese/sourcehanserif-tc-otf/files/pkg-message.in
index 2e8f2addd159..153f61da885a 100644
--- a/chinese/sourcehanserif-tc-otf/files/pkg-message.in
+++ b/chinese/sourcehanserif-tc-otf/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: install
+  message: <<EOM
 You can start using the font by following this instruction:
 
 Add the following line to the "Files" section of your X.org configuration file:
 
 	FontPath	"%%FONTSDIR%%/"
-
+EOM
+}
+]
diff --git a/chinese/wordpress-zh_CN/files/pkg-message.in b/chinese/wordpress-zh_CN/files/pkg-message.in
index 0d5e7666755a..709c4c2d5de2 100644
--- a/chinese/wordpress-zh_CN/files/pkg-message.in
+++ b/chinese/wordpress-zh_CN/files/pkg-message.in
@@ -1,4 +1,6 @@
-*************************************************************************************
+[
+{ type: install
+  message: <<EOM
 Please read following note for installation steps before the first use of WordPress.
 
 1. Copy wp-config-sample.php to wp-config.php
@@ -12,4 +14,6 @@ Please read following note for installation steps before the first use of WordPr
 If you are upgrading from prior version, please browse this URL :
 
   http://[WORDPRESS_URL]/wp-admin/upgrade.php
-
+EOM
+}
+]
diff --git a/chinese/wordpress-zh_TW/files/pkg-message.in b/chinese/wordpress-zh_TW/files/pkg-message.in
index 0d5e7666755a..709c4c2d5de2 100644
--- a/chinese/wordpress-zh_TW/files/pkg-message.in
+++ b/chinese/wordpress-zh_TW/files/pkg-message.in
@@ -1,4 +1,6 @@
-*************************************************************************************
+[
+{ type: install
+  message: <<EOM
 Please read following note for installation steps before the first use of WordPress.
 
 1. Copy wp-config-sample.php to wp-config.php
@@ -12,4 +14,6 @@ Please read following note for installation steps before the first use of WordPr
 If you are upgrading from prior version, please browse this URL :
 
   http://[WORDPRESS_URL]/wp-admin/upgrade.php
-
+EOM
+}
+]