Attachment 154671 Details for Bug 198801 – lang/php5*

[patch] lang/php5*

php.patch (text/plain), 5.04 KB, created by Jimmy Olgeni on 2015-03-22 20:01:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2015-03-22 20:01:14 UTC

Size: 5.04 KB

patch

obsolete

>Index: php5/files/patch-sapi_fpm_Makefile.frag
>===================================================================
>--- php5/files/patch-sapi_fpm_Makefile.frag	(revision 381932)
>+++ php5/files/patch-sapi_fpm_Makefile.frag	(working copy)
>@@ -1,6 +1,16 @@
>---- sapi/fpm/Makefile.frag.orig	2013-12-10 19:32:43.000000000 +0000
>-+++ sapi/fpm/Makefile.frag	2013-12-13 21:55:54.402236058 +0000
>-@@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH)
>+
>+$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
>  
>Index: php5/pkg-plist
>===================================================================
>--- php5/pkg-plist	(revision 381932)
>+++ php5/pkg-plist	(working copy)
>@@ -6,9 +6,7 @@
> etc/php.conf
> etc/php.ini-development
> etc/php.ini-production
>-%%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
>-%%FPM%%etc/php-fpm.conf.default
>-%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
>+%%FPM%%@sample etc/php-fpm.conf.sample
> include/php/TSRM/TSRM.h
> include/php/TSRM/readdir.h
> include/php/TSRM/tsrm_config.h
>Index: php55/Makefile
>===================================================================
>--- php55/Makefile	(revision 381932)
>+++ php55/Makefile	(working copy)
>@@ -52,7 +52,7 @@
> LINKTHR_DESC=	Link thread lib (for threaded extensions)
> ZTS_DESC=	Force Zend Thread Safety (ZTS) build
> 
>-CONFLICTS=	php53-5* php54-5* php56-5* php5-5*
>+CONFLICTS=	php53-5* php56-5* php5-5*
> 
> DESTDIRNAME=	INSTALL_ROOT
> 
>Index: php55/files/patch-sapi_fpm_Makefile.frag
>===================================================================
>--- php55/files/patch-sapi_fpm_Makefile.frag	(revision 0)
>+++ php55/files/patch-sapi_fpm_Makefile.frag	(working copy)
>@@ -0,0 +1,14 @@
>+
>+$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
>Index: php55/pkg-plist
>===================================================================
>--- php55/pkg-plist	(revision 381932)
>+++ php55/pkg-plist	(working copy)
>@@ -6,9 +6,7 @@
> etc/php.conf
> etc/php.ini-development
> etc/php.ini-production
>-%%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
>-%%FPM%%etc/php-fpm.conf.default
>-%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
>+%%FPM%%@sample etc/php-fpm.conf.sample
> include/php/TSRM/TSRM.h
> include/php/TSRM/readdir.h
> include/php/TSRM/tsrm_config.h
>Index: php56/Makefile
>===================================================================
>--- php56/Makefile	(revision 381932)
>+++ php56/Makefile	(working copy)
>@@ -52,7 +52,7 @@
> LINKTHR_DESC=	Link thread lib (for threaded extensions)
> ZTS_DESC=	Force Zend Thread Safety (ZTS) build
> 
>-CONFLICTS=	php53-5* php54-5* php55-5* php5-5*
>+CONFLICTS=	php53-5* php55-5* php5-5*
> 
> DESTDIRNAME=	INSTALL_ROOT
> 
>Index: php56/files/patch-sapi_fpm_Makefile.frag
>===================================================================
>--- php56/files/patch-sapi_fpm_Makefile.frag	(revision 0)
>+++ php56/files/patch-sapi_fpm_Makefile.frag	(working copy)
>@@ -0,0 +1,14 @@
>+
>+$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
>Index: php56/pkg-plist
>===================================================================
>--- php56/pkg-plist	(revision 381932)
>+++ php56/pkg-plist	(working copy)
>@@ -7,9 +7,7 @@
> etc/php.conf
> etc/php.ini-development
> etc/php.ini-production
>-%%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
>-%%FPM%%etc/php-fpm.conf.default
>-%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
>+%%FPM%%@sample etc/php-fpm.conf.sample
> include/php/TSRM/TSRM.h
> include/php/TSRM/readdir.h
> include/php/TSRM/tsrm_config.h

Actions: View | Diff

Attachments on bug 198801: 154671