diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2012-02-08 14:53:55 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2012-02-08 14:53:55 +0000 |
| commit | 1c08b00624732c0270a7d0657b9686d11c88a55a (patch) | |
| tree | d9eabd199d8f8208fd17722fc89b887b2713f93e /lang/php5 | |
| parent | e29ff365246bf1e509aa88e3965ebea6d31f2656 (diff) | |
| download | ports-1c08b00624732c0270a7d0657b9686d11c88a55a.tar.gz ports-1c08b00624732c0270a7d0657b9686d11c88a55a.zip | |
Notes
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/files/patch-sapi_fpm_Makefile.frag | 31 | ||||
| -rw-r--r-- | lang/php5/files/patch-sapi_fpm_php-fpm.conf.in | 11 | ||||
| -rw-r--r-- | lang/php5/pkg-plist | 3 |
3 files changed, 26 insertions, 19 deletions
diff --git a/lang/php5/files/patch-sapi_fpm_Makefile.frag b/lang/php5/files/patch-sapi_fpm_Makefile.frag index 205537ef04e2..177f4d2c151b 100644 --- a/lang/php5/files/patch-sapi_fpm_Makefile.frag +++ b/lang/php5/files/patch-sapi_fpm_Makefile.frag @@ -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_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 +--- 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 + +- @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 diff --git a/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in b/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in new file mode 100644 index 000000000000..315f2470a773 --- /dev/null +++ b/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in @@ -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 diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index 0afa4ba28ce6..26bbd01e52ce 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -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 |