5 files changed, 14 insertions, 14 deletions

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index fd2477772f71..1f1c25148cc4 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -29,7 +28,7 @@ OPTIONS=	THREADS "Enable Threads in apr"						on  \
 			PGSQL	"Enable Postgresql suport in apr-util"		off \
 			SQLITE  "Enable SQLite3 support in apr-util"			off
 
-APR_VERSION=	1.3.9
+APR_VERSION=	1.4.2
 APU_VERSION=	1.3.9
 
 USE_ICONV=		yes
@@ -45,8 +44,9 @@ NO_WRKSUBDIR=	yes
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
 
-PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
-SHLIB_MAJOR=	3
+PLIST_SUB=	SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
+SHLIB_APR_MAJOR=	4
+SHLIB_APU_MAJOR=	3
 
 APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
@@ -201,7 +201,7 @@ post-patch:
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
 		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
-		${APU_WRKDIR}/build/apu-conf.m4 
+		${APU_WRKDIR}/build/apu-conf.m4
 
 run-autotools::
 	cd ${APR_WRKDIR} ; \
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 6696d8aec1bb..3dbdf15760e7 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.3.9.tar.gz) = 85bcd8005153b8fa63b1e3f95ea31f07
-SHA256 (apr-1.3.9.tar.gz) = 562b5f7251f356a221641262e7ba7a4e1d966086df2fb46477ec9e2c748f9f28
-SIZE (apr-1.3.9.tar.gz) = 1138996
+MD5 (apr-1.4.2.tar.gz) = fc80cb54f158c2674f9eeb47a1f672cd
+SHA256 (apr-1.4.2.tar.gz) = 6a0291d6f6a59d5eab5ae5441c37b78b17f7a1a2fa1478741b7178f5fbc33ebe
+SIZE (apr-1.4.2.tar.gz) = 949945
 MD5 (apr-util-1.3.9.tar.gz) = cc2ec0ba4f01d88375f1170f762518fa
 SHA256 (apr-util-1.3.9.tar.gz) = 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
 SIZE (apr-util-1.3.9.tar.gz) = 790952
diff --git a/devel/apr1/files/patch-apr_buildconf b/devel/apr1/files/patch-apr_buildconf
index 431c3ecec0ad..f34ebe102a4a 100644
--- a/devel/apr1/files/patch-apr_buildconf
+++ b/devel/apr1/files/patch-apr_buildconf
@@ -1,5 +1,5 @@
---- apr-1.3.9/buildconf.orig	2009-02-24 06:37:18.000000000 +0300
-+++ apr-1.3.9/buildconf	2009-09-27 14:25:11.000000000 +0400
+--- apr-1.4.2/buildconf.orig	2009-02-24 06:37:18.000000000 +0300
++++ apr-1.4.2/buildconf	2009-09-27 14:25:11.000000000 +0400
 @@ -71,6 +71,7 @@
  
  echo "buildconf: Using libtool.m4 at ${ltfile}."
diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
index a3cf74c88123..f86ec6c0fd5b 100644
--- a/devel/apr1/files/patch-apr_hints.m4
+++ b/devel/apr1/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.3.9/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.3.9/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.4.2/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.4.2/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -137,11 +137,7 @@
  	;;
      *-freebsd*)
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index d974fce9edac..b89a75c8eec4 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -79,11 +79,11 @@ lib/aprutil.exp
 lib/libapr-1.a
 lib/libapr-1.la
 lib/libapr-1.so
-lib/libapr-1.so.%%SHLIB_MAJOR%%
+lib/libapr-1.so.%%SHLIB_APR_MAJOR%%
 lib/libaprutil-1.a
 lib/libaprutil-1.la
 lib/libaprutil-1.so
-lib/libaprutil-1.so.%%SHLIB_MAJOR%%
+lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%%
 %%BDB%%lib/apr-util-1/apr_dbm_db-1.so
 %%BDB%%lib/apr-util-1/apr_dbm_db.so
 %%BDB%%lib/apr-util-1/apr_dbm_db.la