20 files changed, 27 insertions, 31 deletions

diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 748d3162df7c..c130499e9163 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to encode and decode objects using Basic Encoding Rules (BER)
 
 USES=		perl5
diff --git a/converters/p5-Convert-BER/pkg-descr b/converters/p5-Convert-BER/pkg-descr
index b753a5cb33a8..1f513a4e5a35 100644
--- a/converters/p5-Convert-BER/pkg-descr
+++ b/converters/p5-Convert-BER/pkg-descr
@@ -1,7 +1,5 @@
-DESCRIPTION
-       `Convert::BER' provides an OO interface to encoding and
-       decoding data using the ASN.1 Basic Encoding Rules (BER),
-       a platform independent way of encoding structured binary
-       data together with the structure.
+`Convert::BER' provides an OO interface to encoding and decoding data
+using the ASN.1 Basic Encoding Rules (BER), a platform independent way
+of encoding structured binary data together with the structure.
 
 WWW: http://search.cpan.org/dist/Convert-BER/
diff --git a/converters/p5-Convert-BER/pkg-plist b/converters/p5-Convert-BER/pkg-plist
index 53f21bb32ee7..86e365576f6f 100644
--- a/converters/p5-Convert-BER/pkg-plist
+++ b/converters/p5-Convert-BER/pkg-plist
@@ -1,3 +1,3 @@
-%%PERL5_MAN3%%/Convert::BER.3.gz
 %%SITE_PERL%%/Convert/BER.pm
 %%SITE_PERL%%/Convert/BER.pod
+%%PERL5_MAN3%%/Convert::BER.3.gz
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index a8fc6d7f21d6..09b4e1aed77d 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.adelton.com/perl/Cstools/ \
 MASTER_SITE_SUBDIR=	Cz
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tools for dealing with Czech encodings in Perl
 
 USES=		perl5
diff --git a/converters/p5-Cstools/pkg-plist b/converters/p5-Cstools/pkg-plist
index 99320a9a6c89..943a5542391e 100644
--- a/converters/p5-Cstools/pkg-plist
+++ b/converters/p5-Cstools/pkg-plist
@@ -1,9 +1,6 @@
 bin/cssort
 bin/cstocs
 bin/dbfcstocs
-%%PERL5_MAN3%%/Cz::Cstocs.3.gz
-%%PERL5_MAN3%%/Cz::Sort.3.gz
-%%PERL5_MAN3%%/Cz::Time.3.gz
 %%SITE_PERL%%/Cz/Cstocs.pm
 %%SITE_PERL%%/Cz/Cstocs/Getopt.pm
 %%SITE_PERL%%/Cz/Cstocs/enc/1250.enc
@@ -25,6 +22,9 @@ bin/dbfcstocs
 %%SITE_PERL%%/Cz/Cstocs/enc/vga.enc
 %%SITE_PERL%%/Cz/Sort.pm
 %%SITE_PERL%%/Cz/Time.pm
+%%PERL5_MAN3%%/Cz::Cstocs.3.gz
+%%PERL5_MAN3%%/Cz::Sort.3.gz
+%%PERL5_MAN3%%/Cz::Time.3.gz
 man/man1/cssort.1.gz
 man/man1/cstocs.1.gz
 man/man1/dbfcstocs.1.gz
diff --git a/converters/p5-Encode-JIS2K/Makefile b/converters/p5-Encode-JIS2K/Makefile
index 5946a0f2a3f3..cd459de16fe6 100644
--- a/converters/p5-Encode-JIS2K/Makefile
+++ b/converters/p5-Encode-JIS2K/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	JIS X 0212 (aka JIS 2000) Encodings
 
 LICENSE=	ART10 GPLv1
diff --git a/converters/p5-Format-Human-Bytes/Makefile b/converters/p5-Format-Human-Bytes/Makefile
index f609375ab162..c34a4ade6a65 100644
--- a/converters/p5-Format-Human-Bytes/Makefile
+++ b/converters/p5-Format-Human-Bytes/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to format a bytecount and make it human readable
 
 USES=		perl5
diff --git a/converters/p5-Format-Human-Bytes/pkg-plist b/converters/p5-Format-Human-Bytes/pkg-plist
index b956f9c75819..de8cce7dcd38 100644
--- a/converters/p5-Format-Human-Bytes/pkg-plist
+++ b/converters/p5-Format-Human-Bytes/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Format::Human::Bytes.3.gz
 %%SITE_PERL%%/Format/Human/Bytes.pm
+%%PERL5_MAN3%%/Format::Human::Bytes.3.gz
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index 66af04b6a97a..24f0760dd988 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FABPOT
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to deal with IMAP UTF-7
 
 LICENSE=	ART10 GPLv1
diff --git a/converters/p5-Unicode-Map/Makefile b/converters/p5-Unicode-Map/Makefile
index f2e2b26f18fc..8d007da7da5d 100644
--- a/converters/p5-Unicode-Map/Makefile
+++ b/converters/p5-Unicode-Map/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl class that converts strings to/from 2-byte Unicode UCS2 format
 
 USES=		perl5
diff --git a/converters/p5-Unicode-Map/pkg-plist b/converters/p5-Unicode-Map/pkg-plist
index 0bb3bcd7aadf..f74f151cc603 100644
--- a/converters/p5-Unicode-Map/pkg-plist
+++ b/converters/p5-Unicode-Map/pkg-plist
@@ -2,7 +2,6 @@ bin/map
 bin/mirrorMappings
 bin/mkCSGB2312
 bin/mkmapfile
