1 |
mabi 10/12/19 22:45:22 |
2 |
|
3 |
Modified: src_install-v2.eblit |
4 |
Log: |
5 |
somehow managed to miss the fpm part of the src_install update: new init/conf files fix bugs #343649, #348507 |
6 |
|
7 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.11 dev-lang/php/files/eblits/src_install-v2.eblit |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.11&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.11&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.10&r2=1.11 |
15 |
|
16 |
Index: src_install-v2.eblit |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v |
19 |
retrieving revision 1.10 |
20 |
retrieving revision 1.11 |
21 |
diff -u -r1.10 -r1.11 |
22 |
--- src_install-v2.eblit 19 Dec 2010 14:24:49 -0000 1.10 |
23 |
+++ src_install-v2.eblit 19 Dec 2010 22:45:22 -0000 1.11 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.10 2010/12/19 14:24:49 mabi Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.11 2010/12/19 22:45:22 mabi Exp $ |
29 |
|
30 |
eblit-php-src_install() { |
31 |
# see bug #324739 for what happens when we don't have that |
32 |
@@ -53,6 +53,7 @@ |
33 |
if [[ "${sapi}" == "apache2" ]]; then |
34 |
insinto "${PHP_DESTDIR}/apache2/" |
35 |
newins "${file}" "${file/*\/}" |
36 |
+ keepdir "/usr/$(get_libdir)/apache2/modules" |
37 |
else |
38 |
dolib.so "${file}" || die "Unable to install ${sapi} sapi" |
39 |
fi |
40 |
@@ -140,12 +141,11 @@ |
41 |
|
42 |
if [[ "${sapi}" == "fpm" ]] ; then |
43 |
einfo "Installing FPM CGI config file php-fpm.conf" |
44 |
- epatch "${FILESDIR}/php-fpm-gentooified-${PV}.patch" |
45 |
insinto ${PHP_INI_DIR} |
46 |
- doins "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm.conf" |
47 |
+ doins "${FILESDIR}/php-fpm.conf" |
48 |
dodir "/etc/init.d" |
49 |
insinto "/etc/init.d" |
50 |
- newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm" |
51 |
+ newinitd "${FILESDIR}/php-fpm-r3.init" "php-fpm" |
52 |
# dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm" |
53 |
fi |