diff options
| author | pav <pav@FreeBSD.org> | 2007-06-28 23:50:53 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-06-28 23:50:53 +0800 |
| commit | dbc4d516c6fb405bc177d2332a78d226674df5be (patch) | |
| tree | 2aa5e208e9c35ff87aa8ac0087598e53710fa681 /Mk | |
| parent | 8486f3721466aa3bd25f8f25fa70f096b9b2788c (diff) | |
| download | freebsd-ports-graphics-dbc4d516c6fb405bc177d2332a78d226674df5be.tar.gz freebsd-ports-graphics-dbc4d516c6fb405bc177d2332a78d226674df5be.tar.zst freebsd-ports-graphics-dbc4d516c6fb405bc177d2332a78d226674df5be.zip | |
- Fix leftover httpd.conf for AP_GEN_PLIST using ports. The problem is that
apxs does not remove module line from httpd.conf, it merely comments it out.
Later, on Apache deinstall, the file differs from stock httpd.conf and is not
deleted.
Tested by: pointyhat exprun
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index 2a8f7c72884..5198e3b0c89 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -393,7 +393,7 @@ ap-gen-plist: .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" - @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "@unexec ${SED} -i '' '/LoadModule %%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} |