CVS commit: pkgsrc/www/apache24

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Apr  5 13:48:39 UTC 2019

Modified Files:
        pkgsrc/www/apache24: Makefile PLIST options.mk

Log Message:
apache24: Make xml support optional, defaulting to on.

Allows mod_proxy_html to be supported again.  Based on a pull request from
vec4f in joyent/pkgsrc#169.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/www/apache24/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/apache24/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/apache24/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache24/Makefile
diff -u pkgsrc/www/apache24/Makefile:1.77 pkgsrc/www/apache24/Makefile:1.78
--- pkgsrc/www/apache24/Makefile:1.77   Tue Apr  2 07:25:38 2019
+++ pkgsrc/www/apache24/Makefile        Fri Apr  5 13:48:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2019/04/02 07:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.78 2019/04/05 13:48:38 jperkin Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
@@ -7,6 +7,7 @@
 
 DISTNAME=      httpd-2.4.39
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
 MASTER_SITES+= http://archive.apache.org/dist/httpd/
@@ -52,8 +53,6 @@ BUILDLINK_API_DEPENDS.apr-util+=      apr-uti
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-CONFIGURE_ARGS+=       --disable-xml2enc
-CONFIGURE_ARGS+=       --disable-proxy-html
 CONFIGURE_ARGS+=       --enable-proxy-fdpass
 
 DFLT_APACHE_MODULES+=  all

Index: pkgsrc/www/apache24/PLIST
diff -u pkgsrc/www/apache24/PLIST:1.28 pkgsrc/www/apache24/PLIST:1.29
--- pkgsrc/www/apache24/PLIST:1.28      Tue Apr  2 07:25:38 2019
+++ pkgsrc/www/apache24/PLIST   Fri Apr  5 13:48:38 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2019/04/02 07:25:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2019/04/05 13:48:38 jperkin Exp $
 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
+${PLIST.xml}lib/httpd/mod_proxy_html.so
 lib/httpd/mod_proxy_http.so
 lib/httpd/mod_proxy_scgi.so
 lib/httpd/mod_proxy_uwsgi.so
@@ -184,6 +185,7 @@ lib/httpd/mod_usertrack.so
 lib/httpd/mod_version.so
 lib/httpd/mod_vhost_alias.so
 lib/httpd/mod_watchdog.so
+${PLIST.xml}lib/httpd/mod_xml2enc.so
 libexec/cgi-bin/printenv
 libexec/cgi-bin/printenv.vbs
 libexec/cgi-bin/printenv.wsf

Index: pkgsrc/www/apache24/options.mk
diff -u pkgsrc/www/apache24/options.mk:1.13 pkgsrc/www/apache24/options.mk:1.14
--- pkgsrc/www/apache24/options.mk:1.13 Sat Jan 28 04:57:57 2017
+++ pkgsrc/www/apache24/options.mk      Fri Apr  5 13:48:38 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.13 2017/01/28 04:57:57 ryoon Exp $
+# $NetBSD: options.mk,v 1.14 2019/04/05 13:48:38 jperkin Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=         apache-mpm-event apache-mpm-prefork apache-mpm-worker \
-                               lua http2 suexec
+                               lua http2 suexec xml
 PKG_SUGGESTED_OPTIONS=         apache-mpm-event apache-mpm-prefork \
-                               apache-mpm-worker http2
+                               apache-mpm-worker http2 xml
 
 .if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9])
 PKG_SUPPORTED_OPTIONS+=                privileges
@@ -25,7 +25,7 @@ PKG_SUPPORTED_OPTIONS+=               privileges
 #      worker          hybrid multi-threaded multi-process web server
 #
 PLIST_VARS+=           worker prefork event only-prefork not-only-prefork
-PLIST_VARS+=           http2 lua privileges suexec
+PLIST_VARS+=           http2 lua privileges suexec xml
 
 .if !empty(PKG_OPTIONS:Mapache-mpm-event)
 MPMS+=                 event
@@ -105,6 +105,17 @@ CONFIGURE_ARGS+=   --enable-privileges
 PLIST.privileges=      yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mxml)
+.include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-libxml2=${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+=       --enable-proxy-html
+CONFIGURE_ARGS+=       --enable-xml2enc
+PLIST.xml=             yes
+.else
+CONFIGURE_ARGS+=       --disable-proxy-html
+CONFIGURE_ARGS+=       --disable-xml2enc
+.endif
+
 # DTrace support is manifest, but actually not implemented at all
 #.if !empty(PKG_OPTIONS:Mdtrace)
 #CONFIGURE_ARGS+=      --enable-dtrace