The vast majority of pkg-descr files had the following format when they

had both lines:

Author: ...
WWW: ....

So standardize on that, and move them to the end of the file when necessary.

Also fix some more whitespace, and remove more "signature tags" of varying
forms, like -- name, etc.

s/AUTHOR/Author/

A few other various formatting issues

26 files changed, 8 insertions, 61 deletions

diff --git a/japanese/MT/pkg-descr b/japanese/MT/pkg-descr
index e01d6e11577b..b000685afa82 100644
--- a/japanese/MT/pkg-descr
+++ b/japanese/MT/pkg-descr
@@ -1,5 +1,5 @@
 Movable Type is a web-based personal publishing system. It is designed to
 ease maintenance of regularly-updated news, journal sites and weblogs.
 
-WWW: 	http://movabletype.jp/
 Author:	Ben & Mena Trott
+WWW: 	http://movabletype.jp/
diff --git a/japanese/eb/pkg-descr b/japanese/eb/pkg-descr
index c094b8bf7958..02fd2e8b44bf 100644
--- a/japanese/eb/pkg-descr
+++ b/japanese/eb/pkg-descr
@@ -3,8 +3,6 @@ supports to access CD-ROM books of EB, EBG, EBXA and EPWING formats.
 CD-ROM books of those formats are popular in Japan.
 
 -- Motoyuki Kasahara <m-kasahr@sra.co.jp>
+-- Kazu TAKAMUNE <takamune2004@yahoo.co.jp>
 
-You can get information about EB Library from their website.
 WWW: http://www.sra.co.jp/people/m-kasahr/eb/
-
--- Kazu TAKAMUNE <takamune2004@yahoo.co.jp>
diff --git a/japanese/eblook/pkg-descr b/japanese/eblook/pkg-descr
index ab957fcb5a33..4dc719a683b6 100644
--- a/japanese/eblook/pkg-descr
+++ b/japanese/eblook/pkg-descr
@@ -6,7 +6,5 @@ Since CD-ROM books themseves are stands on the ISO 9660 format,
 you can mount the discs by the same way as other ISO 9660 discs.
 
 You can get more information from ja-eblook.info.
-You can also get information from their website.
-WWW: http://openlab.ring.gr.jp/lookup/eblook/
 
---- Porting by shige <shige@FreeBSD.org>
+WWW: http://openlab.ring.gr.jp/lookup/eblook/
diff --git a/japanese/eterm/pkg-descr b/japanese/eterm/pkg-descr
index 7bca0fb02159..1a4c1f6cd050 100644
--- a/japanese/eterm/pkg-descr
+++ b/japanese/eterm/pkg-descr
@@ -5,6 +5,3 @@ If you want to input Japanese, use "--input-method" and
 "--preedit-type" option. 
 
 WWW: http://www.eterm.org/
-
---
-MANTANI Nobutaka <nobutaka@nobtaka.com>
diff --git a/japanese/gorua/pkg-descr b/japanese/gorua/pkg-descr
index 59bfa4161e8b..b26d8f4b1f53 100644
--- a/japanese/gorua/pkg-descr
+++ b/japanese/gorua/pkg-descr
@@ -1,6 +1,3 @@
 Gtk+ on Ruby User Agent for 2ch BBS
 
 WWW: http://www.unixuser.org/~haruyama/software/goRua/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/hns/pkg-descr b/japanese/hns/pkg-descr
index 557f79296f05..8c3f9183da1a 100644
--- a/japanese/hns/pkg-descr
+++ b/japanese/hns/pkg-descr
@@ -9,6 +9,3 @@ hns has the following features:
 * Easy to change the appearance of the diary by using theme.
 
 WWW: http://www.h14m.org/
-
--- 
-Hyper NIKKI System Project <hnsmaster@h14m.org>
diff --git a/japanese/kcode/pkg-descr b/japanese/kcode/pkg-descr
index 13bc5941f9fb..660f9bf9702e 100644
--- a/japanese/kcode/pkg-descr
+++ b/japanese/kcode/pkg-descr
@@ -1,5 +1,5 @@
 kcode is a handy utility to show codepoint information of given
 characters.
 
-WWW:	http://www.irori.org/tool/kcode.html
 Author:	HIROSE, Masaaki <hirose31 -at- irori -dot- org>
+WWW:	http://www.irori.org/tool/kcode.html
diff --git a/japanese/libjcode/pkg-descr b/japanese/libjcode/pkg-descr
index 338c4e93a715..f23e4d25e1bf 100644
--- a/japanese/libjcode/pkg-descr
+++ b/japanese/libjcode/pkg-descr
@@ -1,6 +1,2 @@
 This Library can convert Japanese charset.
 And Convert Japanese "Hankaku-Kana" to "Zenkaku"
