2 files changed, 12 insertions, 15 deletions
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