- Update to 1.5.5

- Convert to optionNG

2 files changed, 15 insertions, 44 deletions

diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index 5ea159bb12f0..569968a6f291 100644
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	File_Archive
-PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTVERSION=	1.5.5
 CATEGORIES=	archivers www pear
 
 MAINTAINER=	miwi@FreeBSD.org
@@ -15,59 +14,31 @@ 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 \
 		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type \
+		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 
 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/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.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
+OPTIONS_DEFINE=	PEAR_MAIL PEAR_MAIL_MIME PEAR_CACHE_LITE
+
+PEAR_MAIL_DESC=		"PEAR::Mail support"
+PEAR_MAIL_MIME_DESC=	"PEAR::Mail_Mime support"
+PEAR_CACHE_LITE_DESC=	"PEAR::Cache_Lite support"
+
+PEAR_AUTOINSTALL=	YES
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PEAR_MAIL)
+.if ${PORT_OPTIONS:MWITH_PEAR_MAIL}
 RUN_DEPENDS+=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
 .endif
 
-.if defined(WITH_PEAR_MAIL_MIME)
+.if ${PORT_OPTIONS:MPEAR_MAIL_MIME}
 RUN_DEPENDS+=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 .endif
 
-.if defined(WITH_PEAR_CACHE_LITE)
+.if ${PORT_OPTIONS:MPEAR_CACHE_LITE}
 RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
 .endif
 
diff --git a/archivers/pear-File_Archive/distinfo b/archivers/pear-File_Archive/distinfo
index a2d8a392af23..596ae6be93ed 100644
--- a/archivers/pear-File_Archive/distinfo
+++ b/archivers/pear-File_Archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PEAR/File_Archive-1.5.4.tgz) = b3cbbd9387a733a1b574a31176c71bd2a0a4b4fb842e2d4e22f816ec98c8c00d
-SIZE (PEAR/File_Archive-1.5.4.tgz) = 58042
+SHA256 (PEAR/File_Archive-1.5.5.tgz) = d739ca1d3cc52f7e5b8c46cfe2233afb11dee0e145e57754c0eaba50ffb8bde1
+SIZE (PEAR/File_Archive-1.5.5.tgz) = 62598