CVS commit: pkgsrc

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Fri Jun  7 11:26:20 UTC 2019

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

Log Message:
apache24: Add mod_brotli option

The mod_brotli module provides the BROTLI_COMPRESS output filter that
allows output from your server to be compressed using the brotli
compression format before being sent to the client over the network.


To generate a diff of this commit:
cvs rdiff -u -r1.583 -r1.584 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.79 -r1.80 pkgsrc/www/apache24/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/apache24/PLIST
cvs rdiff -u -r1.14 -r1.15 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/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.583 pkgsrc/mk/defaults/options.description:1.584
--- pkgsrc/mk/defaults/options.description:1.583        Sat Jun  1 18:08:07 2019
+++ pkgsrc/mk/defaults/options.description      Fri Jun  7 11:26:20 2019
@@ -65,6 +65,7 @@ blender-exppython     Enable the Experimenta
 bluray                 Enable libbluray support.
 boehm-gc               Use Boehm's garbage collector for memory allocation.
 bozohttpd-do-htpasswd  Enable .htpasswd file processing in bozohttpd.
+brotli                 Provides the BROTLI_COMPRESS output filter.
 bugzilla-charts                Enable generation of charts.
 bugzilla-imagemagick   Compress .BMPs to save space.
 bugzilla-patchviewer   Enable patchviewer support.

Index: pkgsrc/www/apache24/Makefile
diff -u pkgsrc/www/apache24/Makefile:1.79 pkgsrc/www/apache24/Makefile:1.80
--- pkgsrc/www/apache24/Makefile:1.79   Thu May 23 19:23:19 2019
+++ pkgsrc/www/apache24/Makefile        Fri Jun  7 11:26:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2019/05/23 19:23:19 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2019/06/07 11:26:20 tm Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
@@ -7,7 +7,7 @@
 
 DISTNAME=      httpd-2.4.39
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
 MASTER_SITES+= http://archive.apache.org/dist/httpd/

Index: pkgsrc/www/apache24/PLIST
diff -u pkgsrc/www/apache24/PLIST:1.29 pkgsrc/www/apache24/PLIST:1.30
--- pkgsrc/www/apache24/PLIST:1.29      Fri Apr  5 13:48:38 2019
+++ pkgsrc/www/apache24/PLIST   Fri Jun  7 11:26:20 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2019/04/05 13:48:38 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.30 2019/06/07 11:26:20 tm Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -95,6 +95,7 @@ lib/httpd/mod_authz_host.so
 lib/httpd/mod_authz_owner.so
 lib/httpd/mod_authz_user.so
 lib/httpd/mod_autoindex.so
+${PLIST.brotli}lib/httpd/mod_brotli.so
 lib/httpd/mod_buffer.so
 lib/httpd/mod_cache.so
 lib/httpd/mod_cache_disk.so

Index: pkgsrc/www/apache24/options.mk
diff -u pkgsrc/www/apache24/options.mk:1.14 pkgsrc/www/apache24/options.mk:1.15
--- pkgsrc/www/apache24/options.mk:1.14 Fri Apr  5 13:48:38 2019
+++ pkgsrc/www/apache24/options.mk      Fri Jun  7 11:26:20 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.14 2019/04/05 13:48:38 jperkin Exp $
+# $NetBSD: options.mk,v 1.15 2019/06/07 11:26:20 tm Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=         apache-mpm-event apache-mpm-prefork apache-mpm-worker \
-                               lua http2 suexec xml
+                               brotli lua http2 suexec xml
 PKG_SUGGESTED_OPTIONS=         apache-mpm-event apache-mpm-prefork \
-                               apache-mpm-worker http2 xml
+                               apache-mpm-worker brotli 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 xml
+PLIST_VARS+=           brotli http2 lua privileges suexec xml
 
 .if !empty(PKG_OPTIONS:Mapache-mpm-event)
 MPMS+=                 event
@@ -116,6 +116,13 @@ CONFIGURE_ARGS+=   --disable-proxy-html
 CONFIGURE_ARGS+=       --disable-xml2enc
 .endif
 
+.if !empty(PKG_OPTIONS:Mbrotli)
+.include "../../archivers/brotli/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-brotli
+CONFIGURE_ARGS+=       --with-brotli=${PREFIX}
+PLIST.brotli=          yes
+.endif
+
 # DTrace support is manifest, but actually not implemented at all
 #.if !empty(PKG_OPTIONS:Mdtrace)
 #CONFIGURE_ARGS+=      --enable-dtrace