2 files changed, 27 insertions, 26 deletions

diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index c4d3aee72862..e904aa3a2455 100644
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@@ -6,54 +6,55 @@
 #
 
 PORTNAME=	File_Archive
-PORTVERSION=	1.5.3
+PORTVERSION=	1.5.4
 CATEGORIES=	archivers www pear
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files
 
 BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PHP=	bz2 pcre zlib
 LATEST_LINK=	pear-${PORTNAME}
 OPTIONS=	PEAR_MAIL "PEAR::Mail support" off \
 		PEAR_MAIL_MIME "PEAR::Mail_Mime support" off \
 		PEAR_CACHE_LITE "PEAR::Cache_Lite support" off
 
 CATEGORY=	File
-FILES=		Archive.php Archive/Predicate.php Archive/Reader.php \
-		Archive/Writer.php Archive/Predicate/And.php \
-		Archive/Predicate/Current.php Archive/Predicate/Custom.php \
-		Archive/Predicate/Duplicate.php Archive/Predicate/Ereg.php \
-		Archive/Predicate/Eregi.php Archive/Predicate/Extension.php \
-		Archive/Predicate/False.php Archive/Predicate/Index.php \
-		Archive/Predicate/MaxDepth.php Archive/Predicate/MIME.php \
-		Archive/Predicate/MinSize.php Archive/Predicate/MinTime.php \
-		Archive/Predicate/Not.php Archive/Predicate/Or.php \
-		Archive/Predicate/True.php Archive/Reader/Ar.php \
+FILES=		Archive.php Archive/Predicate.php \
+		Archive/Predicate/And.php Archive/Predicate/Current.php \
+		Archive/Predicate/Custom.php Archive/Predicate/Duplicate.php \
+		Archive/Predicate/Ereg.php Archive/Predicate/Eregi.php \
+		Archive/Predicate/Extension.php Archive/Predicate/False.php \
+		Archive/Predicate/Index.php Archive/Predicate/MIME.php \
+		Archive/Predicate/MaxDepth.php Archive/Predicate/MinSize.php \
+		Archive/Predicate/MinTime.php Archive/Predicate/Not.php \
+		Archive/Predicate/Or.php Archive/Predicate/True.php \
+		Archive/Reader.php Archive/Reader/Ar.php \
 		Archive/Reader/Archive.php Archive/Reader/Bzip2.php \
 		Archive/Reader/Cache.php Archive/Reader/ChangeName.php \
+		Archive/Reader/ChangeName/AddDirectory.php \
+		Archive/Reader/ChangeName/Callback.php \
+		Archive/Reader/ChangeName/Directory.php \
 		Archive/Reader/Concat.php Archive/Reader/Directory.php \
 		Archive/Reader/File.php Archive/Reader/Filter.php \
 		Archive/Reader/Gzip.php Archive/Reader/Memory.php \
 		Archive/Reader/MimeList.php Archive/Reader/Multi.php \
 		Archive/Reader/Relay.php Archive/Reader/Select.php \
 		Archive/Reader/Tar.php Archive/Reader/Uncompress.php \
-		Archive/Reader/Zip.php Archive/Writer/AddBaseName.php \
-		Archive/Writer/Ar.php Archive/Writer/Archive.php \
-		Archive/Writer/Bzip2.php Archive/Writer/Files.php \
-		Archive/Writer/Gzip.php Archive/Writer/Mail.php \
-		Archive/Writer/Memory.php Archive/Writer/MemoryArchive.php \
-		Archive/Writer/Multi.php Archive/Writer/Output.php \
-		Archive/Writer/Tar.php Archive/Writer/UniqueAppender.php \
-		Archive/Writer/Zip.php
+		Archive/Reader/Zip.php Archive/Writer.php \
+		Archive/Writer/AddBaseName.php Archive/Writer/Ar.php \
+		Archive/Writer/Archive.php Archive/Writer/Bzip2.php \
+		Archive/Writer/Files.php Archive/Writer/Gzip.php \
+		Archive/Writer/Mail.php Archive/Writer/Memory.php \
+		Archive/Writer/MemoryArchive.php Archive/Writer/Multi.php \
+		Archive/Writer/Output.php Archive/Writer/Tar.php \
+		Archive/Writer/UniqueAppender.php Archive/Writer/Zip.php
 DOCS=		readme.txt
 TESTS=		test.php
 _DOCSDIR=	doc
 
-post-extract:
-	@${MV} ${WRKSRC}/File/* ${WRKSRC}
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PEAR_MAIL)
diff --git a/archivers/pear-File_Archive/distinfo b/archivers/pear-File_Archive/distinfo
index 98da25c519e1..f470a467dd78 100644
--- a/archivers/pear-File_Archive/distinfo
+++ b/archivers/pear-File_Archive/distinfo
@@ -1,3 +1,3 @@
-MD5 (PEAR/File_Archive-1.5.3.tgz) = 49ebbc8a341d189b7d0be90064a3d18d
-SHA256 (PEAR/File_Archive-1.5.3.tgz) = 1ce40a604d7059386c9a1a2392997a7e82e7a6c1d31f43e22d1dfcf6d328b164
-SIZE (PEAR/File_Archive-1.5.3.tgz) = 55201
+MD5 (PEAR/File_Archive-1.5.4.tgz) = 5bbdacfd95e00a9be46fed4b5eb88378
+SHA256 (PEAR/File_Archive-1.5.4.tgz) = b3cbbd9387a733a1b574a31176c71bd2a0a4b4fb842e2d4e22f816ec98c8c00d
+SIZE (PEAR/File_Archive-1.5.4.tgz) = 58042