Attachment #154671 for bug #198801

View | Details | Raw Unified | Return to bug 198801
Collapse All | Expand All





$FreeBSD$

--- sapi/fpm/Makefile.frag.orig
+++ sapi/fpm/Makefile.frag
@@ -12,12 +12,12 @@
 
 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.sample || :
 
 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
 	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
 

Lines 6-14 Link Here

(-)php5/pkg-plist (-3 / +1 lines)
6	etc/php.conf	6	etc/php.conf
7	etc/php.ini-development	7	etc/php.ini-development
8	etc/php.ini-production	8	etc/php.ini-production
9	%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi	9	%%FPM%%@sample etc/php-fpm.conf.sample
10	%%FPM%%etc/php-fpm.conf.default
11	%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
12	include/php/TSRM/TSRM.h	10	include/php/TSRM/TSRM.h
13	include/php/TSRM/readdir.h	11	include/php/TSRM/readdir.h
14	include/php/TSRM/tsrm_config.h	12	include/php/TSRM/tsrm_config.h

Lines 52-58 Link Here

(-)php55/Makefile (-1 / +1 lines)
52	LINKTHR_DESC= Link thread lib (for threaded extensions)	52	LINKTHR_DESC= Link thread lib (for threaded extensions)
53	ZTS_DESC= Force Zend Thread Safety (ZTS) build	53	ZTS_DESC= Force Zend Thread Safety (ZTS) build
54		54
55	CONFLICTS= php53-5* php54-5* php56-5* php5-5*	55	CONFLICTS= php53-5* php56-5* php5-5*
56		56
57	DESTDIRNAME= INSTALL_ROOT	57	DESTDIRNAME= INSTALL_ROOT
58		58





$FreeBSD$

--- sapi/fpm/Makefile.frag.orig
+++ sapi/fpm/Makefile.frag
@@ -12,7 +12,7 @@
 
 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.sample || :
 
 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

Lines 6-14 Link Here

(-)php55/pkg-plist (-3 / +1 lines)
6	etc/php.conf	6	etc/php.conf
7	etc/php.ini-development	7	etc/php.ini-development
8	etc/php.ini-production	8	etc/php.ini-production
9	%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi	9	%%FPM%%@sample etc/php-fpm.conf.sample
10	%%FPM%%etc/php-fpm.conf.default
11	%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
12	include/php/TSRM/TSRM.h	10	include/php/TSRM/TSRM.h
13	include/php/TSRM/readdir.h	11	include/php/TSRM/readdir.h
14	include/php/TSRM/tsrm_config.h	12	include/php/TSRM/tsrm_config.h

Lines 52-58 Link Here

(-)php56/Makefile (-1 / +1 lines)
52	LINKTHR_DESC= Link thread lib (for threaded extensions)	52	LINKTHR_DESC= Link thread lib (for threaded extensions)
53	ZTS_DESC= Force Zend Thread Safety (ZTS) build	53	ZTS_DESC= Force Zend Thread Safety (ZTS) build
54		54
55	CONFLICTS= php53-5* php54-5* php55-5* php5-5*	55	CONFLICTS= php53-5* php55-5* php5-5*
56		56
57	DESTDIRNAME= INSTALL_ROOT	57	DESTDIRNAME= INSTALL_ROOT
58		58





$FreeBSD$

--- sapi/fpm/Makefile.frag.orig
+++ sapi/fpm/Makefile.frag
@@ -12,7 +12,7 @@
 
 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.sample || :
 
 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

Lines 7-15 Link Here

(-)php56/pkg-plist (-3 / +1 lines)
7	etc/php.conf	7	etc/php.conf
8	etc/php.ini-development	8	etc/php.ini-development
9	etc/php.ini-production	9	etc/php.ini-production
10	%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi	10	%%FPM%%@sample etc/php-fpm.conf.sample
11	%%FPM%%etc/php-fpm.conf.default
12	%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
13	include/php/TSRM/TSRM.h	11	include/php/TSRM/TSRM.h
14	include/php/TSRM/readdir.h	12	include/php/TSRM/readdir.h
15	include/php/TSRM/tsrm_config.h	13	include/php/TSRM/tsrm_config.h

Return to bug 198801

Lines 1-6 Link Here

(-)php5/files/patch-sapi_fpm_Makefile.frag (-3 / +13 lines)
1	--- sapi/fpm/Makefile.frag.orig 2013-12-10 19:32:43.000000000 +0000	1
2	+++ sapi/fpm/Makefile.frag 2013-12-13 21:55:54.402236058 +0000	2	$FreeBSD$
3	@@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH)	3
		4	--- sapi/fpm/Makefile.frag.orig
		5	+++ sapi/fpm/Makefile.frag
		6	@@ -12,12 +12,12 @@
		7
		8	@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
		9	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) \|\| :
		10	- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default \|\| :
		11	+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.sample \|\| :
		12
		13	@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
4	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8	14	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
5	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8	15	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
6		16

Line 0 Link Here

(-)php55/files/patch-sapi_fpm_Makefile.frag (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- sapi/fpm/Makefile.frag.orig
	5	+++ sapi/fpm/Makefile.frag
	6	@@ -12,7 +12,7 @@
	7
	8	@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
	9	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) \|\| :
	10	- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default \|\| :
	11	+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.sample \|\| :
	12
	13	@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
	14	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

Line 0 Link Here

(-)php56/files/patch-sapi_fpm_Makefile.frag (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- sapi/fpm/Makefile.frag.orig
	5	+++ sapi/fpm/Makefile.frag
	6	@@ -12,7 +12,7 @@
	7
	8	@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
	9	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) \|\| :
	10	- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default \|\| :
	11	+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.sample \|\| :
	12
	13	@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
	14	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8