diff options
| author | ohauer <ohauer@FreeBSD.org> | 2014-07-09 06:44:48 +0800 |
|---|---|---|
| committer | ohauer <ohauer@FreeBSD.org> | 2014-07-09 06:44:48 +0800 |
| commit | 7c2398171a6ec3f5dd8233d6cc6c183a96088328 (patch) | |
| tree | c35598c4b6afdbc0cfe9dc518381e841214fffe7 /www/apache24 | |
| parent | b55064aff0811b1310a8deafa6174c54b434fd87 (diff) | |
| download | freebsd-ports-gnome-7c2398171a6ec3f5dd8233d6cc6c183a96088328.tar.gz freebsd-ports-gnome-7c2398171a6ec3f5dd8233d6cc6c183a96088328.tar.zst freebsd-ports-gnome-7c2398171a6ec3f5dd8233d6cc6c183a96088328.zip | |
- revert conflict (apache22 has MPM sub ports)
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index fa769d5427c0..ad9f17a7c123 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -15,7 +15,8 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libapr-1.so.0.5.1:${PORTSDIR}/devel/apr1 \ libpcre.so:${PORTSDIR}/devel/pcre -CONFLICTS_INSTALL= caudium14-1.* apache22-* +CONFLICTS_INSTALL= caudium14-1.* \ + apache-*-2.2.* apache22-* USE_APACHE= common24 USES= tar:bzip2 iconv perl5 libtool cpe |