19 files changed, 24 insertions, 24 deletions

diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index dbb9229c3f56..9905a0ba6b6b 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tcovert@sahuagin.net
 COMMENT=	Log4cxx is a port to C++ of the Log4j project
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/apr-1-config:${PORTSDIR}/devel/apr
+BUILD_DEPENDS=	${LOCALBASE}/bin/apr-1-config:${PORTSDIR}/devel/apr1
 
 .if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index 5090a619ccb4..4f16f8966c10 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -37,7 +37,7 @@ BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		xmlto:${PORTSDIR}/textproc/xmlto
 
 .if !exists(${APR_APU_DIR}/${APR_CONFIG})
-BUILD_DEPENDS+=	apr-1-config:${PORTSDIR}/devel/apr
+BUILD_DEPENDS+=	apr-1-config:${PORTSDIR}/devel/apr1
 .endif
 
 BUILD_DEPENDS+=	subversion>=0:${PORTSDIR}/devel/subversion
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 1962835e4c26..45714910cac8 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -108,11 +108,11 @@ pre-everything::
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from ${APACHE_PORT}.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from ${APACHE_PORT}.  If you have the devel/apr1"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port."
+	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr1 port."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN)
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 1962835e4c26..45714910cac8 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -108,11 +108,11 @@ pre-everything::
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from ${APACHE_PORT}.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from ${APACHE_PORT}.  If you have the devel/apr1"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port."
+	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr1 port."
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN)
diff --git a/net-mgmt/ramond/Makefile b/net-mgmt/ramond/Makefile
index bd64774fdfc4..9a035cec8435 100644
--- a/net-mgmt/ramond/Makefile
+++ b/net-mgmt/ramond/Makefile
@@ -23,7 +23,7 @@ PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
 
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ramond ${PREFIX}/sbin
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index dc476f645159..e25110b11c89 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	baptiste.daroussin@gmail.com
 COMMENT=	A useful tool to find duplicate files
 
 LIB_DEPENDS=	puzzle.1:${PORTSDIR}/graphics/libpuzzle \
-		apr-1:${PORTSDIR}/devel/apr \
+		apr-1:${PORTSDIR}/devel/apr1 \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index d60e47b15fac..6edd14df5284 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Ganglia cluster monitor, monitoring daemon
 
 LIB_DEPENDS+=	confuse:${PORTSDIR}/devel/libconfuse
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index a0daf6ea391a..27beed505326 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	ganglia-${PORTVERSION}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Ganglia cluster monitor, web frontend
 
-BUILD_DEPENDS+=	apr-1-config:${PORTSDIR}/devel/apr
+BUILD_DEPENDS+=	apr-1-config:${PORTSDIR}/devel/apr1
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gmetad:${PORTSDIR}/sysutils/ganglia-monitor-core
 
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile
index a8a4db7ebe28..9657946fbd9c 100644
--- a/textproc/rast/Makefile
+++ b/textproc/rast/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Full-text search system using N-gram
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
+LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
 
 USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	YES
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