diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-03-12 10:33:04 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-03-12 10:33:04 +0000 |
| commit | e7f539cc4cb8e14c7a3d08b5656ffd7650c6dba9 (patch) | |
| tree | f15e03bc54c4009ab00a06af404fd76490d00ccc /lang/php5 | |
| parent | Update to 4.00004. (diff) | |
Suhosin will never reappear, remove commented out code.
Fix plist when CLI is not selected [1].
Submitted by: Gergely CZUCZY <gergely.czuczy@harmless.hu> [1]
Notes
Notes:
svn path=/head/; revision=313958
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/Makefile | 11 | ||||
| -rw-r--r-- | lang/php5/pkg-plist | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index d4b7261f36e6..405d3f0c23f5 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= \ USE_GNOME= libxml2 -OPTIONS_DEFINE= CLI CGI FPM APACHE AP2FILTER EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR # SUHOSIN +OPTIONS_DEFINE= CLI CGI FPM APACHE AP2FILTER EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR OPTIONS_DEFAULT=CLI CGI IPV6 LINKTHR CLI_DESC= Build CLI version @@ -47,7 +47,6 @@ FPM_DESC= Build FPM version APACHE_DESC= Build Apache module AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) EMBED_DESC= Build embedded library -SUHOSIN_DESC= Enable Suhosin protection system DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support @@ -65,14 +64,6 @@ PATCH_DIST_STRIP= -p1 PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= ale -#.if ${PORT_OPTIONS:MSUHOSIN} -#PATCHFILES+= suhosin-patch-5.3.x-0.9.10.patch.gz -#PATCH_SITES+= http://download.suhosin.org/:suhosin -#PLIST_SUB+= SUHOSIN="" -#.else -PLIST_SUB+= SUHOSIN="@comment " -#.endif - .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.4.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index c80024b757e2..a0764077cfec 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -219,11 +219,8 @@ include/php/main/streams/php_streams_int.h include/php/main/streams/php_stream_transport.h include/php/main/streams/php_stream_userspace.h include/php/main/streams/php_stream_plain_wrapper.h -include/php/sapi/cli/cli.h +%%CLI%%include/php/sapi/cli/cli.h %%EMBED%%include/php/sapi/embed/php_embed.h -%%SUHOSIN%%include/php/main/suhosin_globals.h -%%SUHOSIN%%include/php/main/suhosin_logo.h -%%SUHOSIN%%include/php/main/suhosin_patch.h include/php/main/win32_internal_function_disabled.h include/php/main/win95nt.h %%EMBED%%lib/libphp5.so |