From a3a37131a542b68319513512d2004220f79827a5 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Mon, 1 Nov 2010 17:20:03 +0000
Subject: Changes 1.4.2: * Undo a crash-bug introduced in 1.3.9 affecting some
 applications of   the apr hash and table structures, reported to affect
 Subversion

Changes 1.4.1:
* Win32: Properly handle the ERROR_DIRECTORY system error code.

Changes 1.4.0:
* Add apr_global_mutex_lockfile() for retrieving the file, if any,
  associated with the mutex.  Add apr_global_mutex_name() for retrieving
  the name of the lock mechanism used by the underlying proc mutex.

* Add apr_socket_atreadeof to determine whether the receive part of the
  socket has been closed by the peer.

* Make apr_pollset and apr_pollcb implementations using providers.
  Added apr_pollset_create_ex and apr_pollcb_create_ex that allows
  choosing non-default providers.

* apr_temp_dir_get() now checks the TMPDIR environment variable first,
  instead of third.

* Add apr_file_sync() and apr_file_datasync() calls.

* apr_pollset_wakeup() on Windows: Fix core caused by closing the
  file_socket_pipe with standard file_close.

* Introduce apr_hash_do() for iterating over a hash table.

* Make sure WIN32 behaves the same as posix for file-backed shared memory
  by removing the file on cleanup/remove.

* Introduce apr_pollset_wakeup() for interrupting the blocking
  apr_pollset_poll() call.

* Add apr_file_link() function.
---
 devel/apr/Makefile | 19 ++++++++-----------
 devel/apr/distinfo |  8 ++++----
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'devel')

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 15f8671edf5..b45def3397a 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2009/12/02 11:36:27 fhajny Exp $
+# $NetBSD: Makefile,v 1.61 2010/11/01 17:20:03 adam Exp $
 
-DISTNAME=	apr-1.3.9
+DISTNAME=	apr-1.4.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://apr.apache.org/
@@ -13,15 +14,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=	pkg-config
-
+USE_TOOLS+=		pkg-config
 PKGCONFIG_OVERRIDE+=	apr.pc.in
-
-CONFIGURE_ARGS+=	\
-		--with-devrandom=/dev/urandom \
-		--with-installbuilddir=${PREFIX}/libexec/apr
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
+CONFIGURE_ARGS+=	--with-installbuilddir=${PREFIX}/libexec/apr
 CONFIGURE_ENV+=		LIBS=${LIBS:M*:Q}
 LIBS.SunOS+=		-lnsl
 
@@ -29,7 +27,6 @@ TEST_TARGET=		check
 
 post-install:
 	${RM} ${DESTDIR}${PREFIX}/libexec/apr/libtool
-	${INSTALL_SCRIPT} ${PKG_LIBTOOL} \
-		${DESTDIR}${PREFIX}/libexec/apr/libtool
+	${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${DESTDIR}${PREFIX}/libexec/apr/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index d0c7fdb5fdf..fd7e6dc7546 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2009/12/02 11:36:27 fhajny Exp $
+$NetBSD: distinfo,v 1.29 2010/11/01 17:20:03 adam Exp $
 
-SHA1 (apr-1.3.9.tar.gz) = 3ad0099ee9fb684e118590bf0acf937639e00611
-RMD160 (apr-1.3.9.tar.gz) = 2348b321131579ed4ae607c7fb87f450abfa4fe1
-Size (apr-1.3.9.tar.gz) = 1138996 bytes
+SHA1 (apr-1.4.2.tar.bz2) = b3ed66c2e7f67c50ae33b5cd85e9f46a93c6e4f8
+RMD160 (apr-1.4.2.tar.bz2) = 20d4ae082d490432710aad1c4f689e6032a6c921
+Size (apr-1.4.2.tar.bz2) = 766793 bytes
-- 
cgit v1.2.3