- Update to snapshot 20060205.

- Fix packing list issues.
- Fix PHP version detection problem.

PR:		ports/90735, ports/91793, ports/92857
Submitted by:	Babak Farrokhi <babak@farrokhi.net>

3 files changed, 75 insertions, 24 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index f9ad81182392..be231dd664fe 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	roundcube
-PORTVERSION=	0.1
-PORTREVISION=	${SNAPSHOT}
+PORTVERSION=	0.1.${SNAPSHOT}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.unixified.net/roundcube/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${SNAPSHOT}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.${SNAPSHOT}//}-${SNAPSHOT}
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 
-SNAPSHOT=	20051219
+SNAPSHOT=	20060205
 
 WRKSRC=		${WRKDIR}/${PORTNAME}mail
 NO_BUILD=	yes
@@ -35,6 +34,17 @@ SCRIPTS_ENV=	SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
 		RCUBEROOT=${RCUBEROOT}
 
 WANT_PHP_WEB=	yes
+USE_PHP=	pcre
+
+SUB_FILES=	pkg-install
+SUB_LIST=	RCUBEROOT=${RCUBEROOT}
+PKGDEINSTALL=	${PKGINSTALL}
+
+LOCALBASE?=	/usr/local
+
+.if exists(${LOCALBASE}/etc/php.conf)
+.include "${LOCALBASE}/etc/php.conf"
+.endif
 
 OPTIONS=	MYSQL "Use MySQL backend" on \
 		PGSQL "Use PostgreSQL backend" off
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 5c43722137c5..4c9fd8230b4c 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-MD5 (roundcube-0.1-20051219.tar.gz) = 6475734a0019d446e0f9ae9124ace604
-SHA256 (roundcube-0.1-20051219.tar.gz) = c2a0fe788281e5dcd33d3cc5b1525f8f8f74cebdaea886bc65a3745d12bb77ac
-SIZE (roundcube-0.1-20051219.tar.gz) = 538880
+MD5 (roundcube-0.1-20060205.tar.gz) = beaed041829f566a2124eba0d43b38fd
+SHA256 (roundcube-0.1-20060205.tar.gz) = 4c4ff6219bfe4604cad14cf3efc9abcf63883367659f8772ffcc07b30ce9bb21
+SIZE (roundcube-0.1-20060205.tar.gz) = 584375
diff --git a/mail/roundcube/pkg-plist b/mail/roundcube/pkg-plist
index 3803105c3161..37c79b596e0d 100644
--- a/mail/roundcube/pkg-plist
+++ b/mail/roundcube/pkg-plist
@@ -1,7 +1,3 @@
-%%DOCSDIR%%/CHANGELOG
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README
 %%DOCSDIR%%/UPGRADING
 %%RCUBEDIR%%/SQL/mysql.initial.sql
 %%RCUBEDIR%%/SQL/mysql.update.sql
@@ -18,6 +14,7 @@
 %%RCUBEDIR%%/program/include/main.inc
 %%RCUBEDIR%%/program/include/rcube_db.inc
 %%RCUBEDIR%%/program/include/rcube_imap.inc
+%%RCUBEDIR%%/program/include/rcube_ldap.inc
 %%RCUBEDIR%%/program/include/rcube_mdb2.inc
 %%RCUBEDIR%%/program/include/rcube_shared.inc
 %%RCUBEDIR%%/program/include/rcube_smtp.inc
@@ -105,13 +102,33 @@
 %%RCUBEDIR%%/program/lib/Net/Socket.php
 %%RCUBEDIR%%/program/lib/PEAR.php
 %%RCUBEDIR%%/program/lib/des.inc
