kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- fix long standing bugs

Browse source 
* fix pre/post includes
  * fix local port overiding for apache > 2.1
  * Add a short notr about USE_APACHE=yes
This commit is contained in:
Clement Laforet 2007-07-22 10:48:42 +00:00
parent ca1d7c7231
commit 9173d040e4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=196049
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mk/bsd.apache.mk
View file

@ -15,8 +15,15 @@
# <version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+
# common*: common13, common20, common21 and common22
#
# Note: Setting USE_APACHE to "yes" is deprecated. It will set
# APACHE_PORT to www/apache13 and if WITH_APACHE2 (deprecated too)
# is defined, APACHE_PORT will be set to www/apache20
#
#
.if !defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
Apache_Pre_Include= bsd.apache.mk
.if defined(APACHE_COMPAT)
USE_APACHE=yes
.endif
@ -303,13 +310,13 @@ AP_BUILDEXT= la
APACHEMODDIR= libexec/apache2
APACHEINCLUDEDIR=include/apache2
APACHEETCDIR= etc/apache2
APACHE_PORT= www/apache${APACHE_VERSION}
APACHE_PORT?= www/apache${APACHE_VERSION}
.elif ${APACHE_VERSION} >= 21
AP_BUILDEXT= la
APACHEMODDIR= libexec/apache${APACHE_VERSION}
APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
APACHEETCDIR= etc/apache${APACHE_VERSION}
APACHE_PORT= www/apache${APACHE_VERSION}
APACHE_PORT?= www/apache${APACHE_VERSION}
.else
AP_BUILDEXT= so
APACHEMODDIR= libexec/apache
@ -346,6 +353,10 @@ AP_EXTRAS+= -L ${AP_LIB}
.endif
.endif #!defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
.if defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
Apache_Post_Include= bsd.apache.mk
.if defined(AP_PORT_IS_SERVER)
.if !target(print-closest-mirrors)
print-closest-mirrors:
@ -412,7 +423,6 @@ do-build: ap-gen-plist
do-install:
@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
.endif
.endif
.endif
.endif # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)