summaryrefslogtreecommitdiff
path: root/lang/php53
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2012-02-09 15:48:54 +0000
committerAlex Dupre <ale@FreeBSD.org>2012-02-09 15:48:54 +0000
commit8796d6d0d69c06c0e50e00539ec7efc0a0924155 (patch)
treef04520f6fdd5fea53aa1c7a5695983e4811d798d /lang/php53
parent- Add additional TEST_DEPENDS (diff)
Restore accidentally removed patch hunk.
Notes
Notes: svn path=/head/; revision=290792
Diffstat (limited to 'lang/php53')
-rw-r--r--lang/php53/files/patch-sapi_fpm_Makefile.frag21
1 files changed, 19 insertions, 2 deletions
diff --git a/lang/php53/files/patch-sapi_fpm_Makefile.frag b/lang/php53/files/patch-sapi_fpm_Makefile.frag
index 177f4d2c151b..53da2da35f7c 100644
--- a/lang/php53/files/patch-sapi_fpm_Makefile.frag
+++ b/lang/php53/files/patch-sapi_fpm_Makefile.frag
@@ -1,5 +1,22 @@
---- 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
+--- sapi/fpm/Makefile.frag.orig 2011-10-08 23:04:10.000000000 +0200
++++ sapi/fpm/Makefile.frag 2012-02-09 16:43:25.000000000 +0100
+@@ -4,14 +4,14 @@
+ @mkdir -p $(builddir)/fpm
+ @mkdir -p $(builddir)/fpm/events
+
+-$(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
@@ -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