mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

- resync' with www/apache2

Browse Source
This commit is contained in:
Clement Laforet 2005-12-03 23:04:21 +00:00
parent 38b9055791
commit 54b5eedff9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=150324
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/apache20/Makefile
View File

@ -34,6 +34,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
# patch files
EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta
.if defined (WITH_WINDOWSUPDATEFIX)
EXTRA_PATCHES+= ${FILESDIR}/exp-windowsupdate.patch
.endif

19
www/apache20/Makefile.modules.3rd
View File

@ -33,7 +33,7 @@ IGNORE= "This module require apache2 and you have apache13 installed"
. endif
. endif
. ifdef(WITH_APACHE2)
.error You have `WITH_APACHE2' variable defined either in environment or in make(1) argumentsm. but apache13 is installed Please undefine and try again.
IGNORE= You have 'WITH_APACHE2' variable defined either in environment or in make(1) arguments. but apache13 is installed Please undefine and try again.
. endif
.endif
@ -158,6 +158,17 @@ CONFIGURE_ARGS+= --disable-access --disable-auth \
--disable-asis --disable-cgid --disable-cgi \
--disable-negotiation --disable-dir --disable-imap \
--disable-actions --disable-userdir --disable-alias
.elif ${WANT_APACHE} == common21
CONFIGURE_ARGS+= --disable-authn-file --disable-authn-default \
--disable-authz-host --disable-authz-groupfile \
--disable-authz-user --disable-authz-default \
--disable-auth-basic --disable-charset-lite \
--disable-include --disable-log-config --disable-env \
--disable-setenvif --disable-mime --disable-status \
--disable-autoindex --disable-asis --disable-cgid \
--disable-cgi --disable-negotiation --disable-dir \
--disable-imagemap --disable-actions --disable-userdir \
--disable-alias
.endif
.if defined(WITH_MODULES)
@ -182,13 +193,13 @@ _APACHE_MODULES+= ${WITH_EXTRA_MODULES}
.if !defined(WITH_STATIC_APACHE)
. if ${WANT_APACHE} == common2
. if ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21
# FYI
#DYNAMIC_MODULES= so
CONFIGURE_ARGS+= --enable-so
. endif
.else
. if ${WANT_APACHE} == common2
. if ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21
CONFIGURE_ARGS+= --disable-so
. endif
WITH_ALL_STATIC_MODULES= YES
@ -198,7 +209,7 @@ WITH_ALL_STATIC_MODULES= YES
.if ${WANT_APACHE} == common13
SUEXEC_CONFARGS= suexec
CONFIGURE_ARGS+= --enable-suexec
.elif ${WANT_APACHE} == common2
.elif ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21
SUEXEC_CONFARGS= with-suexec
.else
IGNORE= Can not determine apache version

2
www/apache20/files/apache.sh
View File

@ -93,7 +93,7 @@ checkyesno apache2ssl_enable && \
apache2_checkconfig()
{
echo "Performing sanity check on apache2 configuration:"
${command} ${apache2_flags} -t
eval "${command} ${apache2_flags} -t"
}
apache2_precmd()