sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Suhosin will never reappear, remove commented out code.

Browse source 
Fix plist when CLI is not selected [1].

Submitted by:	Gergely CZUCZY <gergely.czuczy@harmless.hu> [1]
This commit is contained in:
Alex Dupre 2013-03-12 10:33:04 +00:00
parent 84fbefbe99
commit e7f539cc4c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=313958
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lang/php5/Makefile
View file

@ -38,7 +38,7 @@ CONFIGURE_ARGS= \
USE_GNOME= libxml2 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 OPTIONS_DEFAULT=CLI CGI IPV6 LINKTHR
CLI_DESC= Build CLI version CLI_DESC= Build CLI version
@ -47,7 +47,6 @@ FPM_DESC= Build FPM version
APACHE_DESC= Build Apache module APACHE_DESC= Build Apache module
AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
EMBED_DESC= Build embedded library EMBED_DESC= Build embedded library
SUHOSIN_DESC= Enable Suhosin protection system
DEBUG_DESC= Enable debug DEBUG_DESC= Enable debug
DTRACE_DESC= Enable DTrace support DTRACE_DESC= Enable DTrace support
IPV6_DESC= Enable ipv6 support IPV6_DESC= Enable ipv6 support
@ -65,14 +64,6 @@ PATCH_DIST_STRIP= -p1
PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= ale 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} .if ${PORT_OPTIONS:MMAILHEAD}
PATCHFILES+= php-5.4.x-mail-header.patch:mail PATCHFILES+= php-5.4.x-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail PATCH_SITES+= http://choon.net/opensource/php/:mail

5
lang/php5/pkg-plist
View file

@ -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_transport.h
include/php/main/streams/php_stream_userspace.h include/php/main/streams/php_stream_userspace.h
include/php/main/streams/php_stream_plain_wrapper.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 %%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/win32_internal_function_disabled.h
include/php/main/win95nt.h include/php/main/win95nt.h
%%EMBED%%lib/libphp5.so %%EMBED%%lib/libphp5.so