-
-------
-Shuichi Tanaka
-stanaka@bb.mbn.or.jp
diff --git a/japanese/migemo-emacs21/pkg-descr b/japanese/migemo-emacs21/pkg-descr
index b6a3e69c7a8a..7e9cc1490258 100644
--- a/japanese/migemo-emacs21/pkg-descr
+++ b/japanese/migemo-emacs21/pkg-descr
@@ -6,6 +6,3 @@ To use Migemo, you must set following elisp to your own .emacs file.
 (load-library "migemo")
 
 WWW: http://migemo.namazu.org/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/migemo-emacs22/pkg-descr b/japanese/migemo-emacs22/pkg-descr
index b6a3e69c7a8a..7e9cc1490258 100644
--- a/japanese/migemo-emacs22/pkg-descr
+++ b/japanese/migemo-emacs22/pkg-descr
@@ -6,6 +6,3 @@ To use Migemo, you must set following elisp to your own .emacs file.
 (load-library "migemo")
 
 WWW: http://migemo.namazu.org/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/migemo-emacs23/pkg-descr b/japanese/migemo-emacs23/pkg-descr
index b6a3e69c7a8a..7e9cc1490258 100644
--- a/japanese/migemo-emacs23/pkg-descr
+++ b/japanese/migemo-emacs23/pkg-descr
@@ -6,6 +6,3 @@ To use Migemo, you must set following elisp to your own .emacs file.
 (load-library "migemo")
 
 WWW: http://migemo.namazu.org/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/migemo-xemacs-devel-mule/pkg-descr b/japanese/migemo-xemacs-devel-mule/pkg-descr
index a0624b4acb83..c2d374eba303 100644
--- a/japanese/migemo-xemacs-devel-mule/pkg-descr
+++ b/japanese/migemo-xemacs-devel-mule/pkg-descr
@@ -6,6 +6,3 @@ To use Migemo, you must set following elisp to your own .emacs file.
 (load-library "migemo")
 
 WWW: http://migemo.namazu.org/
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/japanese/migemo/pkg-descr b/japanese/migemo/pkg-descr
index 63e916194e02..4f04e80debca 100644
--- a/japanese/migemo/pkg-descr
+++ b/japanese/migemo/pkg-descr
@@ -2,6 +2,3 @@ Migemo is a Japanese incremental search tool.
 You can search a text for Japanese words without having to input kanji.
 
 WWW: http://migemo.namazu.org/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/monafonts-ttf/pkg-descr b/japanese/monafonts-ttf/pkg-descr
index 51af8fa53cde..66c6b0d91d17 100644
--- a/japanese/monafonts-ttf/pkg-descr
+++ b/japanese/monafonts-ttf/pkg-descr
@@ -5,6 +5,3 @@ Japanese Windows font. This is named after ASCII art 'mona' used in
 This font is installed in {LOCALBASE}/lib/X11/fonts/TrueType.
 
 WWW: http://monafont.sourceforge.net/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/monafonts/pkg-descr b/japanese/monafonts/pkg-descr
index bed5b106e24a..4ab62fe13033 100644
--- a/japanese/monafonts/pkg-descr
+++ b/japanese/monafonts/pkg-descr
@@ -6,6 +6,3 @@ Japanese Windows font. This is named after ASCII art 'mona' used in
         ${LOCALBASE}/lib/X11/fonts/local/
 
 WWW: http://monafont.sourceforge.net/
-
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/japanese/p5-Lingua-JA-Kana/pkg-descr b/japanese/p5-Lingua-JA-Kana/pkg-descr
index 7ffe0834dbb3..2f065c8f70a9 100644
--- a/japanese/p5-Lingua-JA-Kana/pkg-descr
+++ b/japanese/p5-Lingua-JA-Kana/pkg-descr
@@ -3,5 +3,5 @@ romaji at ease. This module makes use of utf8 semantics. Strings in
 this module must be utf8-flagged. If they are not, you can use Encode
 to do so.
 
-WWW: http://search.cpan.org/dist/Lingua-JA-Kana/
 Author: Dan Kogai <dankogai@dan.co.jp>
+WWW: http://search.cpan.org/dist/Lingua-JA-Kana/
diff --git a/japanese/rbnamazu/pkg-descr b/japanese/rbnamazu/pkg-descr
index 2be45c75e8ef..f64da5c20762 100644
--- a/japanese/rbnamazu/pkg-descr
+++ b/japanese/rbnamazu/pkg-descr
@@ -3,6 +3,5 @@ in Ruby.
 
 With this, you can do a Namazu search from a Ruby script.
 
-
 Author:	Ryunosuke Ohshima <ryu@jaist.ac.jp>
 WWW:	http://www.namazu.org/ruby-namazu/index.html.en
diff --git a/japanese/rskkserv/pkg-descr b/japanese/rskkserv/pkg-descr
index bb11aaf1e15e..3e9cf0de8c6c 100644
--- a/japanese/rskkserv/pkg-descr
+++ b/japanese/rskkserv/pkg-descr
@@ -3,4 +3,5 @@ rskkserv is an alternative implementation of skkserv written in Ruby.
 
 Author:	Shugo Maeda <shugo@ruby-lang.org>,
 	YAMASHITA Junji <ysjj@unixuser.org> (current maintainer)
+
 WWW:	http://www.ruby-lang.org/raa/list.rhtml?name=rskkserv
diff --git a/japanese/ruby-chasen/pkg-descr b/japanese/ruby-chasen/pkg-descr
index b1a6b3325977..c32180245c90 100644
--- a/japanese/ruby-chasen/pkg-descr
+++ b/japanese/ruby-chasen/pkg-descr
@@ -1,5 +1,4 @@
 Ruby/ChaSen -- ChaSen module for Ruby.
 
-
 Author:	IKARASHI Akira <ikarashi@d3.dion.ne.jp>
 WWW:	http://www.ruby-lang.org/raa/list.rhtml?name=ruby-chasen
diff --git a/japanese/ruby-eb/pkg-descr b/japanese/ruby-eb/pkg-descr
index 42451712679e..511ef77e794e 100644
--- a/japanese/ruby-eb/pkg-descr
+++ b/japanese/ruby-eb/pkg-descr
@@ -1,5 +1,4 @@
 Ruby EB -- Ruby bind of EB library.
 
-
 Author:	Nishikawa,Yasuhiro <nyasu@osk.3web.ne.jp>
 WWW:	http://www.ruby-lang.org/raa/list.rhtml?name=rubyeb
diff --git a/japanese/ruby-ming/pkg-descr b/japanese/ruby-ming/pkg-descr
index 500352440a08..7241f4a44b34 100644
--- a/japanese/ruby-ming/pkg-descr
+++ b/japanese/ruby-ming/pkg-descr
@@ -5,6 +5,5 @@ sounds. To use Japanese fonts with JaMing, the letters must be
 followed the UTF-8 formats. Uconv, which is an UTF-8 extension library
 for Ruby, can be used to convert other Kanji encodings into Unicode.
 
-WWW: http://mingruby.rubyforge.org/
-
 Author: Daisuke Ikegami <ikegami@madscientist.jp>
+WWW: http://mingruby.rubyforge.org/
diff --git a/japanese/ruby-usersguide/pkg-descr b/japanese/ruby-usersguide/pkg-descr
index eaa0f9a73e7d..f38bdec2f6fa 100644
--- a/japanese/ruby-usersguide/pkg-descr
+++ b/japanese/ruby-usersguide/pkg-descr
@@ -3,5 +3,5 @@ object-oriented programming.  It has many features to process text
 files and to do system management tasks.  This package contains
 Japanese version of the Ruby users guide in HTML format.
 
-WWW:	http://www.ruby-lang.org/
 Author:	Yukihiro Matsumoto <matz@netlab.co.jp>
+WWW:	http://www.ruby-lang.org/
diff --git a/japanese/w3m-img/pkg-descr b/japanese/w3m-img/pkg-descr
index 8a5dd128a2be..25b24ff18a10 100644
--- a/japanese/w3m-img/pkg-descr
+++ b/japanese/w3m-img/pkg-descr
@@ -7,6 +7,3 @@ doesn't have.
 * Rendering frames. (It converts frames into a table).
 
 WWW: http://w3m.sourceforge.net/
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/japanese/w3m/pkg-descr b/japanese/w3m/pkg-descr
index 88d55dadd06d..1db92019eecb 100644
--- a/japanese/w3m/pkg-descr
+++ b/japanese/w3m/pkg-descr
@@ -7,6 +7,3 @@ doesn't have.
 * Rendering frames. (It converts frames into a table).
 
 WWW: http://w3m.sourceforge.net/
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/japanese/zope-ejsplitter/pkg-descr b/japanese/zope-ejsplitter/pkg-descr
index 37ca02a6870d..2eaca181ba9b 100644
--- a/japanese/zope-ejsplitter/pkg-descr
+++ b/japanese/zope-ejsplitter/pkg-descr
@@ -4,6 +4,3 @@ You can use it with other Zope product, i.e. COREBlog (www/zope-coreblog),
 when you want to search Japanese text in your site.
 
 WWW: http://www005.upp.so-net.ne.jp/nakagami/tips/ZCTextIndex.html
-
--- Yasushi Hayashi
-yasi@yasi.to
diff --git a/japanese/zope-jamailhost/pkg-descr b/japanese/zope-jamailhost/pkg-descr
index a70ae0f03226..8fb335f5d931 100644
--- a/japanese/zope-jamailhost/pkg-descr
+++ b/japanese/zope-jamailhost/pkg-descr
@@ -5,6 +5,3 @@ This "jaMailHost" product will solve this problem.
 Its license is ZPL 2.1.
 
 WWW: http://www005.upp.so-net.ne.jp/nakagami/tips/jaMailHost.html
-
--- Yasushi Hayashi
-yasi@yasi.to