diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 93e197978f94..edcdd809a5b4 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,69 +1,89 @@
 PORTNAME=	XML-Parser
 PORTVERSION=	2.46
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		perl5
 USE_PERL5=	configure
 
 CONFIGURE_ARGS=	EXPATINCPATH=${LOCALBASE}/include EXPATLIBPATH=${LOCALBASE}/lib
 
-PLIST_SUB=	EUCJP=${EUCJP} SJIS=${SJIS}
-
 CONV_ENC=	${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print'
 
-# XMLPARSER_EUCJP=	x-euc-jp-(jisx0221|unicode)
-# XMLPARSER_SJIS=	x-sjis-(cp932|jdk117|jisx0221|unicode)
-.if !defined(XMLPARSER_EUCJP)
-EUCJP=		"@comment "
-.endif
-.if !defined(XMLPARSER_SJIS)
-SJIS=		"@comment "
-.endif
-.if defined(XMLPARSER_EUCJP) || defined(XMLPARSER_SJIS)
-USE_PERL5+=	patch
-.endif
+OPTIONS_RADIO=	EUCJP SJIS
+OPTIONS_RADIO_EUCJP=	EUCJP_JISX0221 EUCJP_UNICODE
+OPTIONS_RADIO_SJIS=	SJIS_CP932 SJIS_JDK117 SJIS_JISX0221 SJIS_UNICODE
+OPTIONS_SUB=	yes
+EUCJP_JISX0221_DESC=	Install euc-jp.enc (generated from x-euc-jp-jisx0221.enc)
+EUCJP_UNICODE_DESC=	Install euc-jp.enc (generated from x-euc-jp-unicode.enc)
+SJIS_CP932_DESC=	Install shift_jis.enc (generated from x-sjis-cp932.enc)
+SJIS_JDK117_DESC=	Install shift_jis.enc (generated from x-sjis-jdk117.enc)
+SJIS_JISX0221_DESC=	Install shift_jis.enc (generated from x-sjis-jisx0221.enc)
+SJIS_UNICODE_DESC=	Install shift_jis.enc (generated from x-sjis-unicode.enc)
 
-post-patch:
-.if defined(XMLPARSER_EUCJP)
-	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
+EUCJP_JISX0221_USE=	PERL5=patch
+EUCJP_UNICODE_USE=	PERL5=patch
+SJIS_CP932_USE=		PERL5=patch
+SJIS_JDK117_USE=	PERL5=patch
+SJIS_JISX0221_USE=	PERL5=patch
+SJIS_UNICODE_USE=	PERL5=patch
+
+pre-patch-EUCJP_JISX0221-on:
+	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} euc-jp x-euc-jp-jisx0221.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
+
+pre-patch-EUCJP_UNICODE-on:
+	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} euc-jp x-euc-jp-unicode.enc > euc-jp.enc
+	@${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
+
+pre-patch-SJIS_CP932-on:
+	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-cp932.enc > shift_jis.enc
+	@${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST
+
+pre-patch-SJIS_JDK117-on:
+	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-jdk117.enc > shift_jis.enc
+	@${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST
+
+pre-patch-SJIS_JISX0221-on:
+	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-jisx0221.enc > shift_jis.enc
 	@${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST
-.endif
+
+pre-patch-SJIS_UNICODE-on:
+	@cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-unicode.enc > shift_jis.enc
+	@${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST
+
+post-patch:
 	@${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/
 .for e in 1 6 10 11 13 14 15
 	@${ECHO_CMD} Parser/Encodings/iso-8859-${e}.enc >> ${WRKSRC}/MANIFEST
 .endfor
 
 post-configure:
 	@${PERL} -i -pe 's|^(CC = ).*|$$1 ${CC}|;' -e 's|^(CCFLAGS = ).*|$$1 ${CFLAGS}|' ${WRKSRC}/Expat/Makefile
 
 pre-build:
 	@cd ${WRKDIR} && ${PERL} ${FILESDIR}/check_nfs.pl 2>/dev/null || (${ECHO_MSG} "===>  lockf in \$$TMPDIR required"; ${FALSE})
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/Parser/Expat/Expat.so
 
 # maintainer section:
 # require: p5-XML-Encoding
 
 build-encodings:
 .for e in 1 6 10 11 13 14 15
 	${MAKE_CMD} -C ${.CURDIR}/../p5-XML-Encoding patch
 	cd `${MAKE_CMD} -C ${.CURDIR}/../p5-XML-Encoding -V WRKSRC` && ${PERL} bin/compile_encoding -o ${FILESDIR}/iso-8859-${e}.enc maps/iso-8859-${e}.xml
 	${MAKE_CMD} -C ${.CURDIR}/../p5-XML-Encoding do-clean
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist
index 92559b641384..faceadcb5b59 100644
--- a/textproc/p5-XML-Parser/pkg-plist
+++ b/textproc/p5-XML-Parser/pkg-plist
@@ -1,48 +1,52 @@
 %%SITE_ARCH%%/XML/Parser.pm
 %%SITE_ARCH%%/XML/Parser/Encodings/Japanese_Encodings.msg
 %%SITE_ARCH%%/XML/Parser/Encodings/README
 %%SITE_ARCH%%/XML/Parser/Encodings/big5.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/euc-kr.enc
-%%EUCJP%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc
+%%EUCJP_JISX0221%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc
+%%EUCJP_UNICODE%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/ibm866.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-1.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-10.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-11.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-13.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-14.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-15.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-2.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-3.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-4.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-5.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-6.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-7.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/koi8-r.enc
-%%SJIS%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc
+%%SJIS_CP932%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc
+%%SJIS_JDK117%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc
+%%SJIS_JISX0221%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc
+%%SJIS_UNICODE%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/windows-1250.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/windows-1251.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/windows-1252.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/windows-1255.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/x-euc-jp-unicode.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-cp932.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-jdk117.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-jisx0221.enc
 %%SITE_ARCH%%/XML/Parser/Encodings/x-sjis-unicode.enc
 %%SITE_ARCH%%/XML/Parser/Expat.pm
 %%SITE_ARCH%%/XML/Parser/LWPExternEnt.pl
 %%SITE_ARCH%%/XML/Parser/Style/Debug.pm
 %%SITE_ARCH%%/XML/Parser/Style/Objects.pm
 %%SITE_ARCH%%/XML/Parser/Style/Stream.pm
 %%SITE_ARCH%%/XML/Parser/Style/Subs.pm
 %%SITE_ARCH%%/XML/Parser/Style/Tree.pm
 %%SITE_ARCH%%/auto/XML/Parser/Expat/Expat.so
 %%PERL5_MAN3%%/XML::Parser.3.gz
 %%PERL5_MAN3%%/XML::Parser::Expat.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Debug.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Objects.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Stream.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Subs.3.gz
 %%PERL5_MAN3%%/XML::Parser::Style::Tree.3.gz