diff options
| author | ohauer <ohauer@FreeBSD.org> | 2012-01-12 04:09:27 +0800 |
|---|---|---|
| committer | ohauer <ohauer@FreeBSD.org> | 2012-01-12 04:09:27 +0800 |
| commit | 5d6ea3e8d80cc43292f42f2ac5cf550c83b1f776 (patch) | |
| tree | 6708e71a48cc63d7cc1c62b9a63570ce87331cb0 /Mk/bsd.apache.mk | |
| parent | babe762e33cbe9c5d148be32bf7c46a009797acb (diff) | |
| download | freebsd-ports-gnome-5d6ea3e8d80cc43292f42f2ac5cf550c83b1f776.tar.gz freebsd-ports-gnome-5d6ea3e8d80cc43292f42f2ac5cf550c83b1f776.tar.zst freebsd-ports-gnome-5d6ea3e8d80cc43292f42f2ac5cf550c83b1f776.zip | |
- no need to strip `.' in APACHE_VERSION_CHECK because `.' is no longer valid in APACHE_VERSION
- make apache2x module cleanup more strict so addon modules will not remove LoadModule lines insert by apache2x.
For example apache own proxy_scgi_module could be removed during deinstall of mod_scgi
- remove apache13 module pkg-plist cleanup
with hat apache@
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} |