3 files changed, 12 insertions, 19 deletions

diff --git a/www/p5-WWW-Mechanize-Shell/Makefile b/www/p5-WWW-Mechanize-Shell/Makefile
index 912245eb517e..4135b704c9b3 100644
--- a/www/p5-WWW-Mechanize-Shell/Makefile
+++ b/www/p5-WWW-Mechanize-Shell/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	WWW-Mechanize-Shell
-PORTVERSION=	0.52
-PORTREVISION=	1
+PORTVERSION=	0.53
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CORION
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
-COMMENT=	An interactive shell for www/p5-WWW-Mechanize
+COMMENT=	Interactive shell for www/p5-WWW-Mechanize
 
 BUILD_DEPENDS=	p5-HTML-Display>=0:${PORTSDIR}/www/p5-HTML-Display \
 		p5-HTML-TokeParser-Simple>=2:${PORTSDIR}/www/p5-HTML-TokeParser-Simple \
@@ -21,31 +20,29 @@ BUILD_DEPENDS=	p5-HTML-Display>=0:${PORTSDIR}/www/p5-HTML-Display \
 		p5-WWW-Mechanize-FormFiller>=0.05:${PORTSDIR}/www/p5-WWW-Mechanize-FormFiller \
 		p5-libwww>=5.69:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USES=		perl5
 USE_PERL5=	configure
 
 MAN3=		WWW::Mechanize::Shell.3
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
-.endif
+PORTEXAMPLES=	banking.postbank.de.mech hotmail.signup.mech wwwshell.pl
 
-.if !defined(NOPORTEXAMPLES)
-EXAMPLES=	bin/banking.postbank.de.mech bin/hotmail.signup.mech bin/wwwshell.pl
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/
-	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}/
-	@${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
+	cd ${WRKSRC}/bin/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${EXAMPLESDIR}."
 .endif
 
diff --git a/www/p5-WWW-Mechanize-Shell/distinfo b/www/p5-WWW-Mechanize-Shell/distinfo
index ae47fc314988..b9032a6884b8 100644
--- a/www/p5-WWW-Mechanize-Shell/distinfo
+++ b/www/p5-WWW-Mechanize-Shell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WWW-Mechanize-Shell-0.52.tar.gz) = c7654a01ac5d257bdc19b4abffbdd5e7a6eebe1fc046bdc2549eb583da81a2d4
-SIZE (WWW-Mechanize-Shell-0.52.tar.gz) = 50824
+SHA256 (WWW-Mechanize-Shell-0.53.tar.gz) = 86ab30d884e78b5f4443b1d32e2c896113f1d080a120ccca16c0491091f8e43e
+SIZE (WWW-Mechanize-Shell-0.53.tar.gz) = 51274
diff --git a/www/p5-WWW-Mechanize-Shell/pkg-plist b/www/p5-WWW-Mechanize-Shell/pkg-plist
index d0dbf32faa42..b0bdffd3ae13 100644
--- a/www/p5-WWW-Mechanize-Shell/pkg-plist
+++ b/www/p5-WWW-Mechanize-Shell/pkg-plist
@@ -1,9 +1,5 @@
 %%SITE_PERL%%/WWW/Mechanize/Shell.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Shell/.packlist
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/banking.postbank.de.mech
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hotmail.signup.mech
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wwwshell.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Shell
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW