10 files changed, 13 insertions, 13 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 50c4af76205c..7e12341a3991 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -57,7 +57,7 @@ APACHEDIR=	${MASTERDIR}
 
 .if !defined(WITHOUT_APACHE_OPTIONS)
 OPTIONS=	\
-	APR_FROM_PORTS  "Use devel/apr (recommended)" 			On  \
+	APR_FROM_PORTS  "Use devel/apr1 (recommended)" 			On  \
 	THREADS 		"Enable threads support in APR" 		Off \
 	MYSQL 			"Enable MySQL support for apr-dbd" 		Off \
 	PGSQL 			"Enable PostgreSQL support for apr-dbd" Off \
@@ -136,7 +136,7 @@ LDFLAGS+=	-L${OPENSSLLIB}
 
 .if defined(WITH_APR_FROM_PORTS)
 PLIST_SUB+=	APR_PORTS="@comment "
-APR_PORT?=	devel/apr
+APR_PORT?=	devel/apr1
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/${APR_PORT}
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config
diff --git a/www/flood/Makefile b/www/flood/Makefile
index f7964853ce94..e8a4e7328b4c 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Profile-driven HTTP load tester
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		apr-1:${PORTSDIR}/devel/apr
+		apr-1:${PORTSDIR}/devel/apr1
 
 WRKSRC=		${WRKDIR}/httpd-test/flood
 USE_AUTOTOOLS=	autoconf:262 libtool:22:env
diff --git a/www/ftasv/Makefile b/www/ftasv/Makefile
index 112f5d8c899c..fef43f187f14 100644
--- a/www/ftasv/Makefile
+++ b/www/ftasv/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://fabletech.com/${PORTNAME}-download/
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Is a commandline scoreboard viewer for the Apache server
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/apr-1-config:${PORTSDIR}/devel/apr
+BUILD_DEPENDS=	${LOCALBASE}/bin/apr-1-config:${PORTSDIR}/devel/apr1
 
 GNU_CONFIGURE=	yes
 USE_APACHE=	2.0+
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index fc3d96b96488..4558e3f0a171 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://butterfat.net/releases/mod_auth_openid/
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	An authentication module for the Apache 2 webserver with OpenID
 
-BUILD_DEPENDS=	apr-1-config:${PORTSDIR}/devel/apr
+BUILD_DEPENDS=	apr-1-config:${PORTSDIR}/devel/apr1
 LIB_DEPENDS=	opkele:${PORTSDIR}/devel/libopkele \
 		sqlite3:${PORTSDIR}/databases/sqlite34
 
diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile
index 511a112cfa66..1dd2ef4af56d 100644
--- a/www/mod_memcache/Makefile
+++ b/www/mod_memcache/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Apache 2.2.x module to manage apr_memcache connections
 
-LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
 
 MAKE_JOBS_SAFE=  yes
 
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 7c729fb9ef4d..6dda566ba827 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Apache module for serving ASP.NET applications
 
-LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 		xsp:${PORTSDIR}/www/xsp
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 73a0e042039c..30f9e13c5e87 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An intrusion detection and prevention engine
 MAKE_JOBS_SAFE=	yes
 
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre \
-		apr-1:${PORTSDIR}/devel/apr
+		apr-1:${PORTSDIR}/devel/apr1
 
 USE_APACHE=	2.0+
 GNU_CONFIGURE=	yes
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index b698603ec846..bf29f49be0d5 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	mod_webapp
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module mounts Tomcat web applications
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/apr:configure
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/apr1:configure
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -41,8 +41,8 @@ APACHECTL?=	${LOCALBASE}/sbin/apachectl
 APR_LIB?=	${LOCALBASE}/lib/
 APR_INCLUDE?=	${LOCALBASE}/include/apr-${APR_MAJORVER}/
 APACHE_MODULES?=libexec/apache
-APR_VER!=	cd ${PORTSDIR}/devel/apr && ${MAKE} -V APR_VERSION
-APR_WRKSRC!=	cd ${PORTSDIR}/devel/apr && ${MAKE} -V WRKSRC
+APR_VER!=	cd ${PORTSDIR}/devel/apr1 && ${MAKE} -V APR_VERSION
+APR_WRKSRC!=	cd ${PORTSDIR}/devel/apr1 && ${MAKE} -V WRKSRC
 APR_MAJORVER=	${APR_VER:C/\..*//g}
 APR_SRC=	${APR_WRKSRC}/apr-${APR_VER}
 AUTOCONF?=	${LOCALBASE}/bin/autoconf
diff --git a/www/serf/Makefile b/www/serf/Makefile
index 54f319ef6ec1..780ad2eb7024 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	db
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Serf HTTP client library
 
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 
 MAKE_JOBS_SAFE=  yes
 
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 7333f90f9262..0a591258a37b 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Tomcat native library
 
-LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/jni/native