From 75ba3da23cd2a2011536a8952aca1c141fcd8e46 Mon Sep 17 00:00:00 2001
From: Brad Fish <brad.fish@gmail.com>
Date: Thu, 27 Dec 2018 17:59:53 +0000
Subject: [PATCH] Re-enable mod_proxy_html

---
 www/apache24/Makefile      | 6 ++++--
 www/apache24/PLIST         | 4 +++-
 www/apache24/buildlink3.mk | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 578b0c20041be..8ae8cce74f39b 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -30,6 +30,7 @@ CONFIGURE_ARGS+=	--enable-mods-shared=all
 CONFIGURE_ARGS+=	--enable-so
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
 CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr-util}
+CONFIGURE_ARGS+=	--with-libxml2=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		perlbin=${PERL5:Q}
 CONFIGURE_ENV+=		ac_cv_path_RSYNC=/nonexistent
@@ -50,11 +51,12 @@ BUILDLINK_API_DEPENDS.apr-util+=	apr-util>=1.5.3
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-CONFIGURE_ARGS+=	--disable-xml2enc
-CONFIGURE_ARGS+=	--disable-proxy-html
+CONFIGURE_ARGS+=	--enable-xml2enc
+CONFIGURE_ARGS+=	--enable-proxy-html
 CONFIGURE_ARGS+=	--enable-proxy-fdpass
 
 DFLT_APACHE_MODULES+=	all
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index 8f93d6af63419..e371d6e2373fa 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2018/10/24 10:08:00 adam Exp $
+@comment $NetBSD$
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -150,6 +150,7 @@ lib/httpd/mod_proxy_fcgi.so
 lib/httpd/mod_proxy_fdpass.so
 lib/httpd/mod_proxy_ftp.so
 lib/httpd/mod_proxy_hcheck.so
+lib/httpd/mod_proxy_html.so
 lib/httpd/mod_proxy_http.so
 lib/httpd/mod_proxy_scgi.so
 lib/httpd/mod_proxy_uwsgi.so
@@ -183,6 +184,7 @@ lib/httpd/mod_usertrack.so
 lib/httpd/mod_version.so
 lib/httpd/mod_vhost_alias.so
 lib/httpd/mod_watchdog.so
+lib/httpd/mod_xml2enc.so
 libexec/cgi-bin/printenv
 libexec/cgi-bin/printenv.vbs
 libexec/cgi-bin/printenv.wsf
diff --git a/www/apache24/buildlink3.mk b/www/apache24/buildlink3.mk
index 3ab33948cae59..5f16026388c6b 100644
--- a/www/apache24/buildlink3.mk
+++ b/www/apache24/buildlink3.mk
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--with-apxs2=${APXS:Q}
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .endif # APACHE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-apache