Skip to content

Instantly share code, notes, and snippets.

@drscream
Created May 4, 2019 18:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save drscream/12017c157e6e5651da6324a14f3e1e66 to your computer and use it in GitHub Desktop.
Save drscream/12017c157e6e5651da6324a14f3e1e66 to your computer and use it in GitHub Desktop.
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index c2fa92deb01..27e8125a098 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -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/
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index b88fff4fea1..8ea5a992ec7 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -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
diff --git a/www/apache24/options.mk b/www/apache24/options.mk
index 9a0d907f91a..042d0ac12b6 100644
--- a/www/apache24/options.mk
+++ b/www/apache24/options.mk
@@ -2,9 +2,9 @@
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
@@ -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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment