diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 4b4a320a0046..98c88e42d92c 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,31 +1,35 @@
 PORTNAME=	XML-Parser
-PORTVERSION=	2.44
+PORTVERSION=	2.46
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/Parser.pm
 
+BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libexpat.so:textproc/expat2
+RUN_DEPENDS=	p5-libwww>=6.43:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
+
 CONFIGURE_ARGS=	EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include
 
-PLIST_SUB=	EUCJP=${EUCJP} SJIS=${SJIS}
+PLIST_SUB=	EUCJP=${_EUCJP} SJIS=${_SJIS}
 
 # XMLPARSER_EUCJP=	x-euc-jp-(jisx0221|unicode)
 # XMLPARSER_SJIS=	x-sjis-(cp932|jdk117|jisx0221|unicode)
-CONV_ENC=	${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print'
+_CONV_ENC=	${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print'
 .if !defined(XMLPARSER_EUCJP)
-EUCJP=		"@comment "
+_EUCJP=		"@comment "
 .endif
 .if !defined(XMLPARSER_SJIS)
-SJIS=		"@comment "
+_SJIS=		"@comment "
 .endif
 .if defined(XMLPARSER_EUCJP) || defined(XMLPARSER_SJIS)
 USE_PERL5+=	patch
@@ -34,12 +38,12 @@ USE_PERL5+=	patch
 post-patch:
 .if defined(XMLPARSER_EUCJP)
 	cd ${WRKSRC}/Parser/Encodings; \
-		${CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
+		${_CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
 	${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
 .endif
 .if defined(XMLPARSER_SJIS)
 	cd ${WRKSRC}/Parser/Encodings; \
-		${CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
+		${_CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
 	${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
 .endif
 	@${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/
@@ -55,14 +59,18 @@ pre-build:
 	@cd ${WRKDIR} && ${PERL} ${FILESDIR}/check_nfs.pl 2>/dev/null || \
 	(${ECHO_MSG} "===>  lockf in \$$TMPDIR required"; ${FALSE})
 
-XE=	${.CURDIR}/../p5-XML-Encoding
-extract-encodings:
-	@cd ${XE}; \
+_XE=	${.CURDIR}/../p5-XML-Encoding
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}/auto/XML/Parser/Expat/Expat.so
+
+_extract-encodings:
+	@cd ${_XE}; \
 	${MAKE} patch
 
-build-encodings:
-.for e in 1 6 10 11 13 14 15
-	@cd `cd ${XE}; ${MAKE} -VWRKSRC`; \
+_build-encodings:
+.for e in 1 6 10 11 13 14
+	@cd `cd ${_XE}; ${MAKE} -VWRKSRC`; \
 	compile_encoding -o ${FILESDIR}/iso-8859-${e}.enc maps/iso-8859-${e}.xml
 .endfor
 
diff --git a/textproc/p5-XML-Parser/distinfo b/textproc/p5-XML-Parser/distinfo
index 6c793ada0a60..80f6390e8918 100644
--- a/textproc/p5-XML-Parser/distinfo
+++ b/textproc/p5-XML-Parser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (XML-Parser-2.44.tar.gz) = 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216
-SIZE (XML-Parser-2.44.tar.gz) = 237377
+TIMESTAMP = 1586303346
+SHA256 (XML-Parser-2.46.tar.gz) = d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d
+SIZE (XML-Parser-2.46.tar.gz) = 254763
diff --git a/textproc/p5-XML-Parser/files/check_nfs.pl b/textproc/p5-XML-Parser/files/check_nfs.pl
index 2f8c4cbe8a67..b1a4463f24fc 100644
--- a/textproc/p5-XML-Parser/files/check_nfs.pl
+++ b/textproc/p5-XML-Parser/files/check_nfs.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/textproc/p5-XML-Parser/files/iso-8859-15.enc b/textproc/p5-XML-Parser/files/iso-8859-15.enc
deleted file mode 100644
index 04f6a335ef50..000000000000
Binary files a/textproc/p5-XML-Parser/files/iso-8859-15.enc and /dev/null differ
diff --git a/textproc/p5-XML-Parser/files/patch-CheckLib.pm b/textproc/p5-XML-Parser/files/patch-CheckLib.pm
deleted file mode 100644
index 1da73f667b6c..000000000000
--- a/textproc/p5-XML-Parser/files/patch-CheckLib.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- inc/Devel/CheckLib.pm.orig	2013-01-11 11:43:02.293444337 +0900
-+++ inc/Devel/CheckLib.pm	2013-01-11 11:48:47.556449831 +0900
-@@ -222,7 +222,7 @@
-     for my $header (@headers) {
-         push @use_headers, $header;
-         my($ch, $cfile) = File::Temp::tempfile(
--            'assertlibXXXXXXXX', SUFFIX => '.c'
-+            'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
-         );
-         print $ch qq{#include <$_>\n} for @use_headers;
-         print $ch qq{int main(void) { return 0; }\n};
-@@ -262,7 +262,7 @@
- 
-     # now do each library in turn with headers
-     my($ch, $cfile) = File::Temp::tempfile(
--        'assertlibXXXXXXXX', SUFFIX => '.c'
-+        'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
-     );
-     print $ch qq{#include <$_>\n} foreach (@headers);
-     print $ch "int main(void) { ".($args{function} || 'return 0;')." }\n";
diff --git a/textproc/p5-XML-Parser/files/patch-inc_Devel_CheckLib.pm b/textproc/p5-XML-Parser/files/patch-inc_Devel_CheckLib.pm
new file mode 100644
index 000000000000..0ee7399fde32
--- /dev/null
+++ b/textproc/p5-XML-Parser/files/patch-inc_Devel_CheckLib.pm
@@ -0,0 +1,20 @@
+--- inc/Devel/CheckLib.pm.orig	2016-04-13 04:38:16 UTC
++++ inc/Devel/CheckLib.pm
+@@ -227,7 +227,7 @@ sub assert_lib {
+     # first figure out which headers we can't find ...
+     for my $header (@headers) {
+         push @use_headers, $header;
+-        my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c' );
++        my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1 );
+         my $ofile = $cfile;
+         $ofile =~ s/\.c$/$Config{_o}/;
+         print $ch qq{#include <$_>\n} for @use_headers;
+@@ -275,7 +275,7 @@ sub assert_lib {
+     }
+ 
+     # now do each library in turn with headers
+-    my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c' );
++    my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1 );
+     my $ofile = $cfile;
+     $ofile =~ s/\.c$/$Config{_o}/;
+     print $ch qq{#include <$_>\n} foreach (@headers);