Index: head/devel/p5-Getopt-EX/Makefile
===================================================================
--- head/devel/p5-Getopt-EX/Makefile	(revision 494658)
+++ head/devel/p5-Getopt-EX/Makefile	(revision 494659)
@@ -1,25 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	Getopt-EX
-PORTVERSION=	7.1.20170330
+PORTVERSION=	1.15.0
 DISTVERSIONPREFIX=	v
+PORTEPOCH=	1
 CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:UTASHIRO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Getopt Extender
 
 LICENSE=	ART10
 
 USES=		perl5
-USE_PERL5=	run
-USE_GITHUB=	yes
-GH_TUPLE=	kaz-utashiro:greple:084c10e
-NO_BUILD=	yes
-NO_ARCH=	yes
+USE_PERL5=	modbuildtiny
 
-do-install:
-	cd ${WRKSRC}/lib && \
-	    ${COPYTREE_SHARE} Getopt ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/devel/p5-Getopt-EX/distinfo
===================================================================
--- head/devel/p5-Getopt-EX/distinfo	(revision 494658)
+++ head/devel/p5-Getopt-EX/distinfo	(revision 494659)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490948040
-SHA256 (kaz-utashiro-greple-v7.1.20170330-084c10e_GH0.tar.gz) = c264281397668b32b71cc9267e93417c2f671108a507210941041f4224781826
-SIZE (kaz-utashiro-greple-v7.1.20170330-084c10e_GH0.tar.gz) = 98548
+TIMESTAMP = 1551691125
+SHA256 (Getopt-EX-v1.15.0.tar.gz) = a6ab6dd32c045a636add931b32f6b827e227a50ee8ed70212573171a66420395
+SIZE (Getopt-EX-v1.15.0.tar.gz) = 37032
Index: head/devel/p5-Getopt-EX/pkg-descr
===================================================================
--- head/devel/p5-Getopt-EX/pkg-descr	(revision 494658)
+++ head/devel/p5-Getopt-EX/pkg-descr	(revision 494659)
@@ -1,5 +1,5 @@
 Getopt::EX extends the basic function of Getopt family to
 support user-definable option aliases, and dynamic module which works
 together with the script through option interface.
 
-WWW: https://github.com/kaz-utashiro/greple/tree/master/lib/Getopt
+WWW: https://metacpan.org/release/Getopt-EX
Index: head/devel/p5-Getopt-EX/pkg-plist
===================================================================
--- head/devel/p5-Getopt-EX/pkg-plist	(revision 494658)
+++ head/devel/p5-Getopt-EX/pkg-plist	(revision 494659)
@@ -1,7 +1,18 @@
 %%SITE_PERL%%/Getopt/EX.pm
 %%SITE_PERL%%/Getopt/EX/Colormap.pm
 %%SITE_PERL%%/Getopt/EX/Func.pm
 %%SITE_PERL%%/Getopt/EX/LabeledParam.pm
 %%SITE_PERL%%/Getopt/EX/Loader.pm
 %%SITE_PERL%%/Getopt/EX/Long.pm
 %%SITE_PERL%%/Getopt/EX/Module.pm
+%%SITE_PERL%%/Getopt/EX/Numbers.pm
+%%SITE_PERL%%/Getopt/EX/Util.pm
+%%PERL5_MAN3%%/Getopt::EX.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Colormap.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Func.3.gz
+%%PERL5_MAN3%%/Getopt::EX::LabeledParam.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Loader.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Long.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Module.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Numbers.3.gz
+%%PERL5_MAN3%%/Getopt::EX::Util.3.gz
Index: head/textproc/greple/Makefile
===================================================================
--- head/textproc/greple/Makefile	(revision 494658)
+++ head/textproc/greple/Makefile	(revision 494659)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	greple
-PORTVERSION=	7.1.20170401
-DISTVERSIONPREFIX=	v
+PORTVERSION=	8.3304
 CATEGORIES=	textproc
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Grep with multiple keywords
 
 LICENSE=	GREPLE
 LICENSE_NAME=	GREPLE License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${SITE_PERL}/Getopt/EX.pm:devel/p5-Getopt-EX
+RUN_DEPENDS=	p5-Getopt-EX>=1.15.0,1:devel/p5-Getopt-EX
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
-SHEBANG_FILES=	bin/${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	kaz-utashiro
 GH_TAGNAME=	5ad6491
+
+SHEBANG_FILES=	bin/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 post-extract:
 	cd ${WRKSRC} && \
 	    ${SED} -n "/^# LICENSE/,//p" README.md > LICENSE
 
 do-install:
 	cd ${WRKSRC} && \
 	    ${INSTALL_SCRIPT} bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/lib && \
 	    ${COPYTREE_SHARE} App ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
Index: head/textproc/greple/distinfo
===================================================================
--- head/textproc/greple/distinfo	(revision 494658)
+++ head/textproc/greple/distinfo	(revision 494659)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491037914
-SHA256 (kaz-utashiro-greple-v7.1.20170401-5ad6491_GH0.tar.gz) = d873aad8e33988023c301a1df75840e727fb896a4bb96a08ab5956a0eb76eca6
-SIZE (kaz-utashiro-greple-v7.1.20170401-5ad6491_GH0.tar.gz) = 98718
+TIMESTAMP = 1551690756
+SHA256 (kaz-utashiro-greple-8.3304-5ad6491_GH0.tar.gz) = d873aad8e33988023c301a1df75840e727fb896a4bb96a08ab5956a0eb76eca6
+SIZE (kaz-utashiro-greple-8.3304-5ad6491_GH0.tar.gz) = 98718