diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2004-10-16 05:03:07 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2004-10-16 05:03:07 +0000 |
| commit | 26dfd8e73d7e8781a147fa0464ec69d1a70b5f92 (patch) | |
| tree | 8971e414023ecac486f4775fd67cf75956a0edd2 | |
| parent | Update to tkdiff 4.0 (diff) | |
- Chase apr shlib version bump.
Pointy Hat Autumn Collection 2004 to: kuriyama
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/apache20/Makefile | 4 | ||||
| -rw-r--r-- | www/flood/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 4b21f69232c1..c1c71b8cbe1e 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -131,13 +131,13 @@ CONFIGURE_ARGS+= --with-ldap \ . if defined (WITH_BDB) || defined(WITH_BERKELEYDB) IGNORE= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" . endif -LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr +LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ --with-apr-util=${LOCALBASE}/bin/apu-config CONFIGURE_ENV+= LTFLAGS="--tag=CXX" PLIST_SUB+= PORTS_APR="@comment " .else -. if exists(${LOCALBASE}/lib/libapr-0.so) +. if exists(${LOCALBASE}/lib/libapr-1.so) IGNORE= apr is installed and may conflict with apache one\ (if you want to use apr port define WITH_APR_FROM_PORTS,\ at your own risk) diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 4b21f69232c1..c1c71b8cbe1e 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -131,13 +131,13 @@ CONFIGURE_ARGS+= --with-ldap \ . if defined (WITH_BDB) || defined(WITH_BERKELEYDB) IGNORE= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" . endif -LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr +LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ --with-apr-util=${LOCALBASE}/bin/apu-config CONFIGURE_ENV+= LTFLAGS="--tag=CXX" PLIST_SUB+= PORTS_APR="@comment " .else -. if exists(${LOCALBASE}/lib/libapr-0.so) +. if exists(${LOCALBASE}/lib/libapr-1.so) IGNORE= apr is installed and may conflict with apache one\ (if you want to use apr port define WITH_APR_FROM_PORTS,\ at your own risk) diff --git a/www/flood/Makefile b/www/flood/Makefile index be71965313c1..f6e27854318d 100644 --- a/www/flood/Makefile +++ b/www/flood/Makefile @@ -7,7 +7,7 @@ PORTNAME= flood PORTVERSION= 0.20031002 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama @@ -17,7 +17,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Profile-driven HTTP load tester LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - apr-0.9:${PORTSDIR}/devel/apr + apr-1:${PORTSDIR}/devel/apr USE_AUTOCONF_VER= 253 WANT_LIBTOOL_VER= 15 |