Cleanups, including:

- Change maintainer's addresses
- Drop some maintainerships
- Use COMMENT variable

PR:		48294
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org>

8 files changed, 37 insertions, 43 deletions

diff --git a/japanese/drpl/Makefile b/japanese/drpl/Makefile
index 9921436c1e5a..80b97460b2e0 100644
--- a/japanese/drpl/Makefile
+++ b/japanese/drpl/Makefile
@@ -7,14 +7,13 @@
 
 PORTNAME=	drpl
 PORTVERSION=	1.04
-CATEGORIES=	japanese textproc perl5
+CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.yk.rim.or.jp/~tomoto/archives/drpl/
 
-MAINTAINER=	fuyuki@mj.0038.net
+MAINTAINER=	fuyuki@hadaly.org
+COMMENT=	Replaces words in a Japanese text using dictionaries
 
 USE_PERL5=	yes
-
-DICSDIR=	${PREFIX}/share/${PORTNAME}
 SCRIPTS=	drpl revdic
 
 post-patch:
@@ -29,8 +28,8 @@ do-build:
 
 do-install:
 	cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
-	${MKDIR} ${DICSDIR}
-	${INSTALL_DATA} ${WRKSRC}/dic/* ${DICSDIR}
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/dic/* ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} *.TXT *.man misc/*.htm ${DOCSDIR}
diff --git a/japanese/drpl/pkg-comment b/japanese/drpl/pkg-comment
deleted file mode 100644
index 31077820f396..000000000000
--- a/japanese/drpl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Replaces words in a Japanese text using dictionaries
diff --git a/japanese/drpl/pkg-descr b/japanese/drpl/pkg-descr
index 777bc3562cc9..6020c8f91dd3 100644
--- a/japanese/drpl/pkg-descr
+++ b/japanese/drpl/pkg-descr
@@ -5,6 +5,3 @@ and two dictionaries below to use with the script.
 - Osaka language
 
 WWW: http://www.yk.rim.or.jp/~tomoto/archives/drpl/
-
-- Kimura Fuyuki
-fuyuki@mj.0038.net
diff --git a/japanese/drpl/pkg-plist b/japanese/drpl/pkg-plist
index 8e766a1e1422..1306ed2edf18 100644
--- a/japanese/drpl/pkg-plist
+++ b/japanese/drpl/pkg-plist
@@ -1,17 +1,17 @@
 bin/drpl
 bin/revdic
-share/drpl/maruyaex.db
-share/drpl/maruyaex.dic
-share/drpl/maruyaex.try
-share/drpl/osaka.db
-share/drpl/osaka.dic
-share/drpl/osaka.try
-share/drpl/yarumaex.db
-share/drpl/yarumaex.dic
-share/drpl/yarumaex.try
-@dirrm share/drpl
-%%PORTDOCS%%share/doc/drpl/README.TXT
-%%PORTDOCS%%share/doc/drpl/bap_maruya_mod.htm
-%%PORTDOCS%%share/doc/drpl/bap_maruya_ref.htm
-%%PORTDOCS%%share/doc/drpl/drpl.man
-%%PORTDOCS%%@dirrm share/doc/drpl
+%%DATADIR%%/maruyaex.db
+%%DATADIR%%/maruyaex.dic
+%%DATADIR%%/maruyaex.try
+%%DATADIR%%/osaka.db
+%%DATADIR%%/osaka.dic
+%%DATADIR%%/osaka.try
+%%DATADIR%%/yarumaex.db
+%%DATADIR%%/yarumaex.dic
+%%DATADIR%%/yarumaex.try
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/bap_maruya_mod.htm
+%%PORTDOCS%%%%DOCSDIR%%/bap_maruya_ref.htm
+%%PORTDOCS%%%%DOCSDIR%%/drpl.man
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index fd873cf267fa..a33f52fe7de1 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -11,9 +11,11 @@ CATEGORIES=	japanese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Date
 
-MAINTAINER=	fuyuki@mj.0038.net
+MAINTAINER=	fuyuki@hadaly.org
+COMMENT=	Conversion between Japanese Era / Gregorian calendar
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
diff --git a/japanese/p5-Date-Japanese-Era/pkg-comment b/japanese/p5-Date-Japanese-Era/pkg-comment
deleted file mode 100644
index ffc25f5f0516..000000000000
--- a/japanese/p5-Date-Japanese-Era/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Conversion between Japanese Era / Gregorian calendar
diff --git a/japanese/p5-Date-Japanese-Era/pkg-descr b/japanese/p5-Date-Japanese-Era/pkg-descr
index 15112ab567af..7ca9de782b07 100644
--- a/japanese/p5-Date-Japanese-Era/pkg-descr
+++ b/japanese/p5-Date-Japanese-Era/pkg-descr
@@ -2,6 +2,3 @@ Date::Japanese::Era handles conversion between Japanese Era and
 Gregorian calendar.
 
 WWW: http://search.cpan.org/search?dist=Date-Japanese-Era
-
-- Kimura Fuyuki
-fuyuki@mj.0038.net
diff --git a/japanese/p5-Date-Japanese-Era/pkg-plist b/japanese/p5-Date-Japanese-Era/pkg-plist
index 2b6cf5fc084e..6abea648f8e0 100644
--- a/japanese/p5-Date-Japanese-Era/pkg-plist
+++ b/japanese/p5-Date-Japanese-Era/pkg-plist
@@ -1,12 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese/Era.ja.pod
-lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese/Era.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese/Era/Table.pm
-lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese/Era/Table/JIS_X0301.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Japanese/Era/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese/Era/Table
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese/Era
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date/Japanese 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Japanese/Era
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Japanese 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@comment $FreeBSD$
+%%SITE_PERL%%/Date/Japanese/Era.ja.pod
+%%SITE_PERL%%/Date/Japanese/Era.pm
+%%SITE_PERL%%/Date/Japanese/Era/Table.pm
+%%SITE_PERL%%/Date/Japanese/Era/Table/JIS_X0301.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era/.packlist
+@dirrm %%SITE_PERL%%/Date/Japanese/Era/Table
+@dirrm %%SITE_PERL%%/Date/Japanese/Era
+@unexec rmdir %D/%%SITE_PERL%%/Date/Japanese 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true