- cleanup conflicts (remove no longer existent ports)
- remove explicit ABI version number from LIB_DEPENDS
This commit is contained in:
parent
595048ebe6
commit
57cb74375e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=300636
4 changed files with 9 additions and 19 deletions
|
@ -22,8 +22,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.bz2
|
|||
MAINTAINER?= apache@FreeBSD.org
|
||||
COMMENT?= Version 2.0.x of Apache web server with ${WITH_MPM:L} MPM.
|
||||
|
||||
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
|
||||
pcre.1:${PORTSDIR}/devel/pcre \
|
||||
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
|
||||
pcre:${PORTSDIR}/devel/pcre \
|
||||
apr-0:${PORTSDIR}/devel/apr0
|
||||
|
||||
MAKE_JOBS_SAFE= yes
|
||||
|
@ -33,13 +33,8 @@ EXPIRATION_DATE= 2012-01-01
|
|||
|
||||
LATEST_LINK= apache20
|
||||
|
||||
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.* \
|
||||
apache-2.2.* apache-peruser-2.2.* \
|
||||
caudium-devel-1.* caudium10-1.* caudium12-1.* caudium14-1.* \
|
||||
ru-apache+mod_ssl-1.* ru-apache-1.*
|
||||
CONFLICTS= apache-2.2.* apache-*-2.2.* \
|
||||
caudium14-1.*
|
||||
|
||||
## XXX: Every possible option for things in Makefile.modules needs to be
|
||||
## XXX: in OPTIONS too, or its not passed to make.
|
||||
|
|
|
@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-dbm=sdbm
|
|||
. elif ${WITH_DBM:L} == "ndbm"
|
||||
CONFIGURE_ARGS+= --with-ndbm
|
||||
. 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)
|
||||
|
|
|
@ -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.*
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue