diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 1fdfe1d3246e..94cc5734318c 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	HTML-Mason
-PORTVERSION=	1.03
+PORTVERSION=	1.04
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
@@ -18,8 +18,8 @@ BUILD_DEPENDS=	${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
 		${SITE_PERL}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-IS_INTERACTIVE=	yes
 PERL_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--no-prompts
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
diff --git a/www/p5-HTML-Mason/distinfo b/www/p5-HTML-Mason/distinfo
index b2520c9c43ab..21efc68dd1c9 100644
--- a/www/p5-HTML-Mason/distinfo
+++ b/www/p5-HTML-Mason/distinfo
@@ -1 +1 @@
-MD5 (HTML-Mason-1.03.tar.gz) = 7b914a712b0b58194d80701d27dca2aa
+MD5 (HTML-Mason-1.04.tar.gz) = aee8b61b950f7061687bf4965e786e58
diff --git a/www/p5-HTML-Mason/pkg-plist b/www/p5-HTML-Mason/pkg-plist
index 01cd8f5d0b45..b3abdca881f6 100644
--- a/www/p5-HTML-Mason/pkg-plist
+++ b/www/p5-HTML-Mason/pkg-plist
@@ -34,5 +34,8 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Mason/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Component
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason/Resolver
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTML/Mason
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/HTML
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle/HTML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true