Update to version 10.4

4 files changed, 55 insertions, 38 deletions

diff --git a/editors/color-mate/Makefile b/editors/color-mate/Makefile
index 3b7502cc5dd3..5d9a752f9acd 100644
--- a/editors/color-mate/Makefile
+++ b/editors/color-mate/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	color-mate
-PORTVERSION=	10.0.1
+PORTVERSION=	10.4
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
 
diff --git a/editors/color-mate/distinfo b/editors/color-mate/distinfo
index a4f3a221d159..23f0dffa7746 100644
--- a/editors/color-mate/distinfo
+++ b/editors/color-mate/distinfo
@@ -1 +1 @@
-MD5 (color-mate-10.0.1.tar.gz) = d25eadf169f9fb762e7c059dc839786f
+MD5 (color-mate-10.4.tar.gz) = 1f055bb7ed5849c7e2b08d74c7a34bbb
diff --git a/editors/color-mate/pkg-descr b/editors/color-mate/pkg-descr
index b403a4923901..065279767b28 100644
--- a/editors/color-mate/pkg-descr
+++ b/editors/color-mate/pkg-descr
@@ -1,5 +1,5 @@
-"Color-Mate" is color customizing module for emacs/mule/xemacs/"Mule for
-Win32"/Meadow(Emacs20 for win32).
+"Color-Mate" is a color customizing module for Mule, Emacs, XEmacs,
+XEmacs UTF-2000, Mule for Win32 and Meadow.
 
 "Color-Mate" requires emacs19/mule2.3 or upper version of emacs.  And
 also requires hilit19.el(emacs/mule), font-lock.el(emacs/mule/xemacs),
@@ -20,4 +20,4 @@ and the next file into ~/.Xdefaults
 
 /usr/local/share/emacs/site-lisp/color-mate/theme/SunnyDay.X
 
-WWW: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/color-mate/
+WWW: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/color_mate/
diff --git a/editors/color-mate/pkg-plist b/editors/color-mate/pkg-plist
index 3cb12bb31720..17886bb0f18b 100644
--- a/editors/color-mate/pkg-plist
+++ b/editors/color-mate/pkg-plist
@@ -1,11 +1,16 @@
+share/emacs/site-lisp/color-mate-startup.el
+@comment By 'find /usr/local/share/emacs/site-lisp/color-mate -type f | sort'
 share/emacs/site-lisp/color-mate/color-mate-compile.el
-share/emacs/site-lisp/color-mate/color-mate-e20-fontset.el
-share/emacs/site-lisp/color-mate/color-mate-emacs-frame.el
 share/emacs/site-lisp/color-mate/color-mate-face.el
-share/emacs/site-lisp/color-mate/color-mate-mule-fontset.el
+share/emacs/site-lisp/color-mate/color-mate-fontset-emacs.el
+share/emacs/site-lisp/color-mate/color-mate-fontset-meadow.el
+share/emacs/site-lisp/color-mate/color-mate-fontset-mule-win32.el
+share/emacs/site-lisp/color-mate/color-mate-fontset-mule.el
+share/emacs/site-lisp/color-mate/color-mate-fontset-xemacs.el
+share/emacs/site-lisp/color-mate/color-mate-frame-emacs.el
+share/emacs/site-lisp/color-mate/color-mate-frame-xemacs.el
 share/emacs/site-lisp/color-mate/color-mate-rgb.el
 share/emacs/site-lisp/color-mate/color-mate-util.el
-share/emacs/site-lisp/color-mate/color-mate-xemacs-frame.el
 share/emacs/site-lisp/color-mate/color-mate.el
 share/emacs/site-lisp/color-mate/contrib/README
 share/emacs/site-lisp/color-mate/contrib/cm_select.el
@@ -13,6 +18,7 @@ share/emacs/site-lisp/color-mate/contrib/cm_select.sh.in
 share/emacs/site-lisp/color-mate/contrib/contrib-compile.el
 share/emacs/site-lisp/color-mate/contrib/summary-color.el
 share/emacs/site-lisp/color-mate/contrib/vregister.el
+share/emacs/site-lisp/color-mate/contrib/xemacs-fontset-menu.el
 share/emacs/site-lisp/color-mate/kanakan-cursor/canna-cursor.el
 share/emacs/site-lisp/color-mate/kanakan-cursor/egg-cursor.el
 share/emacs/site-lisp/color-mate/kanakan-cursor/kanakan-cursor-compile.el
@@ -27,6 +33,9 @@ share/emacs/site-lisp/color-mate/theme/GreenTea.xdef
 share/emacs/site-lisp/color-mate/theme/Maron.X
 share/emacs/site-lisp/color-mate/theme/Maron.el
 share/emacs/site-lisp/color-mate/theme/Maron.xdef
+share/emacs/site-lisp/color-mate/theme/MidNight.X
+share/emacs/site-lisp/color-mate/theme/MidNight.el
+share/emacs/site-lisp/color-mate/theme/MidNight.xdef
 share/emacs/site-lisp/color-mate/theme/Null.X
 share/emacs/site-lisp/color-mate/theme/Null.el
 share/emacs/site-lisp/color-mate/theme/Null.xdef
@@ -37,6 +46,7 @@ share/emacs/site-lisp/color-mate/theme/Stone.xdef
 share/emacs/site-lisp/color-mate/theme/SunnyDay-LCD.X
 share/emacs/site-lisp/color-mate/theme/SunnyDay-LCD.el
 share/emacs/site-lisp/color-mate/theme/SunnyDay-LCD.xdef
