3 files changed, 39 insertions, 8 deletions

diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index cb6e2daafa7a..b4b8a9723ef6 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	I18N
-PORTVERSION=	0.8.5
+PORTVERSION=	0.8.6
 CATEGORIES=	devel www
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,9 +18,11 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
-MANIFEST=	Common.php Country.php Language.php Negotiator.php
-EXAMPLES=	I18N_Currency.php I18N_DateTime.php I18N_Message.php \
-		I18N_Message_Translate.php I18N_Message_Translate.tpl \
+MANIFEST=	Common.php Country.php Currency.php DateTime.php Format.php	\
+		Language.php Negotiator.php Number.php
+SUBDIRS=	Common Messages
+EXAMPLES=	I18N_Currency.php I18N_DateTime.php I18N_Message.php		\
+		I18N_Message_Translate.php I18N_Message_Translate.tpl		\
 		I18N_Negotiator.php I18N_Number.php
 
 do-install:
@@ -28,10 +30,10 @@ do-install:
 .for FILE in ${MANIFEST}
 	@${CP} -p ${WRKSRC}/${FILE} ${PEARDIR}/I18N
 .endfor
-	@${CHMOD} a-x ${PEARDIR}/I18N/*
-	@${CP} -Rp ${WRKSRC}/Messages ${PEARDIR}/I18N
+.for FILE in ${SUBDIRS}
+	@${CP} -Rp ${WRKSRC}/${FILE} ${PEARDIR}/I18N
+.endfor
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/I18N
-	@${CHMOD} a-x ${PEARDIR}/I18N/Messages/*
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${EXAMPLES}
diff --git a/devel/pear-I18N/distinfo b/devel/pear-I18N/distinfo
index ca3cf0057e6f..a587b3c63312 100644
--- a/devel/pear-I18N/distinfo
+++ b/devel/pear-I18N/distinfo
@@ -1 +1 @@
-MD5 (PEAR/I18N-0.8.5.tgz) = f0114f9b179847c5abac4af3214376a0
+MD5 (PEAR/I18N-0.8.6.tgz) = 8cc7870da2844ac08abf7e6a77685054
diff --git a/devel/pear-I18N/pkg-plist b/devel/pear-I18N/pkg-plist
index 7e706e0b0d6f..b8fbfc196ba9 100644
--- a/devel/pear-I18N/pkg-plist
+++ b/devel/pear-I18N/pkg-plist
@@ -1,7 +1,34 @@
+%%PEARDIR%%/I18N/Common/af.php
+%%PEARDIR%%/I18N/Common/da_DK.php
+%%PEARDIR%%/I18N/Common/de.php
+%%PEARDIR%%/I18N/Common/de_AT.php
+%%PEARDIR%%/I18N/Common/de_DE.php
+%%PEARDIR%%/I18N/Common/en.php
+%%PEARDIR%%/I18N/Common/en_GB.php
+%%PEARDIR%%/I18N/Common/en_UK.php
+%%PEARDIR%%/I18N/Common/en_US.php
+%%PEARDIR%%/I18N/Common/en_ZA.php
+%%PEARDIR%%/I18N/Common/es.php
+%%PEARDIR%%/I18N/Common/es_ES.php
+%%PEARDIR%%/I18N/Common/fr.php
+%%PEARDIR%%/I18N/Common/fr_FR.php
+%%PEARDIR%%/I18N/Common/hu.php
+%%PEARDIR%%/I18N/Common/it.php
+%%PEARDIR%%/I18N/Common/it_IT.php
+%%PEARDIR%%/I18N/Common/nl.php
+%%PEARDIR%%/I18N/Common/nl_NL.php
+%%PEARDIR%%/I18N/Common/pl.php
+%%PEARDIR%%/I18N/Common/pt.php
+%%PEARDIR%%/I18N/Common/ru.php
+%%PEARDIR%%/I18N/Common/sl.php
 %%PEARDIR%%/I18N/Common.php
 %%PEARDIR%%/I18N/Country.php
+%%PEARDIR%%/I18N/Currency.php
+%%PEARDIR%%/I18N/DateTime.php
+%%PEARDIR%%/I18N/Format.php
 %%PEARDIR%%/I18N/Language.php
 %%PEARDIR%%/I18N/Negotiator.php
+%%PEARDIR%%/I18N/Number.php
 %%PEARDIR%%/I18N/Messages/Common.php
 %%PEARDIR%%/I18N/Messages/File.php
 %%PEARDIR%%/I18N/Messages/Translate.php
@@ -14,6 +41,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/I18N_Message_Translate.tpl
 %%PORTDOCS%%%%DOCSDIR%%/I18N_Negotiator.php
 %%PORTDOCS%%%%DOCSDIR%%/I18N_Number.php
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@dirrm %%PEARDIR%%/I18N/Common
 @dirrm %%PEARDIR%%/I18N/Messages
 @dirrm %%PEARDIR%%/I18N
 @dirrm %%PKGREGDIR%%