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

- prepare for apache24

Browse source
This commit is contained in:
Olli Hauer 2013-03-26 21:31:27 +00:00
parent f7cd7810ba
commit c1aa7d938b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=315333
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mk/bsd.apache.mk
View file

@ -81,7 +81,7 @@
Apache_Pre_Include= bsd.apache.mk Apache_Pre_Include= bsd.apache.mk
DEFAULT_APACHE_VERSION= 22 DEFAULT_APACHE_VERSION= 22
APACHE_SUPPORTED_VERSION= 22 # preferred version first APACHE_SUPPORTED_VERSION= 22 24 # preferred version first
# Print warnings # Print warnings
_ERROR_MSG= : Error from bsd.apache.mk. _ERROR_MSG= : Error from bsd.apache.mk.
@ -93,9 +93,9 @@ _ERROR_MSG= : Error from bsd.apache.mk.
.if defined(USE_APACHE) && !empty(USE_APACHE) .if defined(USE_APACHE) && !empty(USE_APACHE)
. if ${USE_APACHE:Mcommon*} != "" . if ${USE_APACHE:Mcommon*} != ""
AP_PORT_IS_SERVER= yes AP_PORT_IS_SERVER= yes
. elif ${USE_APACHE:C/\-//:S/^22//:C/\+$//} == "" . elif ${USE_APACHE:C/\-//:S/^22//:S/^24//:C/\+$//} == ""
AP_PORT_IS_MODULE= yes AP_PORT_IS_MODULE= yes
. if ${USE_APACHE:C/\-//:S/^22//} == "+" . if ${USE_APACHE:C/\-//:S/^22//:S/^24//} == "+"
AP_PLUS= yes AP_PLUS= yes
. endif . endif
. else . else
@ -382,7 +382,7 @@ AP_EXTRAS+= -L ${AP_LIB}
Apache_Post_Include= bsd.apache.mk Apache_Post_Include= bsd.apache.mk
.if defined(USE_APACHE_RUN) && !empty(USE_APACHE_RUN) .if defined(USE_APACHE_RUN) && !empty(USE_APACHE_RUN)
. if ${USE_APACHE_RUN:C/\-//:S/^22//:C/\+$//} != "" . if ${USE_APACHE_RUN:C/\-//:S/^22//:S/^24//:C/\+$//} != ""
IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( ${USE_APACHE_RUN} ) IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( ${USE_APACHE_RUN} )
. endif . endif
.elif defined(USE_APACHE_RUN) .elif defined(USE_APACHE_RUN)
@ -390,7 +390,7 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( no valid version specified
.endif .endif
.if defined(USE_APACHE_BUILD) && !empty(USE_APACHE_BUILD) .if defined(USE_APACHE_BUILD) && !empty(USE_APACHE_BUILD)
. if ${USE_APACHE_BUILD:C/\-//:S/^22//:C/\+$//} != "" . if ${USE_APACHE_BUILD:C/\-//:S/^22//:S/^24//:C/\+$//} != ""
IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_BUILD ( ${USE_APACHE_BUILD} ) IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_BUILD ( ${USE_APACHE_BUILD} )
. endif . endif
.elif defined(USE_APACHE_BUILD) .elif defined(USE_APACHE_BUILD)

6
www/apache22/Makefile
View file

@ -19,9 +19,9 @@ MAKE_JOBS_SAFE= yes
LATEST_LINK?= apache22 LATEST_LINK?= apache22
CONFLICTS= caudium14-1.* \ CONFLICTS_INSTALL= caudium14-1.* \
apache-2.0.* apache-*-2.0.* \ apache-*-2.2.* apache22-*-2.2.* \
apache-*-2.2.* apache22-*-2.2.* apache-*-2.4.* apache24-*-2.4.*
USE_APACHE= common22 USE_APACHE= common22
USE_BZIP2= yes USE_BZIP2= yes