aboutsummaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2012-07-08 21:32:23 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2012-07-08 21:32:23 +0000
commit57cb74375e6f73ad405599e7b83da5e2c203badb (patch)
tree37bd4ff15b0ed14137e844ac956e992e348741f0 /www/apache22
parent595048ebe646f6e98dfdaf219cf5721d9889a773 (diff)
downloadports-57cb74375e6f73ad405599e7b83da5e2c203badb.tar.gz
ports-57cb74375e6f73ad405599e7b83da5e2c203badb.zip
Notes
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile11
-rw-r--r--www/apache22/Makefile.modules2
2 files changed, 4 insertions, 9 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index d2fa3b6f93df..947dbec7a436 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -18,20 +18,15 @@ DIST_SUBDIR= apache22
MAINTAINER?= apache@FreeBSD.org
COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM.
-LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
+LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
apr-1:${PORTSDIR}/devel/apr1 \
- pcre.1:${PORTSDIR}/devel/pcre
+ pcre:${PORTSDIR}/devel/pcre
MAKE_JOBS_SAFE= yes
LATEST_LINK?= apache22
-CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
- apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
- apache+mod_ssl+mod_snmp+mod_accel-1.* \
- apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
- caudium-devel-1.* caudium10-1.* caudium12-1.* caudium14-1.* \
- ru-apache+mod_ssl-1.* ru-apache-1.* \
+CONFLICTS= caudium14-1.* \
apache-2.0.* apache-*-2.0.* \
apache-*-2.2.*
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index a4418b9195a2..57c6fffdea13 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -101,7 +101,7 @@ PLIST_SUB+= BDB="@comment "
. if ${WITH_DBM:L} == "sdbm"
CONFIGURE_ARGS+= --with-dbm=sdbm
. elif ${WITH_DBM:L} == "gdbm"
-LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
. elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb"
. if defined(WITH_BDB_BASE)