Index: head/devel/p5-ExtUtils-XSpp/Makefile
===================================================================
--- head/devel/p5-ExtUtils-XSpp/Makefile	(revision 435086)
+++ head/devel/p5-ExtUtils-XSpp/Makefile	(revision 435087)
@@ -1,21 +1,23 @@
 # Created by: Cezary Morga <cm@therek.net>
 # $FreeBSD$
 
 PORTNAME=	ExtUtils-XSpp
-PORTVERSION=	0.16.03
-PORTREVISION=	2
+PORTVERSION=	0.18
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS for C++ in Perl
 
-BUILD_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+TEST_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
 		p5-Test-Differences>=0:devel/p5-Test-Differences
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	modbuild
 
 .include <bsd.port.mk>
Index: head/devel/p5-ExtUtils-XSpp/distinfo
===================================================================
--- head/devel/p5-ExtUtils-XSpp/distinfo	(revision 435086)
+++ head/devel/p5-ExtUtils-XSpp/distinfo	(revision 435087)
@@ -1,2 +1,3 @@
-SHA256 (ExtUtils-XSpp-0.1603.tar.gz) = 45f35ee240a4bfd76c2eed4bfcc623a0d23d32b8100f69e27fe5c7eca8712cab
-SIZE (ExtUtils-XSpp-0.1603.tar.gz) = 173271
+TIMESTAMP = 1488300396
+SHA256 (ExtUtils-XSpp-0.18.tar.gz) = 9176ad646729e3bd27cf7abf114bedd3424bff1ba61185cfc7d54f3a9223a8ff
+SIZE (ExtUtils-XSpp-0.18.tar.gz) = 185431
Index: head/devel/p5-ExtUtils-XSpp/pkg-plist
===================================================================
--- head/devel/p5-ExtUtils-XSpp/pkg-plist	(revision 435086)
+++ head/devel/p5-ExtUtils-XSpp/pkg-plist	(revision 435087)
@@ -1,61 +1,65 @@
 bin/xspp
 %%SITE_PERL%%/ExtUtils/XSpp.pm
 %%SITE_PERL%%/ExtUtils/XSpp.pod
 %%SITE_PERL%%/ExtUtils/XSpp/Cmd.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Driver.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception/code.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception/object.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception/perlcode.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception/simple.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception/stdmessage.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Exception/unknown.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Grammar.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Lexer.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Access.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Argument.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Class.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Comment.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Constructor.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Destructor.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Enum.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/EnumValue.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/File.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Function.pm
+%%SITE_PERL%%/ExtUtils/XSpp/Node/Member.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Method.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Module.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Package.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/PercAny.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Preprocessor.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Raw.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Node/Type.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Parser.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Plugin.pod
+%%SITE_PERL%%/ExtUtils/XSpp/Plugin/feature/default_xs_typemap.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Typemap.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Typemap/parsed.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Typemap/reference.pm
 %%SITE_PERL%%/ExtUtils/XSpp/Typemap/simple.pm
+%%SITE_PERL%%/ExtUtils/XSpp/Typemap/wrapper.pm
+%%PERL5_MAN1%%/xspp.1.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Cmd.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Exception.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Access.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Argument.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Class.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Comment.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Constructor.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Destructor.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Enum.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::EnumValue.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::File.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Function.3.gz
+%%PERL5_MAN3%%/ExtUtils::XSpp::Node::Member.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Method.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Module.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Package.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::PercAny.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Node::Raw.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Parser.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Plugin.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Typemap.3.gz
-%%PERL5_MAN1%%/xspp.1.gz