-%%PERL5_MAN3%%/Unicode::Map.3.gz
 %%SITE_ARCH%%/Unicode/Map.pm
 %%SITE_ARCH%%/Unicode/Map/ADOBE/STDENC.map
 %%SITE_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
@@ -98,5 +97,6 @@ bin/mkmapfile
 %%SITE_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
 %%SITE_ARCH%%/Unicode/Map/REGISTRY
 %%SITE_ARCH%%/auto/Unicode/Map/Map.so
+%%PERL5_MAN3%%/Unicode::Map.3.gz
 man/man1/map.1.gz
 man/man1/mkmapfile.1.gz
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index 2cc27225392c..b1c52d1621b2 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mapping table between 8-bit chars and Unicode
 
 BUILD_DEPENDS=	p5-Unicode-String>=2:${PORTSDIR}/converters/p5-Unicode-String
diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist
index 184c8143ba2c..d8548074e6b8 100644
--- a/converters/p5-Unicode-Map8/pkg-plist
+++ b/converters/p5-Unicode-Map8/pkg-plist
@@ -1,5 +1,4 @@
 bin/umap
-%%PERL5_MAN3%%/Unicode::Map8.3.gz
 %%SITE_ARCH%%/Unicode/Map8.pm
 %%SITE_ARCH%%/Unicode/Map8/maps/ANSI_X3.110-1983.bin
 %%SITE_ARCH%%/Unicode/Map8/maps/ANSI_X3.4-1968.bin
@@ -183,4 +182,5 @@ bin/umap
 %%SITE_ARCH%%/Unicode/Map8/maps/us-dk.bin
 %%SITE_ARCH%%/Unicode/Map8/maps/videotex-suppl.bin
 %%SITE_ARCH%%/auto/Unicode/Map8/Map8.so
+%%PERL5_MAN3%%/Unicode::Map8.3.gz
 man/man1/umap.1.gz
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index e20bd2e9b5ef..07ba83cbe0b6 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -8,13 +8,13 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl class that implements conversion between arbitrary charsets
 
-BUILD_DEPENDS=	p5-Unicode-Map>=0:${PORTSDIR}/converters/p5-Unicode-Map \
-		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String \
+BUILD_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
+		p5-Unicode-Map>=0:${PORTSDIR}/converters/p5-Unicode-Map \
 		p5-Unicode-Map8>=0:${PORTSDIR}/converters/p5-Unicode-Map8 \
-		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
+		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Unicode-MapUTF8/pkg-plist b/converters/p5-Unicode-MapUTF8/pkg-plist
index 1a491533de0c..7c973cde170f 100644
--- a/converters/p5-Unicode-MapUTF8/pkg-plist
+++ b/converters/p5-Unicode-MapUTF8/pkg-plist
@@ -1,3 +1,3 @@
-%%PERL5_MAN3%%/Unicode::MapUTF8.3.gz
 %%SITE_PERL%%/Unicode/MapUTF8.pm
 %%SITE_PERL%%/Unicode/MapUTF8.pod
+%%PERL5_MAN3%%/Unicode::MapUTF8.3.gz
diff --git a/converters/p5-Unicode-UTF8simple/Makefile b/converters/p5-Unicode-UTF8simple/Makefile
index 88347cbdc480..86c4a0376e0a 100644
--- a/converters/p5-Unicode-UTF8simple/Makefile
+++ b/converters/p5-Unicode-UTF8simple/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Conversions to/from UTF-8 from/to charactersets
 
 USES=		perl5
diff --git a/converters/p5-Unicode-UTF8simple/pkg-descr b/converters/p5-Unicode-UTF8simple/pkg-descr
index d17e221e4dec..ef2dc0df902b 100644
--- a/converters/p5-Unicode-UTF8simple/pkg-descr
+++ b/converters/p5-Unicode-UTF8simple/pkg-descr
@@ -1,10 +1,8 @@
-[ excerpt from developer's web site ]
-
 Provides UTF-8 conversion for perl versions from 5.00 and up. It
 was mainly written for use with perl 5.00 to 5.6.0 because those
 perl versions do not support Unicode::MapUTF8 or Encode.
 
 Unicode::UTF8simple is written in plain perl (no C code) and will
-work with any Perl 5 version. It is just slightly slower than Encode
+work with any Perl 5 version. It is just slightly slower than Encode.
 
 WWW: http://search.cpan.org/dist/Unicode-UTF8simple/
diff --git a/converters/p5-Unicode-UTF8simple/pkg-plist b/converters/p5-Unicode-UTF8simple/pkg-plist
index c71ce9072170..912809e30756 100644
--- a/converters/p5-Unicode-UTF8simple/pkg-plist
+++ b/converters/p5-Unicode-UTF8simple/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Unicode::UTF8simple.3.gz
 %%SITE_PERL%%/Unicode/UTF8simple.pm
+%%PERL5_MAN3%%/Unicode::UTF8simple.3.gz
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index b143951f97f0..e57166a0e243 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between XML and WBXML using libwbxml2
 
 LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
diff --git a/converters/p5-XML-WBXML/pkg-plist b/converters/p5-XML-WBXML/pkg-plist
index b699e8baea9f..c31f2537bbbb 100644
--- a/converters/p5-XML-WBXML/pkg-plist
+++ b/converters/p5-XML-WBXML/pkg-plist
@@ -1,3 +1,3 @@
-%%PERL5_MAN3%%/XML::WBXML.3.gz
 %%SITE_ARCH%%/XML/WBXML.pm
 %%SITE_ARCH%%/auto/XML/WBXML/WBXML.so
+%%PERL5_MAN3%%/XML::WBXML.3.gz