4 files changed, 19 insertions, 15 deletions

diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 28522b37dc1d..8b2585136582 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	HTML_Select
-PORTVERSION=	1.0
+PORTNAME=	HTML_Select_Common
+PORTVERSION=	1.1
 CATEGORIES=	devel www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -21,21 +21,21 @@ RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common \
 		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
 
 NO_BUILD=	yes
-EXAMPLESDIR=	${PREFIX}/share/examples/pear/HTML_Select
+EXAMPLESDIR=	${PREFIX}/share/examples/pear/${PORTNAME}
 
 LPHP_LIB=	lib/php
 PEARDIR=	${LOCALBASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
-MANIFEST=	Country.php UKCounty.php USState.php
-EXAMPLES=	Country.php UKCounty.php USState.php
+MANIFEST=	Country.php FRDepartements.php UKCounty.php USState.php
+EXAMPLES=	Country.php FRDepartements.php UKCounty.php USState.php
 
 do-install:
-	@${MKDIR} ${PEARDIR}/HTML/Select
+	@${MKDIR} ${PEARDIR}/HTML/Select/Common
 .for FILE in ${MANIFEST}
-	@${CP} -p ${WRKSRC}/Select/${FILE} ${PEARDIR}/HTML/Select
+	@${CP} -p ${WRKSRC}/Select/Common/${FILE} ${PEARDIR}/HTML/Select/Common
 .endfor
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Select
-	@${CHMOD} a-x ${PEARDIR}/HTML/Select/*
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Select/Common
+	@${CHMOD} a-x ${PEARDIR}/HTML/Select/Common/*
 #Note: Select.php is still needed for Kronolith 1.0
 #	but should be removed with the next release.
 	@${CP} -p ${FILESDIR}/Select.php ${PEARDIR}/HTML
@@ -45,7 +45,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 .for FILE in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/Select/examples/${FILE} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/Select/Common/examples/${FILE} ${EXAMPLESDIR}
 .endfor
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
diff --git a/devel/pear-HTML_Select_Common/distinfo b/devel/pear-HTML_Select_Common/distinfo
index d2e7741410ca..575c4977b1e5 100644
--- a/devel/pear-HTML_Select_Common/distinfo
+++ b/devel/pear-HTML_Select_Common/distinfo
@@ -1 +1 @@
-MD5 (PEAR/HTML_Select-1.0.tgz) = b9db4ed0b2e951e6ed81f251a986e566
+MD5 (PEAR/HTML_Select_Common-1.1.tgz) = 182210f08e809d51208ae4ecc70a4f3c
diff --git a/devel/pear-HTML_Select_Common/pkg-descr b/devel/pear-HTML_Select_Common/pkg-descr
index 4929a54c9d9f..28afa4d25c57 100644
--- a/devel/pear-HTML_Select_Common/pkg-descr
+++ b/devel/pear-HTML_Select_Common/pkg-descr
@@ -2,5 +2,6 @@ Provides <select> lists for:
 o Country
 o UK counties
 o US States
+o FR Departements
 
-WWW: http://pear.php.net/package-info.php?pacid=58
+WWW: http://pear.php.net/package-info.php?pacid=165
diff --git a/devel/pear-HTML_Select_Common/pkg-plist b/devel/pear-HTML_Select_Common/pkg-plist
index 9f094ae340a9..2cdb1182ed8c 100644
--- a/devel/pear-HTML_Select_Common/pkg-plist
+++ b/devel/pear-HTML_Select_Common/pkg-plist
@@ -1,9 +1,12 @@
 %%PEARDIR%%/HTML/Select.php
-%%PEARDIR%%/HTML/Select/Country.php
-%%PEARDIR%%/HTML/Select/UKCounty.php
-%%PEARDIR%%/HTML/Select/USState.php
+%%PEARDIR%%/HTML/Select/Common/Country.php
+%%PEARDIR%%/HTML/Select/Common/FRDepartements.php
+%%PEARDIR%%/HTML/Select/Common/UKCounty.php
+%%PEARDIR%%/HTML/Select/Common/USState.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/Country.php
+%%PORTDOCS%%%%EXAMPLESDIR%%/FRDepartements.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/UKCounty.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/USState.php
+@dirrm %%PEARDIR%%/HTML/Select/Common
 @dirrm %%PEARDIR%%/HTML/Select
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%