mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

When FPM is selected, install status.html into ${PREFIX}/share/php/fpm/.

Browse Source 
Submitted by:	Michael Vorobyov <vmb@ric168.ru>
This commit is contained in:
Alex Dupre 2012-02-08 14:53:55 +00:00
parent e29ff36524
commit 1c08b00624
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=290720
6 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lang/php5/files/patch-sapi_fpm_Makefile.frag
View File

@ -1,19 +1,12 @@
--- sapi/fpm/Makefile.frag.orig 2010-07-27 15:57:32.000000000 +0200
+++ sapi/fpm/Makefile.frag 2010-07-27 15:57:06.000000000 +0200
@@ -3,14 +3,14 @@
$(builddir)/fpm:
@mkdir -p $(builddir)/fpm
--- sapi/fpm/Makefile.frag.orig 2012-02-08 15:48:16.000000000 +0100
+++ sapi/fpm/Makefile.frag 2012-02-08 15:48:44.000000000 +0100
@@ -27,6 +27,6 @@
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(FPM_EXTRA_DEPS)
$(BUILD_FPM)
$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
install-build: install-fpm
-install-fpm: install-sapi
+install-fpm:
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
- @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/"
- @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm
- @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html
+ @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/php/fpm/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm
+ @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html

11
lang/php5/files/patch-sapi_fpm_php-fpm.conf.in Normal file
View File

@ -0,0 +1,11 @@
--- sapi/fpm/php-fpm.conf.in.orig 2012-02-08 15:50:42.000000000 +0100
+++ sapi/fpm/php-fpm.conf.in 2012-02-08 15:50:54.000000000 +0100
@@ -317,7 +317,7 @@
; last request memory: 0
;
; Note: There is a real-time FPM status monitoring sample web page available
-; It's available in: @EXPANDED_DATADIR@/fpm/status.html
+; It's available in: @EXPANDED_DATADIR@/php/fpm/status.html
;
; Note: The value must start with a leading slash (/). The value can be
; anything, but it may not be a good idea to use the .php extension or it

3
lang/php5/pkg-plist
View File

@ -236,6 +236,7 @@ lib/php/build/shtool
%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%%
%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
%%FPM%%share/php/fpm/status.html
@dirrm include/php/TSRM
@dirrm include/php/Zend
@dirrm include/php/ext/date/lib
@ -253,3 +254,5 @@ lib/php/build/shtool
@dirrmtry include/php
@dirrm lib/php/build
@dirrmtry lib/php
%%FPM%%@dirrm share/php/fpm
%%FPM%%@dirrm share/php

29
lang/php53/files/patch-sapi_fpm_Makefile.frag
View File

@ -1,19 +1,12 @@
--- sapi/fpm/Makefile.frag.orig 2010-07-27 15:57:32.000000000 +0200
+++ sapi/fpm/Makefile.frag 2010-07-27 15:57:06.000000000 +0200
@@ -3,14 +3,14 @@
$(builddir)/fpm:
@mkdir -p $(builddir)/fpm
--- sapi/fpm/Makefile.frag.orig 2012-02-08 15:48:16.000000000 +0100
+++ sapi/fpm/Makefile.frag 2012-02-08 15:48:44.000000000 +0100
@@ -27,6 +27,6 @@
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(FPM_EXTRA_DEPS)
$(BUILD_FPM)
$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
install-build: install-fpm
-install-fpm: install-sapi
+install-fpm:
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
- @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/"
- @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm
- @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html
+ @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/php/fpm/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm
+ @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html

11
lang/php53/files/patch-sapi_fpm_php-fpm.conf.in Normal file
View File

@ -0,0 +1,11 @@
--- sapi/fpm/php-fpm.conf.in.orig 2012-02-08 15:50:42.000000000 +0100
+++ sapi/fpm/php-fpm.conf.in 2012-02-08 15:50:54.000000000 +0100
@@ -317,7 +317,7 @@
; last request memory: 0
;
; Note: There is a real-time FPM status monitoring sample web page available
-; It's available in: @EXPANDED_DATADIR@/fpm/status.html
+; It's available in: @EXPANDED_DATADIR@/php/fpm/status.html
;
; Note: The value must start with a leading slash (/). The value can be
; anything, but it may not be a good idea to use the .php extension or it

3
lang/php53/pkg-plist
View File

@ -236,6 +236,7 @@ lib/php/build/shtool
%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%%
%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
%%FPM%%share/php/fpm/status.html
@dirrm include/php/TSRM
@dirrm include/php/Zend
@dirrm include/php/ext/date/lib
@ -253,3 +254,5 @@ lib/php/build/shtool
@dirrmtry include/php
@dirrm lib/php/build
@dirrmtry lib/php
%%FPM%%@dirrm share/php/fpm
%%FPM%%@dirrm share/php