Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/archivers/libarchive/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile	9 Nov 2010 18:58:24 -0000	1.62
+++ Makefile	14 Jul 2011 21:21:11 -0000
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/archivers/libarchive/Makefile,v 1.62 2010/11/09 18:58:24 naddy Exp $
 
 PORTNAME=	libarchive
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.8.4
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
@@ -46,10 +45,9 @@
 		tar.5
 
 CFLAGS+=	"-I${LOCALBASE}/include"
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
+MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 check:
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/archivers/libarchive/distinfo,v
retrieving revision 1.52
diff -u -r1.52 distinfo
--- distinfo	18 Mar 2011 17:58:30 -0000	1.52
+++ distinfo	14 Jul 2011 21:21:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libarchive-2.8.3.tar.gz) = 16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a
-SIZE (libarchive-2.8.3.tar.gz) = 1438099
+SHA256 (libarchive-2.8.4.tar.gz) = 86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688
+SIZE (libarchive-2.8.4.tar.gz) = 1502828