3 files changed, 54 insertions, 52 deletions

diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index 56b41f39ca41..69e7753d972d 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	URI
-PORTVERSION=	1.23
+PORTVERSION=	1.25
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	URI
@@ -22,6 +22,7 @@ MAN3=		URI.3 \
 		URI::Escape.3 \
 		URI::Heuristic.3 \
 		URI::QueryParam.3 \
+		URI::Split.3 \
 		URI::URL.3 \
 		URI::WithBase.3 \
 		URI::data.3 \
@@ -31,7 +32,7 @@ MAN3=		URI.3 \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS=	${BUILD_DEPENDS}
 .endif
 
diff --git a/net/p5-URI/distinfo b/net/p5-URI/distinfo
index e71e4dc84504..f8280c4b0f79 100644
--- a/net/p5-URI/distinfo
+++ b/net/p5-URI/distinfo
@@ -1 +1 @@
-MD5 (URI-1.23.tar.gz) = 3f79c5ac5bf394d3906c7adcec45edf0
+MD5 (URI-1.25.tar.gz) = 0298e4498b871cf2aa3e76f7dc8bd6b7
diff --git a/net/p5-URI/pkg-plist b/net/p5-URI/pkg-plist
index 5915113ca224..69c191f7540b 100644
--- a/net/p5-URI/pkg-plist
+++ b/net/p5-URI/pkg-plist
@@ -1,49 +1,50 @@
-lib/perl5/site_perl/%%PERL_VER%%/URI.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/Escape.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/Heuristic.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/QueryParam.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/WithBase.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_foreign.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_login.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_query.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_segment.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_server.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/_userpass.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/data.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/FAT.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/OS2.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/QNX.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/file/Win32.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/ftp.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/gopher.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/http.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/https.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/ldap.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/mailto.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/news.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/nntp.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/pop.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/rlogin.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/rsync.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/rtsp.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/rtspu.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/sip.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/sips.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/snews.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/ssh.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/tn3270.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/urn.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/urn/isbn.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/urn/oid.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/URI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/file
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/urn
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI
+%%SITE_PERL%%/URI.pm
+%%SITE_PERL%%/URI/Escape.pm
+%%SITE_PERL%%/URI/Heuristic.pm
+%%SITE_PERL%%/URI/QueryParam.pm
+%%SITE_PERL%%/URI/Split.pm
+%%SITE_PERL%%/URI/URL.pm
+%%SITE_PERL%%/URI/WithBase.pm
+%%SITE_PERL%%/URI/_foreign.pm
+%%SITE_PERL%%/URI/_generic.pm
+%%SITE_PERL%%/URI/_login.pm
+%%SITE_PERL%%/URI/_query.pm
+%%SITE_PERL%%/URI/_segment.pm
+%%SITE_PERL%%/URI/_server.pm
+%%SITE_PERL%%/URI/_userpass.pm
+%%SITE_PERL%%/URI/data.pm
+%%SITE_PERL%%/URI/file.pm
+%%SITE_PERL%%/URI/file/Base.pm
+%%SITE_PERL%%/URI/file/FAT.pm
+%%SITE_PERL%%/URI/file/Mac.pm
+%%SITE_PERL%%/URI/file/OS2.pm
+%%SITE_PERL%%/URI/file/QNX.pm
+%%SITE_PERL%%/URI/file/Unix.pm
+%%SITE_PERL%%/URI/file/Win32.pm
+%%SITE_PERL%%/URI/ftp.pm
+%%SITE_PERL%%/URI/gopher.pm
+%%SITE_PERL%%/URI/http.pm
+%%SITE_PERL%%/URI/https.pm
+%%SITE_PERL%%/URI/ldap.pm
+%%SITE_PERL%%/URI/mailto.pm
+%%SITE_PERL%%/URI/news.pm
+%%SITE_PERL%%/URI/nntp.pm
+%%SITE_PERL%%/URI/pop.pm
+%%SITE_PERL%%/URI/rlogin.pm
+%%SITE_PERL%%/URI/rsync.pm
+%%SITE_PERL%%/URI/rtsp.pm
+%%SITE_PERL%%/URI/rtspu.pm
+%%SITE_PERL%%/URI/sip.pm
+%%SITE_PERL%%/URI/sips.pm
+%%SITE_PERL%%/URI/snews.pm
+%%SITE_PERL%%/URI/ssh.pm
+%%SITE_PERL%%/URI/telnet.pm
+%%SITE_PERL%%/URI/tn3270.pm
+%%SITE_PERL%%/URI/urn.pm
+%%SITE_PERL%%/URI/urn/isbn.pm
+%%SITE_PERL%%/URI/urn/oid.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
+@dirrm %%SITE_PERL%%/URI/file
+@dirrm %%SITE_PERL%%/URI/urn
+@dirrm %%SITE_PERL%%/URI