cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- set SHARED_ONLY and roll PFRAG.shared-main into PLIST-main

Browse Source 
- uncomment a couple of lines in the default php-fpm.conf so you
don't have to make any changes before it will start up

- add missing crypt_blowfish.h header to PLIST-main

ok robert@
This commit is contained in:
sthen 2012-01-13 17:59:07 +00:00
parent 760509133f
commit fcaa654699
8 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/php/5.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2011/09/16 10:31:21 espie Exp $
# $OpenBSD: Makefile,v 1.19 2012/01/13 17:59:07 sthen Exp $
# doesn't set USE_LIBTOOL but use the bundled one because it needs some
# specific options we don't have.
@ -9,7 +9,7 @@ SUHOSIN_PHPV= 5.2.16
SUHOSIN_P_V= 0.9.7
REVISION= 4
REVISION-main= 6
REVISION-main= 7
REVISION-fastcgi= 7
REVISION-gd= 5

2
lang/php/5.2/pkg/PFRAG.shared-main
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2010/06/27 20:28:44 robert Exp $
lib/php-${PV}/libphp5.so

4
lang/php/5.2/pkg/PLIST-main
View File

@ -1,11 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.5 2011/07/14 12:40:48 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2012/01/13 17:59:08 sthen Exp $
@option no-default-conflict
@conflict php->=5.2,<5.3
@conflict php5-core->=5.2
@pkgpath lang/php/5.2
@pkgpath www/php5/core,-main
@pkgpath www/php5/extensions,-mbstring
%%SHARED%%
@exec install -d ${SYSCONFDIR}/php-${PV}/
@exec install -d ${SYSCONFDIR}/php-${PV}.sample/
!%%no_suhosin%%
@ -22,6 +21,7 @@
bin/php-config-${PV}
bin/phpize-${PV}
lib/php-${PV}/
lib/php-${PV}/libphp5.so
lib/php-${PV}/modules/
@man man/man1/php-${PV}.1
@man man/man1/php-config-${PV}.1

4
lang/php/5.3/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2011/11/17 12:52:27 robert Exp $
# $OpenBSD: Makefile,v 1.18 2012/01/13 17:59:08 sthen Exp $
PV= 5.3
V= ${PV}.8
SUHOSIN_PHPV= ${V}
SUHOSIN_P_V= 0.9.10
REVISION = 0
REVISION = 1
INI_TEMPLATES= development production

18
lang/php/5.3/patches/patch-sapi_fpm_php-fpm_conf_in Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.1 2012/01/13 17:59:08 sthen Exp $
--- sapi/fpm/php-fpm.conf.in.orig.port Mon Jul 4 22:22:56 2011
+++ sapi/fpm/php-fpm.conf.in Fri Jan 13 00:28:10 2012
@@ -168,12 +168,12 @@ pm.max_children = 50
; The desired minimum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
-;pm.min_spare_servers = 5
+pm.min_spare_servers = 5
; The desired maximum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
-;pm.max_spare_servers = 35
+pm.max_spare_servers = 35
; The number of requests each child process should execute before respawning.
; This can be useful to work around memory leaks in 3rd party libraries. For

2
lang/php/5.3/pkg/PFRAG.shared-main
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2010/06/27 20:28:45 robert Exp $
lib/php-${PV}/libphp5.so

5
lang/php/5.3/pkg/PLIST-main
View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.6 2011/07/14 12:40:48 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2012/01/13 17:59:08 sthen Exp $
@option no-default-conflict
@conflict php->=5.3,<5.4
@conflict php5-core->=5.2
@conflict php5-core-fastcgi->=5.2
@pkgpath lang/php/5.3
%%SHARED%%
@exec install -d ${SYSCONFDIR}/php-${PV}/
@exec install -d ${SYSCONFDIR}/php-${PV}.sample/
!%%no_suhosin%%
@ -21,6 +20,7 @@
bin/php-config-${PV}
bin/phpize-${PV}
lib/php-${PV}/
lib/php-${PV}/libphp5.so
lib/php-${PV}/modules/
@man man/man1/php-${PV}.1
@man man/man1/php-config-${PV}.1
@ -266,6 +266,7 @@ share/php-${PV}/include/ext/standard/crc32.h
share/php-${PV}/include/ext/standard/credits.h
share/php-${PV}/include/ext/standard/credits_ext.h
share/php-${PV}/include/ext/standard/credits_sapi.h
share/php-${PV}/include/ext/standard/crypt_blowfish.h
share/php-${PV}/include/ext/standard/crypt_freesec.h
share/php-${PV}/include/ext/standard/css.h
share/php-${PV}/include/ext/standard/cyr_convert.h

4
lang/php/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.23 2011/11/17 12:52:27 robert Exp $
# $OpenBSD: Makefile.inc,v 1.24 2012/01/13 17:59:07 sthen Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
@ -36,6 +36,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
SHARED_ONLY= Yes
MODPHP_CONFIG_PATH= /var/www/conf
# where the main php module is stored (outside the chroot)