4 files changed, 46 insertions, 25 deletions

diff --git a/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile
index 2352087fdae2..528dfd8137ef 100644
--- a/textproc/p5-XML-XSH/Makefile
+++ b/textproc/p5-XML-XSH/Makefile
@@ -6,25 +6,38 @@
 #
 
 PORTNAME=	XML-XSH
-PORTVERSION=	1.4
+PORTVERSION=	1.8.2
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge/}
+MASTER_SITE_SUBDIR=	XML/:cpan xsh/:sourceforge
 PKGNAMEPREFIX=	p5-
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:cpan,sourceforge
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	This is xsh - an XML Editing Shell
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/XUpdate/LibXML.pm:${PORTSDIR}/textproc/p5-XML-XUpdate-LibXML
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \
+		${SITE_PERL}/XML/LibXML/Iterator.pm:${PORTSDIR}/textproc/p5-XML-LibXML-Iterator \
+		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		${SITE_PERL}/XML/XUpdate/LibXML.pm:${PORTSDIR}/textproc/p5-XML-XUpdate-LibXML \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXML/XPathContext.pm:${PORTSDIR}/textproc/p5-XML-LibXML-XPathContext
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-post-patch:
-	@${PERL} -pi -e 's/^(?=no warnings;)/#/ if $$.==6' \
-		${WRKSRC}/lib/XML/XSH/Functions.pm
+MAN1=		xsh.1
+MAN3=		XSH.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=		"requires perl 5.6.x or later. Install lang/perl5 and try again"
+.endif
+
+test: build
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-XML-XSH/distinfo b/textproc/p5-XML-XSH/distinfo
index 53968ee7a81e..c8b3edf9672e 100644
--- a/textproc/p5-XML-XSH/distinfo
+++ b/textproc/p5-XML-XSH/distinfo
@@ -1 +1 @@
-MD5 (XML-XSH-1.4.tar.gz) = fa67dc1156c37125b47838b1f7c13e34
+MD5 (XML-XSH-1.8.2.tar.gz) = c25f59c465f785347d0466d653d9893f
diff --git a/textproc/p5-XML-XSH/pkg-descr b/textproc/p5-XML-XSH/pkg-descr
index 67440df228bf..0c61ea8d6ce7 100644
--- a/textproc/p5-XML-XSH/pkg-descr
+++ b/textproc/p5-XML-XSH/pkg-descr
@@ -3,4 +3,5 @@ language in the manner of Unix shell interpreters and line-oriented text
 editors like ed.  It can be used either interactively or for batch-mode
 XML processing.
 
-WWW: http://search.cpan.org/search?dist=XML-XSH
+WWW: http://xsh.sourceforge.net/
+WWW: http://search.cpan.org/perldoc?XML::XSH
diff --git a/textproc/p5-XML-XSH/pkg-plist b/textproc/p5-XML-XSH/pkg-plist
index f4f8bd9ed507..4488604f3ada 100644
--- a/textproc/p5-XML-XSH/pkg-plist
+++ b/textproc/p5-XML-XSH/pkg-plist
@@ -1,13 +1,20 @@
 bin/xsh
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/CompletionList.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Functions.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Grammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Parser.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XSH
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/XSH
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/XSH.pm
+%%SITE_PERL%%/XML/XSH.pod
+%%SITE_PERL%%/XML/XSH/Completion.pm
+%%SITE_PERL%%/XML/XSH/CompletionList.pm
+%%SITE_PERL%%/XML/XSH/DummyXPathContext.pm
+%%SITE_PERL%%/XML/XSH/Functions.pm
+%%SITE_PERL%%/XML/XSH/GDOMECompat.pm
+%%SITE_PERL%%/XML/XSH/Grammar.pm
+%%SITE_PERL%%/XML/XSH/Help.pm
+%%SITE_PERL%%/XML/XSH/Iterators.pm
+%%SITE_PERL%%/XML/XSH/LibXMLCompat.pm
+%%SITE_PERL%%/XML/XSH/Parser.pm
+@dirrm %%SITE_PERL%%/XML/XSH
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/Inline/XSH.pm
+@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true