diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-11 20:09:27 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-11 20:09:27 +0000 |
| commit | 44276a489510f4b42db184e915274c95926f47a0 (patch) | |
| tree | 8eb66c5063fc7de53a3d0241c2170d0497b74453 /Mk/bsd.apache.mk | |
| parent | a8327869bc72b083daeef1b02a9d4fe17fc9981c (diff) | |
| download | ports-44276a489510f4b42db184e915274c95926f47a0.tar.gz ports-44276a489510f4b42db184e915274c95926f47a0.zip | |
Notes
Diffstat (limited to 'Mk/bsd.apache.mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index fe503e182535..eb116e07df36 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -337,7 +337,7 @@ _USE_APACHE:= ${USE_APACHE_BUILD} _USE_APACHE:= ${USE_APACHE_RUN} .endif -_APACHE_VERSION_CHECK:= ${_USE_APACHE:C/\.//g:C/^([1-9][0-9])$/\1-\1/} +_APACHE_VERSION_CHECK:= ${_USE_APACHE:C/^([1-9][0-9])$/\1-\1/} _APACHE_VERSION_MINIMUM_TMP:= ${_APACHE_VERSION_CHECK:C/([1-9][0-9])[-+].*/\1/} _APACHE_VERSION_MINIMUM:= ${_APACHE_VERSION_MINIMUM_TMP:M[1-9][0-9]} _APACHE_VERSION_MAXIMUM_TMP:= ${_APACHE_VERSION_CHECK:C/.*-([1-9][0-9])/\1/} @@ -521,11 +521,8 @@ ap-gen-plist: .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" -# apache13/20/22 - @${ECHO} "@unexec ${SED} -i '' '/LoadModule.*%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} -# apache13 - @${ECHO} "@unexec ${SED} -i '' '/AddModule.*mod_%%AP_NAME%%.c/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} - +# apache22/20 + @${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} @${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST} |