Minor fixes.

Approved by:	markm

12 files changed, 33 insertions, 24 deletions

diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index 23ea8f303cad..5e0910e2cbd0 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Carp
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 
 PERL_CONFIGURE=	yes
 
diff --git a/devel/p5-Carp-Assert/pkg-descr b/devel/p5-Carp-Assert/pkg-descr
index 8fa06d96d87f..d98be3d88dcb 100644
--- a/devel/p5-Carp-Assert/pkg-descr
+++ b/devel/p5-Carp-Assert/pkg-descr
@@ -3,4 +3,4 @@ Carp::Assert is intended for a purpose like the ANSI C library assert.h.
 WWW: http://search.cpan.org/search?dist=Carp-Assert
 
 -- Sergey Skvortsov
-skv@protey.ru
+skv@FreeBSD.org
diff --git a/devel/p5-Class-Accessor/Makefile b/devel/p5-Class-Accessor/Makefile
index c44d4177a717..155bb18288ec 100644
--- a/devel/p5-Class-Accessor/Makefile
+++ b/devel/p5-Class-Accessor/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Accessor/pkg-descr b/devel/p5-Class-Accessor/pkg-descr
index 41f9af3fe954..a6edd4d9015b 100644
--- a/devel/p5-Class-Accessor/pkg-descr
+++ b/devel/p5-Class-Accessor/pkg-descr
@@ -3,4 +3,4 @@ This module automagically generates accessor/mutators for your class.
 WWW: http://search.cpan.org/search?dist=Class-Accessor
 
 -- Sergey Skvortsov
-skv@protey.ru
+skv@FreeBSD.org
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index 7353cac2830a..040105d4f9c2 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -12,11 +12,12 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 
 BUILD_DEPENDS=	dos2unix:${PORTSDIR}/converters/unix2dos
 
 PERL_CONFIGURE=	yes
+PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Class::Contract.3 Class::Contract::Production.3
@@ -30,6 +31,7 @@ pre-configure:
 
 post-install:
 .ifndef(NOPORTDOCS)
+	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/* \
 		${PREFIX}/share/examples/${PORTNAME}
diff --git a/devel/p5-Class-Contract/pkg-descr b/devel/p5-Class-Contract/pkg-descr
index fb9dc3d35ab4..9297680e87b0 100644
--- a/devel/p5-Class-Contract/pkg-descr
+++ b/devel/p5-Class-Contract/pkg-descr
@@ -1,8 +1,11 @@
 The Class::Contract module implements strong encapsulation, static
 inheritance, and design-by-contract condition checking for
-object-oriented Perl. The module provides a declarative syntax for
-attribute, method, constructor, and destructor definitions at both
-the object and class level. Pre-conditions, post-conditions, and
-class invariants are also fully supported.
+object-oriented Perl.  The module provides a declarative syntax for
+attribute, method, constructor, and destructor definitions at both the
+object and class level.  Pre-conditions, post-conditions, and class
+invariants are also fully supported.
 
 WWW: http://search.cpan.org/search?dist=Class-Contract
+
+-- Sergey Skvortsov
+skv@FreeBSD.org
diff --git a/devel/p5-Class-Contract/pkg-plist b/devel/p5-Class-Contract/pkg-plist
index 2faabd3cc5c4..74e53c6298cf 100644
--- a/devel/p5-Class-Contract/pkg-plist
+++ b/devel/p5-Class-Contract/pkg-plist
@@ -1,8 +1,8 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Contract/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Class/Contract.pm
 lib/perl5/site_perl/%%PERL_VER%%/Class/Contract/Production.pm
-%%PORTDOCS%%share/examples/Class-Contract/demo.pl
-%%PORTDOCS%%@dirrm share/examples/Class-Contract
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo.pl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Contract
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Contract
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Data-Inheritable/Makefile b/devel/p5-Class-Data-Inheritable/Makefile
index 39e5b979b443..05efe5599cec 100644
--- a/devel/p5-Class-Data-Inheritable/Makefile
+++ b/devel/p5-Class-Data-Inheritable/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Data-Inheritable/pkg-descr b/devel/p5-Class-Data-Inheritable/pkg-descr
index 6a94e7a9ac02..e5bdcc3998b9 100644
--- a/devel/p5-Class-Data-Inheritable/pkg-descr
+++ b/devel/p5-Class-Data-Inheritable/pkg-descr
@@ -6,4 +6,4 @@ by your subclasses and can be overriden.
 WWW: http://search.cpan.org/search?dist=Class-Data-Inheritable
 
 -- Sergey Skvortsov
-skv@protey.ru
+skv@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index b21422310b27..f0c1921d8c7d 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -12,18 +12,19 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@protey.ru
+MAINTAINER=	skv@FreeBSD.org
 
 PERL_CONFIGURE=	yes
+PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Class::Delegation.3
 
 post-install:
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/demo/* \
-		${PREFIX}/share/examples/${PORTNAME}
+	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/demo/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Delegation/pkg-descr b/devel/p5-Class-Delegation/pkg-descr
index 8fe8ee657ffd..3b615bcb71cd 100644
--- a/devel/p5-Class-Delegation/pkg-descr
+++ b/devel/p5-Class-Delegation/pkg-descr
@@ -11,3 +11,6 @@ These three delegation mechanisms can be specified for:
 	* all methods, delegated or not.
 
 WWW: http://search.cpan.org/search?dist=Class-Delegation
+
+-- Sergey Skvortsov
+skv@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/pkg-plist b/devel/p5-Class-Delegation/pkg-plist
index cf44e84730d1..bebc3c1e8e39 100644
--- a/devel/p5-Class-Delegation/pkg-plist
+++ b/devel/p5-Class-Delegation/pkg-plist
@@ -1,12 +1,12 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Delegation/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Class/Delegation.pm
-%%PORTDOCS%%share/examples/Class-Delegation/demo_adapt_interface.pl
-%%PORTDOCS%%share/examples/Class-Delegation/demo_change_semantics.pl
-%%PORTDOCS%%share/examples/Class-Delegation/demo_facade.pl
-%%PORTDOCS%%share/examples/Class-Delegation/demo_handle.pl
-%%PORTDOCS%%share/examples/Class-Delegation/demo_inheritance.pl
-%%PORTDOCS%%share/examples/Class-Delegation/demo_pseudo.pl
-%%PORTDOCS%%@dirrm share/examples/Class-Delegation
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_adapt_interface.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_change_semantics.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_facade.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_handle.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_inheritance.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_pseudo.pl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Delegation
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true