+share/emacs/site-lisp/color-mate/theme/SunnyDay-UTF2000.el
 share/emacs/site-lisp/color-mate/theme/SunnyDay.X
 share/emacs/site-lisp/color-mate/theme/SunnyDay.el
 share/emacs/site-lisp/color-mate/theme/SunnyDay.xdef
@@ -49,25 +59,56 @@ share/emacs/site-lisp/color-mate/theme/Wine.xdef
 share/emacs/site-lisp/color-mate/theme/Xdefaults.cpp
 share/emacs/site-lisp/color-mate/theme/color-mate-theme-compile.el
 share/emacs/site-lisp/color-mate/theme/theme_build.sh
-share/emacs/site-lisp/color-mate-startup.el
-@comment Almost next files for XEmacs are symlinks :-)
+@comment Almost the following files for XEmacs are symlinks :-)
+lib/xemacs/site-packages/lisp/color-mate-startup.el
+@comment By '/usr/local/lib/xemacs/site-packages/lisp/color-mate -type l|sort'
+lib/xemacs/site-packages/lisp/color-mate/color-mate-compile.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-face.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-fontset-emacs.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-fontset-meadow.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-fontset-mule-win32.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-fontset-mule.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-fontset-xemacs.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-frame-emacs.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-frame-xemacs.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-rgb.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate-util.el
+lib/xemacs/site-packages/lisp/color-mate/color-mate.el
+lib/xemacs/site-packages/lisp/color-mate/contrib/README
+lib/xemacs/site-packages/lisp/color-mate/contrib/cm_select.el
+lib/xemacs/site-packages/lisp/color-mate/contrib/cm_select.sh.in
+lib/xemacs/site-packages/lisp/color-mate/contrib/contrib-compile.el
+lib/xemacs/site-packages/lisp/color-mate/contrib/summary-color.el
+lib/xemacs/site-packages/lisp/color-mate/contrib/vregister.el
+lib/xemacs/site-packages/lisp/color-mate/contrib/xemacs-fontset-menu.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/canna-cursor.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/egg-cursor.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/kanakan-cursor-compile.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/leim-cursor.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/sj3-cursor.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/skk-cursor.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/skk-cursor2.el
+lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/win32-cursor.el
 lib/xemacs/site-packages/lisp/color-mate/theme/GreenTea.X
 lib/xemacs/site-packages/lisp/color-mate/theme/GreenTea.el
 lib/xemacs/site-packages/lisp/color-mate/theme/GreenTea.xdef
-lib/xemacs/site-packages/lisp/color-mate/theme/README.jp
-lib/xemacs/site-packages/lisp/color-mate/theme/theme_build.sh
 lib/xemacs/site-packages/lisp/color-mate/theme/Maron.X
 lib/xemacs/site-packages/lisp/color-mate/theme/Maron.el
 lib/xemacs/site-packages/lisp/color-mate/theme/Maron.xdef
+lib/xemacs/site-packages/lisp/color-mate/theme/MidNight.X
+lib/xemacs/site-packages/lisp/color-mate/theme/MidNight.el
+lib/xemacs/site-packages/lisp/color-mate/theme/MidNight.xdef
 lib/xemacs/site-packages/lisp/color-mate/theme/Null.X
 lib/xemacs/site-packages/lisp/color-mate/theme/Null.el
 lib/xemacs/site-packages/lisp/color-mate/theme/Null.xdef
+lib/xemacs/site-packages/lisp/color-mate/theme/README.jp
 lib/xemacs/site-packages/lisp/color-mate/theme/Stone.X
 lib/xemacs/site-packages/lisp/color-mate/theme/Stone.el
 lib/xemacs/site-packages/lisp/color-mate/theme/Stone.xdef
 lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay-LCD.X
 lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay-LCD.el
 lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay-LCD.xdef
+lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay-UTF2000.el
 lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay.X
 lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay.el
 lib/xemacs/site-packages/lisp/color-mate/theme/SunnyDay.xdef
@@ -79,31 +120,7 @@ lib/xemacs/site-packages/lisp/color-mate/theme/Wine.el
 lib/xemacs/site-packages/lisp/color-mate/theme/Wine.xdef
 lib/xemacs/site-packages/lisp/color-mate/theme/Xdefaults.cpp
 lib/xemacs/site-packages/lisp/color-mate/theme/color-mate-theme-compile.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/canna-cursor.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/egg-cursor.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/kanakan-cursor-compile.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/leim-cursor.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/sj3-cursor.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/skk-cursor.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/skk-cursor2.el
-lib/xemacs/site-packages/lisp/color-mate/kanakan-cursor/win32-cursor.el
-lib/xemacs/site-packages/lisp/color-mate/contrib/cm_select.el
-lib/xemacs/site-packages/lisp/color-mate/contrib/contrib-compile.el
-lib/xemacs/site-packages/lisp/color-mate/contrib/summary-color.el
-lib/xemacs/site-packages/lisp/color-mate/contrib/vregister.el
-lib/xemacs/site-packages/lisp/color-mate/contrib/README
-lib/xemacs/site-packages/lisp/color-mate/contrib/cm_select.sh.in
-lib/xemacs/site-packages/lisp/color-mate/color-mate-compile.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-e20-fontset.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-emacs-frame.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-face.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-mule-fontset.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-rgb.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-util.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate-xemacs-frame.el
-lib/xemacs/site-packages/lisp/color-mate/color-mate.el
-lib/xemacs/site-packages/lisp/color-mate-startup.el
-lib/xemacs/site-packages/pkginfo/MANIFEST.color-mate
+lib/xemacs/site-packages/lisp/color-mate/theme/theme_build.sh
 share/doc/color-mate/Customize.txt
 share/doc/color-mate/Dot.emacs.default.in
 share/doc/color-mate/Q_and_A.color-mate