Index: head/www/p5-CGI-Compile/Makefile
===================================================================
--- head/www/p5-CGI-Compile/Makefile	(revision 372946)
+++ head/www/p5-CGI-Compile/Makefile	(revision 372947)
@@ -1,25 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	CGI-Compile
-PORTVERSION=	0.16
+PORTVERSION=	0.18
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to compile .cgi scripts to a code reference
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	\
 	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
 	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
 	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
 	p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI
 # Depending on Plack::Test causes cyclic dependencies.
 
 USES=		perl5
-USE_PERL5=	configure
+USE_PERL5=	modbuildtiny
+NO_ARCH=	YES
+
+# Workaround until Module::Build::Tiny 0.039.
+post-patch:
+	${REINPLACE_CMD} -e 's|0.039|0.038|' ${WRKSRC}/Build.PL
 
 .include <bsd.port.mk>
Index: head/www/p5-CGI-Compile/distinfo
===================================================================
--- head/www/p5-CGI-Compile/distinfo	(revision 372946)
+++ head/www/p5-CGI-Compile/distinfo	(revision 372947)
@@ -1,2 +1,2 @@
-SHA256 (CGI-Compile-0.16.tar.gz) = 45ec5913d7f94616c46719186d9578e9a978b5e191c0a0f7614f1b60313a3312
-SIZE (CGI-Compile-0.16.tar.gz) = 24981
+SHA256 (CGI-Compile-0.18.tar.gz) = 1b4d0bc512e49893602618a86017f8bd9a22c2a26522554f2ada3e9b08713fd5
+SIZE (CGI-Compile-0.18.tar.gz) = 19134
Index: head/www/p5-CGI-Compile/pkg-plist
===================================================================
--- head/www/p5-CGI-Compile/pkg-plist	(revision 372946)
+++ head/www/p5-CGI-Compile/pkg-plist	(revision 372947)
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Compile/.packlist
+%%SITE_ARCH%%/auto/CGI/Compile/.packlist
 %%SITE_PERL%%/CGI/Compile.pm
 %%PERL5_MAN3%%/CGI::Compile.3.gz
-@dirrmtry %%SITE_PERL%%/CGI
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Compile
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI