5 files changed, 6 insertions, 40 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 100b1d16805b..0807e4503287 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	apr-devel
-PORTVERSION=	20020309172416
+PORTVERSION=	20020504162319
 CATEGORIES=	devel
 MASTER_SITES=	http://www.apache.org/dist/apr/not-released/
-DISTFILES=	apr_20020309172416.tar.gz apr-util_20020309172426.tar.gz
+DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020504162329.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
 		libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat
+LIB_DEPENDS=	expat.2:${PORTSDIR}/textproc/expat2
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index e48265487cf6..b3a7c7776f74 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,2 +1,2 @@
-MD5 (apr_20020309172416.tar.gz) = fcb5fa3a2ea700619588699a6e69f9e3
-MD5 (apr-util_20020309172426.tar.gz) = e7d418d7144b790ab6941984e20d2ac2
+MD5 (apr_20020504162319.tar.gz) = 7d5221373291a635b1ecfb0e46242a3b
+MD5 (apr-util_20020504162329.tar.gz) = b09fd003133237af1ea441e64c7f4341
diff --git a/devel/apr/files/patch-apr-config b/devel/apr/files/patch-apr-config
deleted file mode 100644
index 1d9bd078e36d..000000000000
--- a/devel/apr/files/patch-apr-config
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: apr/apr-config.in
-===================================================================
-RCS file: /home/cvspublic/apr/apr-config.in,v
-retrieving revision 1.13
-diff -u -r1.13 apr-config.in
---- apr-config.in	13 Mar 2002 20:39:08 -0000	1.13
-+++ apr-config.in	14 Mar 2002 00:44:38 -0000
-@@ -111,7 +111,8 @@
- 
- thisdir="`dirname $0`"
- thisdir="`cd $thisdir && pwd`"
--if test "$bindir" = "$thisdir"; then
-+tmpbindir="`cd $bindir && pwd`"
-+if test "$tmpbindir" = "$thisdir"; then
-   location=installed
- elif test "$APR_SOURCE_DIR" = "$thisdir"; then
-   location=source
diff --git a/devel/apr/files/patch-apu-config b/devel/apr/files/patch-apu-config
deleted file mode 100644
index 13b4ebc5f7ef..000000000000
--- a/devel/apr/files/patch-apu-config
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: apr-util/apu-config.in
-===================================================================
-RCS file: /home/cvspublic/apr-util/apu-config.in,v
-retrieving revision 1.7
-diff -u -r1.7 apu-config.in
---- apu-config.in	13 Mar 2002 20:40:46 -0000	1.7
-+++ apu-config.in	14 Mar 2002 00:45:06 -0000
-@@ -97,7 +97,8 @@
- 
- thisdir="`dirname $0`"
- thisdir="`cd $thisdir && pwd`"
--if test "$bindir" = "$thisdir"; then
-+tmpbindir="`cd $bindir && pwd`"
-+if test "$tmpbindir" = "$thisdir"; then
-   location=installed
- elif test "$APR_SOURCE_DIR" = "$thisdir"; then
-   location=source
diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist
index 04035ab092c4..872a30fd92a7 100644
--- a/devel/apr/pkg-plist
+++ b/devel/apr/pkg-plist
@@ -1,6 +1,7 @@
 bin/apr-config
 bin/apu-config
 include/apr.h
+include/apr_allocator.h
 include/apr_anylock.h
 include/apr_atomic.h
 include/apr_base64.h
@@ -21,7 +22,6 @@ include/apr_hooks.h
 include/apr_inherit.h
 include/apr_ldap.h
 include/apr_lib.h
-include/apr_lock.h
 include/apr_md4.h
 include/apr_md5.h
 include/apr_mmap.h