freebsd-ports/www/mod_pagespeed/files/patch-install_Makefile
Mahdi Mokhtari 60a05e200a www/mod_pagespeed: Add latest stable version to the tree
mod_pagespeed is an open-source Apache module that automatically
optimizes web pages and resources on them by rewriting the
resources using filters that implement web performance best practices.

Reviewed by:	mat (mentor)
Approved by:	mat (mentor)
Sponsored by:	Netzkommune GmbH
Differential Revision:	https://reviews.freebsd.org/D12616
2017-10-13 15:15:53 +00:00

87 lines
3.8 KiB
Text

--- install/Makefile.orig 2017-06-08 22:22:39 UTC
+++ install/Makefile
@@ -163,7 +163,7 @@ CONF_SOURCES = $(STAGING_DIR)/pagespeed.
MODS_ENABLED_INSTALL_COMMANDS = \
cp -f $(STAGING_DIR)/pagespeed_libraries.conf \
- $(APACHE_CONF_DIR)/pagespeed_libraries.conf
+ %%PORTSSTAGE%%$(APACHE_CONF_DIR)/pagespeed_libraries.conf.sample
else
@@ -172,7 +172,7 @@ else
# independently.
MODS_ENABLED_INSTALL_COMMANDS = \
for file in pagespeed.load pagespeed_libraries.conf; do \
- cp -f $(STAGING_DIR)/$$file $(MODS_AVAILABLE_DIR) ; \
+ cp -f $(STAGING_DIR)/$$file %%PORTSSTAGE%%$(MODS_AVAILABLE_DIR) ; \
cd $(MODS_ENABLED_DIR) && ln -sf ../mods-available/$$file ; \
done; \
rm -f $(MODS_ENABLED_DIR)/headers.load ; \
@@ -298,40 +298,34 @@ staging_except_module : setup_staging_di
cp -f $(LIBRARY_CONF_SOURCE) $(STAGING_DIR)/pagespeed_libraries.conf
$(MODS_ENABLED_STAGING_COMMANDS)
cp -rp mod_pagespeed_example mod_pagespeed_test $(STAGING_DIR)
- @echo Changing security context of $(APACHE_DOC_ROOT)
- @echo This will fail and be ignored if your selinux isn\'t set up.
- -chcon -R --reference=$(APACHE_DOC_ROOT) $(STAGING_DIR)
staging : staging_except_module
- cp $(PAGESPEED_MODULE) $(STAGING_DIR)/mod_pagespeed.so
- cp $(PAGESPEED_MODULE_24) $(STAGING_DIR)/mod_pagespeed_ap24.so
- cp $(PAGESPEED_JS_MINIFY) $(STAGING_DIR)/pagespeed_js_minify
+ if [ -x $(PAGESPEED_MODULE) ]; then cp $(PAGESPEED_MODULE) $(STAGING_DIR)/mod_pagespeed.so; fi
+ if [ -x $(PAGESPEED_MODULE_24) ]; then cp $(PAGESPEED_MODULE_24) $(STAGING_DIR)/mod_pagespeed_ap24.so; fi
+ if [ -x $(PAGESPEED_JS_MINIFY) ]; then cp $(PAGESPEED_JS_MINIFY) $(STAGING_DIR)/pagespeed_js_minify; fi
install_except_module : mod_pagespeed_file_root
$(MODS_ENABLED_INSTALL_COMMANDS)
- cat $(CONF_SOURCES) > $(APACHE_CONF_DIR)/pagespeed.conf
- ln -Tsf $(STAGING_DIR)/mod_pagespeed_example \
- $(APACHE_DOC_ROOT)/mod_pagespeed_example
- ln -Tsf $(STAGING_DIR)/mod_pagespeed_test \
- $(APACHE_DOC_ROOT)/mod_pagespeed_test
+ cat $(CONF_SOURCES) > %%PORTSSTAGE%%$(APACHE_CONF_DIR)/pagespeed.conf.sample
+ ln -sf $(STAGING_DIR)/mod_pagespeed_example \
+ %%PORTSSTAGE%%$(APACHE_DOC_ROOT)/mod_pagespeed_example
+ ln -sf $(STAGING_DIR)/mod_pagespeed_test \
+ %%PORTSSTAGE%%$(APACHE_DOC_ROOT)/mod_pagespeed_test
# To install the mod_pagespeed configuration into the system, you must
# run this as root, or under sudo.
install : install_except_module
- cp $(STAGING_DIR)/mod_pagespeed.so $(APACHE_MODULES)
- cp $(STAGING_DIR)/mod_pagespeed_ap24.so $(APACHE_MODULES)
- cp $(STAGING_DIR)/pagespeed_js_minify $(BINDIR)
+ if [ -x $(PAGESPEED_MODULE) ]; then cp $(STAGING_DIR)/mod_pagespeed.so %%PORTSSTAGE%%$(APACHE_MODULES); fi
+ if [ -x $(PAGESPEED_MODULE_24) ]; then cp $(STAGING_DIR)/mod_pagespeed_ap24.so %%PORTSSTAGE%%$(APACHE_MODULES); fi
+ if [ -x $(PAGESPEED_JS_MINIFY) ]; then cp $(STAGING_DIR)/pagespeed_js_minify %%PORTSSTAGE%%$(BINDIR); fi
mod_pagespeed_file_root :
- mkdir -p $(MOD_PAGESPEED_CACHE)
- chown -R $(APACHE_USER) $(MOD_PAGESPEED_CACHE)
-
- mkdir -p $(MOD_PAGESPEED_CACHE)-alt
- chown -R $(APACHE_USER) $(MOD_PAGESPEED_CACHE)-alt
-
- mkdir -p $(MOD_PAGESPEED_LOG)
- chown -R $(APACHE_USER) $(MOD_PAGESPEED_LOG)
-
+ mkdir -p %%PORTSSTAGE%%$(MOD_PAGESPEED_CACHE)
+
+ mkdir -p %%PORTSSTAGE%%$(MOD_PAGESPEED_CACHE)-alt
+
+ mkdir -p %%PORTSSTAGE%%$(MOD_PAGESPEED_LOG)
+
flush_disk_cache :
rm -rf $(MOD_PAGESPEED_CACHE)
$(MAKE) MOD_PAGESPEED_CACHE=$(MOD_PAGESPEED_CACHE) \
@@ -419,8 +413,6 @@ enable_ports_and_file_access :
$(MOD_PAGESPEED_CACHE)-alt \
$(MOD_PAGESPEED_LOG) ; do \
sudo mkdir -p $$dir; \
- sudo chown $(APACHE_USER) $$dir; \
- sudo chcon -R --reference=$(APACHE_DOC_ROOT) $$dir || true; \
done; \
/usr/sbin/setsebool httpd_can_network_connect on; \
fi