+%%RCUBEDIR%%/program/lib/encoding/CP1250.map
+%%RCUBEDIR%%/program/lib/encoding/CP1251.map
+%%RCUBEDIR%%/program/lib/encoding/CP1252.map
+%%RCUBEDIR%%/program/lib/encoding/CP1253.map
+%%RCUBEDIR%%/program/lib/encoding/CP1254.map
+%%RCUBEDIR%%/program/lib/encoding/CP1255.map
+%%RCUBEDIR%%/program/lib/encoding/CP1256.map
+%%RCUBEDIR%%/program/lib/encoding/CP1257.map
+%%RCUBEDIR%%/program/lib/encoding/CP1258.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-1.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-2.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-3.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-4.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-5.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-6.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-7.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-8.map
+%%RCUBEDIR%%/program/lib/encoding/ISO-8859-9.map
 %%RCUBEDIR%%/program/lib/enriched.inc
 %%RCUBEDIR%%/program/lib/html2text.inc
 %%RCUBEDIR%%/program/lib/icl_commons.inc
 %%RCUBEDIR%%/program/lib/imap.inc
 %%RCUBEDIR%%/program/lib/mime.inc
 %%RCUBEDIR%%/program/lib/utf7.inc
-%%RCUBEDIR%%/program/lib/utf8.inc
+%%RCUBEDIR%%/program/lib/utf8.class.php
+%%RCUBEDIR%%/program/localization/bs_BA/labels.inc
+%%RCUBEDIR%%/program/localization/bs_BA/messages.inc
 %%RCUBEDIR%%/program/localization/ca/labels.inc
 %%RCUBEDIR%%/program/localization/ca/messages.inc
 %%RCUBEDIR%%/program/localization/cn/labels.inc
@@ -120,22 +137,28 @@
 %%RCUBEDIR%%/program/localization/cz/messages.inc
 %%RCUBEDIR%%/program/localization/da/labels.inc
 %%RCUBEDIR%%/program/localization/da/messages.inc
-%%RCUBEDIR%%/program/localization/de/labels.inc
-%%RCUBEDIR%%/program/localization/de/messages.inc
+%%RCUBEDIR%%/program/localization/de_DE/labels.inc
+%%RCUBEDIR%%/program/localization/de_DE/messages.inc
 %%RCUBEDIR%%/program/localization/ee/labels.inc
 %%RCUBEDIR%%/program/localization/ee/messages.inc
 %%RCUBEDIR%%/program/localization/el/labels.inc
 %%RCUBEDIR%%/program/localization/el/messages.inc
-%%RCUBEDIR%%/program/localization/en/labels.inc
-%%RCUBEDIR%%/program/localization/en/messages.inc
 %%RCUBEDIR%%/program/localization/en_GB/labels.inc
 %%RCUBEDIR%%/program/localization/en_GB/messages.inc
+%%RCUBEDIR%%/program/localization/en_US/labels.inc
+%%RCUBEDIR%%/program/localization/en_US/messages.inc
 %%RCUBEDIR%%/program/localization/es/labels.inc
 %%RCUBEDIR%%/program/localization/es/messages.inc
+%%RCUBEDIR%%/program/localization/eu/labels.inc
+%%RCUBEDIR%%/program/localization/eu/messages.inc
 %%RCUBEDIR%%/program/localization/fi/labels.inc
 %%RCUBEDIR%%/program/localization/fi/messages.inc
 %%RCUBEDIR%%/program/localization/fr/labels.inc
 %%RCUBEDIR%%/program/localization/fr/messages.inc
+%%RCUBEDIR%%/program/localization/hr/labels.inc
+%%RCUBEDIR%%/program/localization/hr/messages.inc
+%%RCUBEDIR%%/program/localization/hu/labels.inc
+%%RCUBEDIR%%/program/localization/hu/messages.inc
 %%RCUBEDIR%%/program/localization/index.inc
 %%RCUBEDIR%%/program/localization/it/labels.inc
 %%RCUBEDIR%%/program/localization/it/messages.inc
@@ -145,22 +168,24 @@
 %%RCUBEDIR%%/program/localization/lv/messages.inc
 %%RCUBEDIR%%/program/localization/nb_NO/labels.inc
 %%RCUBEDIR%%/program/localization/nb_NO/messages.inc
