2 files changed, 32 insertions, 26 deletions

diff --git a/sysutils/pear-Translation2/Makefile b/sysutils/pear-Translation2/Makefile
index 14eec2007f09..86ffb4c95c77 100644
--- a/sysutils/pear-Translation2/Makefile
+++ b/sysutils/pear-Translation2/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	Translation2
-PORTVERSION=	2.0.0
+DISTVERSION=	2.0.0beta6
+PORTEPOCH=	1
 CATEGORIES=	sysutils devel pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}beta4
 
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for multilingual applications management
@@ -18,6 +18,16 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	yes
 
+LATEST_LINK=	pear-Translation2
+OPTIONS=	PEAR_CACHE_LITE "PEAR::Cache_Lite support" off \
+		PEAR_DB "PEAR::DB support" off \
+		PEAR_DB_DATAOBJECT "PEAR::DB_DataObject support" off \
+		PEAR_MDB "PEAR::MDB support" off \
+		PEAR_MDB2 "PEAR::MDB2 support" off \
+		PEAR_FILE_GETTEXT "PEAR::File_Gettext support" off \
+		PEAR_I18NV2 "PEAR::I18Nv2 support" off \
+		PEAR_XML_SERIALIZER "PEAR::XML_Serializer support" off
+
 FILES=		Translation2.php Translation2/Admin.php Translation2/Container.php \
 		Translation2/Decorator.php Translation2/Admin/Decorator.php \
 		Translation2/Admin/Container/dataobjectsimple.php \
@@ -34,63 +44,59 @@ FILES=		Translation2.php Translation2/Admin.php Translation2/Container.php \
 		Translation2/Decorator/CacheLiteFunction.php \
 		Translation2/Decorator/CacheMemory.php \
 		Translation2/Decorator/DefaultText.php \
-		Translation2/Decorator/Iconv.php Translation2/Decorator/Lang.php \
-		Translation2/Decorator/SpecialChars.php \
+		Translation2/Decorator/ErrorText.php Translation2/Decorator/Iconv.php \
+		Translation2/Decorator/Lang.php Translation2/Decorator/SpecialChars.php \
 		Translation2/Decorator/UTF8.php
 DOCS=		gettext_readme.txt
+TESTS=		admin_containers_tests.php admin_db_test.php admin_gettext_po_test.php \
+		admin_mdb2_test.php admin_mdb_test.php admin_xml_test.php all_tests.php \
+		containers_tests.php db_test.php dbms.php gettext_domains.ini \
+		gettext_langs.ini gettext_mo_test.php gettext_po_test.php \
+		gettext_prepare.php i18n.xml mdb2_test.php mdb_test.php readme.txt \
+		simple_include.php tests.sql translation2_admin_include.php \
+		translation2_include.php xml_test.php
 EXAMPLES=	gettext_admin.php gettext_domains.ini gettext_langs.ini \
 		gettext_prepare.php gettext_settings.php settings.php \
 		Translation2_example.php Translation2_example.sql \
 		Translation2_gettext_example.php
 _EXAMPLESDIR=	docs/examples
 
-LATEST_LINK=    pear-Translation2
-OPTIONS=        PEAR_CACHE_LITE "PEAR::Cache_Lite support" off \
-		PEAR_DB "PEAR::DB support" off \
-		PEAR_DB_DATAOBJECT "PEAR::DB_DataObject support" off \
-		PEAR_MDB "PEAR::MDB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off \
-		PEAR_FILE_GETTEXT "PEAR::File_Gettext support" off \
-		PEAR_I18NV2 "PEAR::I18Nv2 support" off \
-		PEAR_XML_SERIALIZER "PEAR::XML_Serializer support" off
-
-.include <bsd.port.pre.mk>
-
 post-extract:
 	${MKDIR} ${WRKSRC}/Translation2
 	${MV} ${WRKSRC}/[A-D]* ${WRKSRC}/Translation2
 
 .if defined(WITH_PEAR_CACHE_LITE)
-BUILD_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
+RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
 .endif
 
 .if defined(WITH_PEAR_DB)
-BUILD_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
 .if defined(WITH_PEAR_DB_DATAOBJECT)
-BUILD_DEPENDS+=	${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
+RUN_DEPENDS+=	${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
 .endif
 
 .if defined(WITH_PEAR_MDB)
-BUILD_DEPENDS+=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
+RUN_DEPENDS+=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
 .endif
 
 .if defined(WITH_PEAR_MDB2)
-BUILD_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+RUN_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .endif
 
 .if defined(WITH_PEAR_FILE_GETTEXT)
-BUILD_DEPENDS+=	${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
+RUN_DEPENDS+=	${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
 .endif
 
 .if defined(WITH_PEAR_I18NV2)
-BUILD_DEPENDS+=	${PEARDIR}/File/I18Nv2.php:${PORTSDIR}/sysutils/pear-I18Nv2
+RUN_DEPENDS+=	${PEARDIR}/File/I18Nv2.php:${PORTSDIR}/sysutils/pear-I18Nv2
 .endif
 
 .if defined(WITH_PEAR_XML_SERIALIZER)
-BUILD_DEPENDS+=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+RUN_DEPENDS+=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
 .endif
 
+.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-Translation2/distinfo b/sysutils/pear-Translation2/distinfo
index f0aeef75e2f2..d3d93e891cb8 100644
--- a/sysutils/pear-Translation2/distinfo
+++ b/sysutils/pear-Translation2/distinfo
@@ -1,2 +1,2 @@
-MD5 (PEAR/Translation2-2.0.0beta4.tgz) = 349dc87b7cdd148b30a8e50848bbd2d7
-SIZE (PEAR/Translation2-2.0.0beta4.tgz) = 43116
+MD5 (PEAR/Translation2-2.0.0beta6.tgz) = fab1b6dbbad1f46ea5e9cb67fd01561c
+SIZE (PEAR/Translation2-2.0.0beta6.tgz) = 47192