Cosmetic.

{chinese,japanese,korean}/mule-*:
  - Set only the lang-specific category for each.

editors/mule:
  - Set CATEGORIES+= editors to follow after a slave's lang-specific category.
  - Define MULE_VERSION and EMACS_VERSION to use.

editors/mule-common:
  - Remove redundant `Version required' line.
  - Define MULE_VERSION and EMACS_VERSION to use.
  - Use ${VAR:S/../../} modifier instead of !=, and `echo | sed'.

15 files changed, 15 insertions, 15 deletions

diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile
index e038f7c78bc6..8abf8ac88b40 100644
--- a/japanese/mule-canna+freewnn+sj3/Makefile
+++ b/japanese/mule-canna+freewnn+sj3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+sj3+wnn4
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
index b36d487ebac4..7d7a7383e5e4 100644
--- a/japanese/mule-canna+freewnn/Makefile
+++ b/japanese/mule-canna+freewnn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+wnn4
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 WNN4=		yes
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
index 1024913f4faf..96a18c04a148 100644
--- a/japanese/mule-canna+sj3+wnn6/Makefile
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+sj3+wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
index 1024913f4faf..96a18c04a148 100644
--- a/japanese/mule-canna+sj3+wnn7/Makefile
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+sj3+wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile
index d623c1fc2bc6..409ef4d73961 100644
--- a/japanese/mule-canna+sj3/Makefile
+++ b/japanese/mule-canna+sj3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+sj3
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
index e16ac7ae5a5f..9662c4cc342b 100644
--- a/japanese/mule-canna+wnn6/Makefile
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 WNN6=		yes
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
index e16ac7ae5a5f..9662c4cc342b 100644
--- a/japanese/mule-canna+wnn7/Makefile
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 WNN6=		yes
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 9b082632ebac..a018e018f7b4 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 CANNA=		yes
 
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
index 2c6fb83e59c2..01b58e5fab10 100644
--- a/japanese/mule-freewnn+sj3/Makefile
+++ b/japanese/mule-freewnn+sj3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-sj3+wnn4
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 SJ3=		yes
 WNN4=		yes
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 401f0188d64c..382769b9cf0f 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-wnn4
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 WNN4=		yes
 
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
index 7173c41608c9..499628a4243c 100644
--- a/japanese/mule-sj3+wnn6/Makefile
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-sj3+wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 SJ3=		yes
 WNN6=		yes
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
index 7173c41608c9..499628a4243c 100644
--- a/japanese/mule-sj3+wnn7/Makefile
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-sj3+wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 SJ3=		yes
 WNN6=		yes
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index fd4d004e761b..abba2ca59029 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-sj3
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 SJ3=		yes
 
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 7efc7665b988..adf299b8db75 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 WNN6=		yes
 
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 7efc7665b988..adf299b8db75 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-wnn6
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 WNN6=		yes