-%%RCUBEDIR%%/program/localization/nl/labels.inc
-%%RCUBEDIR%%/program/localization/nl/messages.inc
+%%RCUBEDIR%%/program/localization/nl_NL/labels.inc
+%%RCUBEDIR%%/program/localization/nl_NL/messages.inc
 %%RCUBEDIR%%/program/localization/nn_NO/labels.inc
 %%RCUBEDIR%%/program/localization/nn_NO/messages.inc
 %%RCUBEDIR%%/program/localization/pl/labels.inc
 %%RCUBEDIR%%/program/localization/pl/messages.inc
-%%RCUBEDIR%%/program/localization/pt/labels.inc
-%%RCUBEDIR%%/program/localization/pt/messages.inc
 %%RCUBEDIR%%/program/localization/pt_BR/labels.inc
 %%RCUBEDIR%%/program/localization/pt_BR/messages.inc
+%%RCUBEDIR%%/program/localization/pt_PT/labels.inc
+%%RCUBEDIR%%/program/localization/pt_PT/messages.inc
 %%RCUBEDIR%%/program/localization/ro/labels.inc
 %%RCUBEDIR%%/program/localization/ro/messages.inc
 %%RCUBEDIR%%/program/localization/ru/labels.inc
 %%RCUBEDIR%%/program/localization/ru/messages.inc
 %%RCUBEDIR%%/program/localization/se/labels.inc
 %%RCUBEDIR%%/program/localization/se/messages.inc
+%%RCUBEDIR%%/program/localization/sk/labels.inc
+%%RCUBEDIR%%/program/localization/sk/messages.inc
 %%RCUBEDIR%%/program/localization/tr/labels.inc
 %%RCUBEDIR%%/program/localization/tr/messages.inc
 %%RCUBEDIR%%/program/localization/tw/labels.inc
@@ -168,17 +193,22 @@
 %%RCUBEDIR%%/program/steps/addressbook/delete.inc
 %%RCUBEDIR%%/program/steps/addressbook/edit.inc
 %%RCUBEDIR%%/program/steps/addressbook/func.inc
+%%RCUBEDIR%%/program/steps/addressbook/ldapsearchform.inc
 %%RCUBEDIR%%/program/steps/addressbook/list.inc
 %%RCUBEDIR%%/program/steps/addressbook/save.inc
 %%RCUBEDIR%%/program/steps/addressbook/show.inc
 %%RCUBEDIR%%/program/steps/error.inc
 %%RCUBEDIR%%/program/steps/mail/addcontact.inc
+%%RCUBEDIR%%/program/steps/mail/check_recent.inc
 %%RCUBEDIR%%/program/steps/mail/compose.inc
+%%RCUBEDIR%%/program/steps/mail/folders.inc
 %%RCUBEDIR%%/program/steps/mail/func.inc
 %%RCUBEDIR%%/program/steps/mail/get.inc
+%%RCUBEDIR%%/program/steps/mail/getunread.inc
 %%RCUBEDIR%%/program/steps/mail/list.inc
 %%RCUBEDIR%%/program/steps/mail/mark.inc
 %%RCUBEDIR%%/program/steps/mail/move_del.inc
+%%RCUBEDIR%%/program/steps/mail/rss.inc
 %%RCUBEDIR%%/program/steps/mail/sendmail.inc
 %%RCUBEDIR%%/program/steps/mail/show.inc
 %%RCUBEDIR%%/program/steps/mail/upload.inc
@@ -219,6 +249,8 @@
 %%RCUBEDIR%%/skins/default/images/buttons/forward_pas.png
 %%RCUBEDIR%%/skins/default/images/buttons/inbox_act.png
 %%RCUBEDIR%%/skins/default/images/buttons/inbox_pas.png
+%%RCUBEDIR%%/skins/default/images/buttons/ldap_act.png
+%%RCUBEDIR%%/skins/default/images/buttons/ldap_pas.png
 %%RCUBEDIR%%/skins/default/images/buttons/logout.gif
 %%RCUBEDIR%%/skins/default/images/buttons/logout.png
 %%RCUBEDIR%%/skins/default/images/buttons/mail.gif
@@ -276,10 +308,12 @@
 %%RCUBEDIR%%/skins/default/images/tab_pas.gif
 %%RCUBEDIR%%/skins/default/images/taskbar.gif
 %%RCUBEDIR%%/skins/default/includes/header.html
+%%RCUBEDIR%%/skins/default/includes/ldapscripts.html
 %%RCUBEDIR%%/skins/default/includes/links.html
 %%RCUBEDIR%%/skins/default/includes/settingscripts.html
 %%RCUBEDIR%%/skins/default/includes/settingstabs.html
 %%RCUBEDIR%%/skins/default/includes/taskbar.html
+%%RCUBEDIR%%/skins/default/ldapsearchform.css
 %%RCUBEDIR%%/skins/default/mail.css
 %%RCUBEDIR%%/skins/default/pngbehavior.htc
 %%RCUBEDIR%%/skins/default/print.css
@@ -292,6 +326,7 @@
 %%RCUBEDIR%%/skins/default/templates/editidentity.html
 %%RCUBEDIR%%/skins/default/templates/error.html
 %%RCUBEDIR%%/skins/default/templates/identities.html
+%%RCUBEDIR%%/skins/default/templates/ldappublicsearch.html
 %%RCUBEDIR%%/skins/default/templates/login.html
 %%RCUBEDIR%%/skins/default/templates/mail.html
 %%RCUBEDIR%%/skins/default/templates/managefolders.html
@@ -316,31 +351,37 @@
 @dirrm %%RCUBEDIR%%/program/steps
 @dirrm %%RCUBEDIR%%/program/localization/tw
 @dirrm %%RCUBEDIR%%/program/localization/tr
+@dirrm %%RCUBEDIR%%/program/localization/sk
 @dirrm %%RCUBEDIR%%/program/localization/se
 @dirrm %%RCUBEDIR%%/program/localization/ru
 @dirrm %%RCUBEDIR%%/program/localization/ro
+@dirrm %%RCUBEDIR%%/program/localization/pt_PT
 @dirrm %%RCUBEDIR%%/program/localization/pt_BR
-@dirrm %%RCUBEDIR%%/program/localization/pt
 @dirrm %%RCUBEDIR%%/program/localization/pl
 @dirrm %%RCUBEDIR%%/program/localization/nn_NO
-@dirrm %%RCUBEDIR%%/program/localization/nl
+@dirrm %%RCUBEDIR%%/program/localization/nl_NL
 @dirrm %%RCUBEDIR%%/program/localization/nb_NO
 @dirrm %%RCUBEDIR%%/program/localization/lv
 @dirrm %%RCUBEDIR%%/program/localization/ja
 @dirrm %%RCUBEDIR%%/program/localization/it
+@dirrm %%RCUBEDIR%%/program/localization/hu
+@dirrm %%RCUBEDIR%%/program/localization/hr
 @dirrm %%RCUBEDIR%%/program/localization/fr
 @dirrm %%RCUBEDIR%%/program/localization/fi
+@dirrm %%RCUBEDIR%%/program/localization/eu
 @dirrm %%RCUBEDIR%%/program/localization/es
+@dirrm %%RCUBEDIR%%/program/localization/en_US
 @dirrm %%RCUBEDIR%%/program/localization/en_GB
-@dirrm %%RCUBEDIR%%/program/localization/en
 @dirrm %%RCUBEDIR%%/program/localization/el
 @dirrm %%RCUBEDIR%%/program/localization/ee
-@dirrm %%RCUBEDIR%%/program/localization/de
+@dirrm %%RCUBEDIR%%/program/localization/de_DE
 @dirrm %%RCUBEDIR%%/program/localization/da
 @dirrm %%RCUBEDIR%%/program/localization/cz
 @dirrm %%RCUBEDIR%%/program/localization/cn
 @dirrm %%RCUBEDIR%%/program/localization/ca
+@dirrm %%RCUBEDIR%%/program/localization/bs_BA
 @dirrm %%RCUBEDIR%%/program/localization
+@dirrm %%RCUBEDIR%%/program/lib/encoding
 @dirrm %%RCUBEDIR%%/program/lib/Net
 @dirrm %%RCUBEDIR%%/program/lib/Mail
 @dirrm %%RCUBEDIR%%/program/lib/MDB2/Wrapper