Update to 2.2.1.

Main changes since 2.0:
Add various translations
Add a preference to allow maintenance ops with no confirmation screen
Allow setting the number of columns in the summary screen as a user
      preference (Brian Keifer <brian@valinor.net>).
Make text, icon, or both menus a user preference
Add a Horde preferences screen, and a preference to refresh the summary
      screen.
Add text/enriched MIME_Viewer

See share/doc/horde/CHANGES for details.

4 files changed, 404 insertions, 363 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index 4ccf1bc4482..e68b653ca94 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2003/01/28 22:04:29 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/17 17:58:13 bouyer Exp $
 
-DISTNAME=	horde-2.0
+DISTNAME=	horde-2.2.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
@@ -24,7 +24,7 @@ MESSAGE_SUBST+=	HORDEDIR=${HORDEDIR}
 
 PKG_SYSCONFSUBDIR?=	httpd
 
-USE_PKGINSTALL=	yes
+USE_PKGINSTALL=	YES
 CONF_FILES=	${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
 CONF_FILES+=	${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
 SUPPORT_FILES+=	${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
@@ -32,14 +32,15 @@ SUPPORT_FILES+=	${HORDEDIR}/config/lang.php.dist ${HORDEDIR}/config/lang.php
 SUPPORT_FILES+=	${HORDEDIR}/config/mime_drivers.php.dist ${HORDEDIR}/config/mime_drivers.php
 SUPPORT_FILES+=	${HORDEDIR}/config/mime_mapping.php.dist ${HORDEDIR}/config/mime_mapping.php
 SUPPORT_FILES+=	${HORDEDIR}/config/motd.php.dist ${HORDEDIR}/config/motd.php
+SUPPORT_FILES+=	${HORDEDIR}/config/prefs.php.dist ${HORDEDIR}/config/prefs.php
 SUPPORT_FILES+=	${HORDEDIR}/config/registry.php.dist ${HORDEDIR}/config/registry.php
 
 post-patch:
 	cd ${WRKSRC}/scripts;						\
-	for file in mime_mapping/convert.pl; do		\
-		${MV} -f $${file} $${file}.orig;			\
+	for FILE in mime_mapping/convert.pl; do		\
+		${MV} -f $${FILE} $${FILE}.orig;			\
 		${SED}	-e "s|/usr/bin/perl|${PERL5}|g"			\
-			$${file}.orig > $${file};			\
+			$${FILE}.orig > $${FILE};			\
 	done
 
 do-build:
@@ -56,7 +57,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${HORDEDIR}
 	cd ${WRKDIR}; ${INSTALL_DATA} horde.conf.dist ${EGDIR}/horde.conf
 	cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
-	cd ${WRKSRC}; ${CP} -R admin graphics lib locale po scripts templates util ${HORDEDIR}
+	cd ${WRKSRC}; ${CP} -R graphics lib locale po scripts templates util ${HORDEDIR}
 	${INSTALL_DATA_DIR} ${HORDEDIR}/config
 	cd ${WRKSRC}/config; ${INSTALL_DATA} * ${HORDEDIR}/config
 	cd ${WRKSRC}; ${INSTALL_DATA} *.php ${HORDEDIR}
diff --git a/www/horde/PLIST b/www/horde/PLIST
index 2574fad05e8..fbdb3654d25 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,172 +1,25 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/01 22:41:16 bouyer Exp $
-share/doc/horde/COPYING
-share/doc/horde/README
-share/doc/horde/CHANGES
-share/doc/horde/CODING_STANDARDS
-share/doc/horde/CONTRIBUTING
-share/doc/horde/CREDITS
-share/doc/horde/HACKING
-share/doc/horde/INSTALL
-share/examples/horde/horde.conf
-share/horde/locale/it_IT/LC_MESSAGES/horde.mo
-share/horde/locale/zh_TW/LC_MESSAGES/horde.mo
-share/horde/locale/de_DE/LC_MESSAGES/horde.mo
-share/horde/locale/el_GR/LC_MESSAGES/horde.mo
-share/horde/locale/en_US/help.xml
-share/horde/locale/es_ES/LC_MESSAGES/horde.mo
-share/horde/locale/fi_FI/LC_MESSAGES/horde.mo
-share/horde/locale/fr_FR/LC_MESSAGES/horde.mo
-share/horde/locale/zh_CN/LC_MESSAGES/horde.mo
-share/horde/locale/cs_CZ/LC_MESSAGES/horde.mo
-share/horde/locale/nl_NL/LC_MESSAGES/horde.mo
-share/horde/locale/no_BOK/LC_MESSAGES/horde.mo
-share/horde/locale/pl_PL/LC_MESSAGES/horde.mo
-share/horde/locale/pt_BR/LC_MESSAGES/horde.mo
-share/horde/locale/ru_koi/LC_MESSAGES/horde.mo
-share/horde/locale/ru_win/LC_MESSAGES/horde.mo
-share/horde/locale/sv_SE/LC_MESSAGES/horde.mo
-share/horde/locale/ko_KR/LC_MESSAGES/horde.mo
-share/horde/templates/help/footer.inc
-share/horde/templates/help/header.inc
-share/horde/templates/help/index.inc
-share/horde/templates/help/menu.inc
-share/horde/templates/wml/login/login.inc
-share/horde/templates/wml/login/user.inc
-share/horde/templates/wml/common-footer.inc
-share/horde/templates/wml/common-header.inc
-share/horde/templates/wml/doctype.inc
-share/horde/templates/problem/javascript.inc
-share/horde/templates/problem/problem.inc
-share/horde/templates/prefs/textarea.inc
-share/horde/templates/prefs/checkbox.inc
-share/horde/templates/prefs/end.inc
-share/horde/templates/prefs/enum.inc
-share/horde/templates/prefs/link.inc
-share/horde/templates/prefs/number.inc
-share/horde/templates/prefs/overview.inc
-share/horde/templates/prefs/select.inc
-share/horde/templates/prefs/text.inc
-share/horde/templates/prefs/begin.inc
-share/horde/templates/data/csvmap.inc
-share/horde/templates/data/datemap.inc
-share/horde/templates/maintenance/confirm_bottom.inc
-share/horde/templates/maintenance/confirm_middle.inc
-share/horde/templates/maintenance/confirm_top.inc
-share/horde/templates/maintenance/javascript.inc
-share/horde/templates/horde/modules.inc
-share/horde/templates/admin/user/add.inc
-share/horde/templates/admin/user/list.inc
-share/horde/templates/admin/user/noadd.inc
-share/horde/templates/admin/user/nolist.inc
-share/horde/templates/javascript/open_help_win.js
-share/horde/templates/login/login.inc
-share/horde/templates/login/user.inc
-share/horde/templates/index/css.inc
-share/horde/templates/index/floating_index.inc
-share/horde/templates/index/frames_index.inc
-share/horde/templates/index/notconfigured.inc
-share/horde/templates/index/wap.inc
-share/horde/templates/common-header.inc
-share/horde/templates/common-footer.inc
-share/horde/scripts/db/prefs.sql
-share/horde/scripts/db/README
-share/horde/scripts/db/category.sql
-share/horde/scripts/db/mysql_create.sql
-share/horde/scripts/db/mysql_drop.sql
-share/horde/scripts/db/pgsql_create.sql
-share/horde/scripts/db/pgsql_drop.sql
-share/horde/scripts/db/auth.sql
-share/horde/scripts/mime_mapping/Makefile
-share/horde/scripts/mime_mapping/convert.pl
-share/horde/scripts/mime_mapping/mime.types
-share/horde/scripts/mime_mapping
-share/horde/scripts/SCRIPTS
-share/horde/scripts/horde-rsync.sh
-share/horde/scripts/set_perms.sh
-share/horde/po/zh_TW.po
-share/horde/po/Makefile
-share/horde/po/README
-share/horde/po/README.WinToKoi
-share/horde/po/WinToKoi.pl
-share/horde/po/cs_CZ.po
-share/horde/po/de_DE.po
-share/horde/po/el_GR.po
-share/horde/po/es_ES.po
-share/horde/po/extract.pl
-share/horde/po/fi_FI.po
-share/horde/po/fr_FR.po
-share/horde/po/it_IT.po
-share/horde/po/ko_KR.po
-share/horde/po/nl_NL.po
-share/horde/po/no_BOK.po
-share/horde/po/pl_PL.po
-share/horde/po/pt_BR.po
-share/horde/po/ru_koi.po
-share/horde/po/ru_win.po
-share/horde/po/shtool
-share/horde/po/sv_SE.po
-share/horde/po/xgettext.sh
-share/horde/po/zh_CN.po
-share/horde/util/special_characters.php
-share/horde/lib/Cache/file.php
-share/horde/lib/Auth/ftp.php
-share/horde/lib/Auth/imap.php
-share/horde/lib/Auth/ldap.php
-share/horde/lib/Auth/mcal.php
-share/horde/lib/Auth/sql.php
-share/horde/lib/Prefs/ldap.php
-share/horde/lib/Prefs/session.php
-share/horde/lib/Prefs/sql.php
-share/horde/lib/Perms/sql.php
-share/horde/lib/MIME/Viewer/zip.php
-share/horde/lib/MIME/Viewer/default.php
-share/horde/lib/MIME/Viewer/enscript.php
-share/horde/lib/MIME/Viewer/msexcel.php
-share/horde/lib/MIME/Viewer/mspowerpoint.php
-share/horde/lib/MIME/Viewer/msword.php
-share/horde/lib/MIME/Viewer/php.php
-share/horde/lib/MIME/Viewer/rar.php
-share/horde/lib/MIME/Viewer/rpm.php
-share/horde/lib/MIME/Viewer/tgz.php
-share/horde/lib/MIME/Viewer/vcard.php
-share/horde/lib/MIME/Viewer/deb.php
-share/horde/lib/MIME/Viewer
-share/horde/lib/MIME/Magic.php
-share/horde/lib/MIME/Message.php
-share/horde/lib/MIME/Part.php
-share/horde/lib/MIME/Structure.php
-share/horde/lib/MIME/Viewer.php
-share/horde/lib/Category/sql.php
-share/horde/lib/Token/file.php
-share/horde/lib/Token/sql.php
-share/horde/lib/Help.php
-share/horde/lib/Horde.php
-share/horde/lib/Identity.php
-share/horde/lib/Lang.php
-share/horde/lib/MIME.php
-share/horde/lib/Maintenance.php
-share/horde/lib/Menu.php
-share/horde/lib/Perms.php
-share/horde/lib/Prefs.php
-share/horde/lib/Registry.php
-share/horde/lib/Secret.php
-share/horde/lib/Serialize.php
-share/horde/lib/SessionCache.php
-share/horde/lib/Text.php
-share/horde/lib/Token.php
-share/horde/lib/base.php
-share/horde/lib/version.php
-share/horde/lib/Data.php
-share/horde/lib/Category.php
-share/horde/lib/Cache.php
-share/horde/lib/Browser.php
-share/horde/lib/Auth.php
-share/horde/lib/Group.php
+@comment $NetBSD: PLIST,v 1.4 2003/03/17 17:58:13 bouyer Exp $
+share/horde/config/horde.php.dist
+share/horde/config/html.php.dist
+share/horde/config/lang.php.dist
+share/horde/config/mime_drivers.php.dist
+share/horde/config/mime_mapping.php.dist
+share/horde/config/motd.php.dist
+share/horde/config/prefs.php.dist
+share/horde/config/registry.php.dist
+share/horde/css.php
 share/horde/graphics/alerts/error.gif
 share/horde/graphics/alerts/message.gif
 share/horde/graphics/alerts/success.gif
 share/horde/graphics/alerts/warning.gif
-share/horde/graphics/mime/vcard.gif
+share/horde/graphics/data.gif
+share/horde/graphics/favicon.ico
+share/horde/graphics/help.gif
+share/horde/graphics/home.gif
+share/horde/graphics/keyboard.gif
+share/horde/graphics/login.gif
+share/horde/graphics/logout.gif
+share/horde/graphics/mime/audio.gif
 share/horde/graphics/mime/binary.gif
 share/horde/graphics/mime/compressed.gif
 share/horde/graphics/mime/csv.gif
@@ -188,8 +41,8 @@ share/horde/graphics/mime/php.gif
 share/horde/graphics/mime/readme.gif
 share/horde/graphics/mime/rpm.gif
 share/horde/graphics/mime/script-asa.gif
-share/horde/graphics/mime/xml.gif
 share/horde/graphics/mime/script-asp.gif
+share/horde/graphics/mime/script-js.gif
 share/horde/graphics/mime/setup.gif
 share/horde/graphics/mime/signed.gif
 share/horde/graphics/mime/source-c.gif
@@ -197,138 +50,359 @@ share/horde/graphics/mime/source-h.gif
 share/horde/graphics/mime/source-java.gif
 share/horde/graphics/mime/text.gif
 share/horde/graphics/mime/unknown.gif
-share/horde/graphics/mime/audio.gif
-share/horde/graphics/administration.gif
-share/horde/graphics/help.gif
-share/horde/graphics/home.gif
-share/horde/graphics/keyboard.gif
-share/horde/graphics/login.gif
-share/horde/graphics/logout.gif
+share/horde/graphics/mime/vcard.gif
+share/horde/graphics/mime/video.gif
+share/horde/graphics/mime/xml.gif
 share/horde/graphics/prefs.gif
 share/horde/graphics/problem.gif
-share/horde/graphics/data.gif
-share/horde/admin/css/graphics/color_picker.gif
-share/horde/admin/css/templates/colorpicker/thumbT.gif
-share/horde/admin/css/templates/colorpicker/blue.gif
-share/horde/admin/css/templates/colorpicker/boxbevel.gif
-share/horde/admin/css/templates/colorpicker/colorspace.js
-share/horde/admin/css/templates/colorpicker/colorthumb.gif
-share/horde/admin/css/templates/colorpicker/getcolor.js
-share/horde/admin/css/templates/colorpicker/green.gif
-share/horde/admin/css/templates/colorpicker/grey3.gif
-share/horde/admin/css/templates/colorpicker/grey4.gif
-share/horde/admin/css/templates/colorpicker/grey5.gif
-share/horde/admin/css/templates/colorpicker/hls.jpg
-share/horde/admin/css/templates/colorpicker/hls_sat.jpg
-share/horde/admin/css/templates/colorpicker/openit.js
-share/horde/admin/css/templates/colorpicker/picker_two.html
-share/horde/admin/css/templates/colorpicker/red.gif
-share/horde/admin/css/templates/colorpicker/rgb.gif
-share/horde/admin/css/templates/colorpicker/spectrum.gif
-share/horde/admin/css/templates/colorpicker/spectrum.jpg
-share/horde/admin/css/templates/colorpicker/tabHLS.gif
-share/horde/admin/css/templates/colorpicker/tabHSB.gif
-share/horde/admin/css/templates/colorpicker/tabRGB.gif
-share/horde/admin/css/templates/colorpicker/thumb.gif
-share/horde/admin/css/templates/colorpicker/thumbB.gif
-share/horde/admin/css/templates/colorpicker/thumbC.gif
-share/horde/admin/css/templates/colorpicker/thumbG.gif
-share/horde/admin/css/templates/colorpicker/thumbL.gif
-share/horde/admin/css/templates/colorpicker/thumbR.gif
-share/horde/admin/css/templates/colorpicker/thumbS.gif
-share/horde/admin/css/templates/colorpicker/behavior.js
-share/horde/admin/css/find.php
-share/horde/admin/css/index.php
-share/horde/admin/user.php
-share/horde/config/horde.php.dist
-share/horde/config/html.php.dist
-share/horde/config/lang.php.dist
-share/horde/config/mime_drivers.php.dist
-share/horde/config/mime_mapping.php.dist
-share/horde/config/motd.php.dist
-share/horde/config/registry.php.dist
-share/horde/css.php
+share/horde/graphics/tree/blank.gif
+share/horde/graphics/tree/join.gif
+share/horde/graphics/tree/joinbottom.gif
+share/horde/graphics/tree/line.gif
+share/horde/graphics/tree/minus.gif
+share/horde/graphics/tree/minusbottom.gif
+share/horde/graphics/tree/minusonly.gif
+share/horde/graphics/tree/minustop.gif
+share/horde/graphics/tree/plus.gif
+share/horde/graphics/tree/plusbottom.gif
+share/horde/graphics/tree/plusonly.gif
+share/horde/graphics/tree/plustop.gif
 share/horde/help.php
 share/horde/index.php
 share/horde/javascript.php
+share/horde/lib/Auth.php
+share/horde/lib/Auth/auto.php
+share/horde/lib/Auth/ftp.php
+share/horde/lib/Auth/imap.php
+share/horde/lib/Auth/krb5.php
+share/horde/lib/Auth/ldap.php
+share/horde/lib/Auth/mcal.php
+share/horde/lib/Auth/sql.php
+share/horde/lib/Browser.php
+share/horde/lib/Cache.php
+share/horde/lib/Cache/file.php
+share/horde/lib/Category.php
+share/horde/lib/Category/sql.php
+share/horde/lib/CategoryTree.php
+share/horde/lib/Cipher.php
+share/horde/lib/Cipher/BlockMode.php
+share/horde/lib/Cipher/BlockMode/ecb.php
+share/horde/lib/Cipher/BlockMode/ofb64.php
+share/horde/lib/Cipher/BlockMode/cfb64.php
+share/horde/lib/Cipher/BlockMode/cbc.php
+share/horde/lib/Cipher/blowfish.php
+share/horde/lib/Cipher/cast128.php
+share/horde/lib/Cipher/rc2.php
+share/horde/lib/Data.php
+share/horde/lib/Group.php
+share/horde/lib/Help.php
+share/horde/lib/Horde.php
+share/horde/lib/Identity.php
+share/horde/lib/Lang.php
+share/horde/lib/MIME.php
+share/horde/lib/MIME/Magic.php
+share/horde/lib/MIME/Message.php
+share/horde/lib/MIME/Part.php
+share/horde/lib/MIME/Structure.php
+share/horde/lib/MIME/Viewer.php
+share/horde/lib/MIME/Viewer/deb.php
+share/horde/lib/MIME/Viewer/default.php
+share/horde/lib/MIME/Viewer/enriched.php
+share/horde/lib/MIME/Viewer/enscript.php
+share/horde/lib/MIME/Viewer/images.php
+share/horde/lib/MIME/Viewer/msexcel.php
+share/horde/lib/MIME/Viewer/mspowerpoint.php
+share/horde/lib/MIME/Viewer/msword.php
+share/horde/lib/MIME/Viewer/php.php
+share/horde/lib/MIME/Viewer/rar.php
+share/horde/lib/MIME/Viewer/rpm.php
+share/horde/lib/MIME/Viewer/tgz.php
+share/horde/lib/MIME/Viewer/vcard.php
+share/horde/lib/MIME/Viewer/zip.php
+share/horde/lib/Maintenance.php
+share/horde/lib/Menu.php
+share/horde/lib/Notification.php
+share/horde/lib/Notification/status.php
+share/horde/lib/Perms.php
+share/horde/lib/Prefs.php
+share/horde/lib/Prefs/ldap.php
+share/horde/lib/Prefs/session.php
+share/horde/lib/Prefs/sql.php
+share/horde/lib/PrefsUI.php
+share/horde/lib/Registry.php
+share/horde/lib/SQL.php
+share/horde/lib/Secret.php
+share/horde/lib/Serialize.php
+share/horde/lib/SessionCache.php
+share/horde/lib/SessionHandler.php
+share/horde/lib/SessionHandler/dbm.php
+share/horde/lib/SessionHandler/sapdb.php
+share/horde/lib/SessionHandler/sql.php
+share/horde/lib/SessionHandler/pgsql.php
+share/horde/lib/SessionHandler/mysql.php
+share/horde/lib/Text.php
+share/horde/lib/Token.php
+share/horde/lib/Token/file.php
+share/horde/lib/Token/sql.php
+share/horde/lib/VFS.php
+share/horde/lib/VFS/sql.php
+share/horde/lib/VFS/Object.php
+share/horde/lib/VFS/file.php
+share/horde/lib/VFS/ListItem.php
+share/horde/lib/VFS/musql.php
+share/horde/lib/VFS/ftp.php
+share/horde/lib/VFS/sql_file.php
+share/horde/lib/base.php
+share/horde/lib/version.php
+share/horde/locale/bg_BG/LC_MESSAGES/horde.mo
+share/horde/locale/cs_CZ/LC_MESSAGES/horde.mo
+share/horde/locale/da_DK/LC_MESSAGES/horde.mo
+share/horde/locale/de_DE/LC_MESSAGES/horde.mo
+share/horde/locale/el_GR/LC_MESSAGES/horde.mo
+share/horde/locale/en_US/help.xml
+share/horde/locale/es_ES/LC_MESSAGES/horde.mo
+share/horde/locale/et_EE/LC_MESSAGES/horde.mo
+share/horde/locale/fi_FI/LC_MESSAGES/horde.mo
+share/horde/locale/fi_FI/help.xml
+share/horde/locale/fr_FR/LC_MESSAGES/horde.mo
+share/horde/locale/hu_HU/LC_MESSAGES/horde.mo
+share/horde/locale/it_IT/LC_MESSAGES/horde.mo
+share/horde/locale/ja_JP/LC_MESSAGES/horde.mo
+share/horde/locale/ko_KR/LC_MESSAGES/horde.mo
+share/horde/locale/lt_LT/LC_MESSAGES/horde.mo
+share/horde/locale/lv_LV/LC_MESSAGES/horde.mo
+share/horde/locale/nb_NO/LC_MESSAGES/horde.mo
+share/horde/locale/nl_NL/LC_MESSAGES/horde.mo
+share/horde/locale/nn_NO/LC_MESSAGES/horde.mo
+share/horde/locale/pl_PL/LC_MESSAGES/horde.mo
+share/horde/locale/pt_BR/LC_MESSAGES/horde.mo
+share/horde/locale/pt_PT/LC_MESSAGES/horde.mo
+share/horde/locale/ro_RO/LC_MESSAGES/horde.mo
+share/horde/locale/ru_RU.KOI8-R/LC_MESSAGES/horde.mo
+share/horde/locale/ru_RU/LC_MESSAGES/horde.mo
+share/horde/locale/sk_SK/LC_MESSAGES/horde.mo
+share/horde/locale/sl_SI/LC_MESSAGES/horde.mo
+share/horde/locale/sv_SE/LC_MESSAGES/horde.mo
+share/horde/locale/uk_UA/LC_MESSAGES/horde.mo
+share/horde/locale/zh_CN/LC_MESSAGES/horde.mo
+share/horde/locale/zh_TW/LC_MESSAGES/horde.mo
 share/horde/login.php
 share/horde/maintenance.php
 share/horde/menu.php
+share/horde/po/Makefile
+share/horde/po/README
+share/horde/po/bg_BG.po
+share/horde/po/cs_CZ.po
+share/horde/po/da_DK.po
+share/horde/po/de_DE.po
+share/horde/po/el_GR.po
+share/horde/po/es_ES.po
+share/horde/po/et_EE.po
+share/horde/po/extract.pl
+share/horde/po/fi_FI.po
+share/horde/po/fr_FR.po
+share/horde/po/horde.pot
+share/horde/po/hu_HU.po
+share/horde/po/it_IT.po
+share/horde/po/ja_JP.po
+share/horde/po/ko_KR.po
+share/horde/po/lt_LT.po
+share/horde/po/lv_LV.po
+share/horde/po/nb_NO.po
+share/horde/po/nl_NL.po
+share/horde/po/nn_NO.po
+share/horde/po/pl_PL.po
+share/horde/po/pt_BR.po
+share/horde/po/pt_PT.po
+share/horde/po/ro_RO.po
+share/horde/po/ru_RU.KOI8-R.po
+share/horde/po/ru_RU.po
+share/horde/po/shtool
+share/horde/po/sk_SK.po
+share/horde/po/sl_SI.po
+share/horde/po/sv_SE.po
+share/horde/po/translation.php
+share/horde/po/uk_UA.po
+share/horde/po/wintokoi.pl
+share/horde/po/xgettext.sh
+share/horde/po/zh_CN.po
+share/horde/po/zh_TW.po
+share/horde/prefs.php
 share/horde/problem.php
+share/horde/scripts/SCRIPTS
+share/horde/scripts/db/README
+share/horde/scripts/db/auth.sql
+share/horde/scripts/db/category.sql
+share/horde/scripts/db/category_mysql.sql
+share/horde/scripts/db/mysql_create.sql
+share/horde/scripts/db/mysql_drop.sql
+share/horde/scripts/db/pgsql_create.sql
+share/horde/scripts/db/pgsql_drop.sql
+share/horde/scripts/db/prefs.sql
+share/horde/scripts/db/sessionhandler_sapdb.sql
+share/horde/scripts/db/sessionhandler.sql
+share/horde/scripts/horde-rsync.sh
+share/horde/scripts/ldap/horde.schema
+share/horde/scripts/mime_mapping/Makefile
+share/horde/scripts/mime_mapping/convert.pl
+share/horde/scripts/mime_mapping/mime.types
+share/horde/scripts/set_perms.sh
 share/horde/status.php
+share/horde/templates/categorytree/rowend.inc
+share/horde/templates/categorytree/rowstart.inc
+share/horde/templates/categorytree/tablefoot.inc
+share/horde/templates/categorytree/tablehead.inc
+share/horde/templates/common-footer.inc
+share/horde/templates/common-header.inc
+share/horde/templates/data/csvmap.inc
+share/horde/templates/data/datemap.inc
+share/horde/templates/help/footer.inc
+share/horde/templates/help/header.inc
+share/horde/templates/help/index.inc
+share/horde/templates/help/menu.inc
+share/horde/templates/horde/modules.inc
+share/horde/templates/index/css.inc
+share/horde/templates/index/floating_index.inc
+share/horde/templates/index/frames_index.inc
+share/horde/templates/index/notconfigured.inc
+share/horde/templates/index/wap.inc
+share/horde/templates/javascript/open_help_win.js
+share/horde/templates/login/login.inc
+share/horde/templates/login/user.inc
+share/horde/templates/maintenance/confirm_bottom.inc
+share/horde/templates/maintenance/confirm_middle.inc
+share/horde/templates/maintenance/confirm_top.inc
+share/horde/templates/maintenance/javascript.inc
+share/horde/templates/prefs/begin.inc
+share/horde/templates/prefs/checkbox.inc
+share/horde/templates/prefs/end.inc
+share/horde/templates/prefs/enum.inc
+share/horde/templates/prefs/link.inc
+share/horde/templates/prefs/number.inc
+share/horde/templates/prefs/overview.inc
+share/horde/templates/prefs/select.inc
+share/horde/templates/prefs/text.inc
+share/horde/templates/prefs/textarea.inc
+share/horde/templates/problem/javascript.inc
+share/horde/templates/problem/problem.inc
+share/horde/templates/wml/common-footer.inc
+share/horde/templates/wml/common-header.inc
+share/horde/templates/wml/doctype.inc
+share/horde/templates/wml/login/login.inc
+share/horde/templates/wml/login/user.inc
 share/horde/test.php
+share/horde/util/css2horde.php
+share/horde/util/special_characters.php
+share/doc/horde/COPYING
+share/doc/horde/README
+share/doc/horde/CHANGES
+share/doc/horde/CODING_STANDARDS
+share/doc/horde/CONTRIBUTING
+share/doc/horde/CREDITS
+share/doc/horde/HACKING
+share/doc/horde/INSTALL
+share/doc/horde/TRANSLATIONS
+share/examples/horde/horde.conf
 
-@dirrm share/doc/horde
-@dirrm share/examples/horde
-@dirrm share/horde/locale/it_IT/LC_MESSAGES
-@dirrm share/horde/locale/it_IT
-@dirrm share/horde/locale/zh_TW/LC_MESSAGES
-@dirrm share/horde/locale/zh_TW
-@dirrm share/horde/locale/de_DE/LC_MESSAGES
-@dirrm share/horde/locale/de_DE
-@dirrm share/horde/locale/el_GR/LC_MESSAGES
-@dirrm share/horde/locale/el_GR
-@dirrm share/horde/locale/en_US
-@dirrm share/horde/locale/es_ES/LC_MESSAGES
-@dirrm share/horde/locale/es_ES
-@dirrm share/horde/locale/fi_FI/LC_MESSAGES
-@dirrm share/horde/locale/fi_FI
-@dirrm share/horde/locale/fr_FR/LC_MESSAGES
-@dirrm share/horde/locale/fr_FR
-@dirrm share/horde/locale/zh_CN/LC_MESSAGES
-@dirrm share/horde/locale/zh_CN
-@dirrm share/horde/locale/cs_CZ/LC_MESSAGES
-@dirrm share/horde/locale/cs_CZ
-@dirrm share/horde/locale/nl_NL/LC_MESSAGES
-@dirrm share/horde/locale/nl_NL
-@dirrm share/horde/locale/no_BOK/LC_MESSAGES
-@dirrm share/horde/locale/no_BOK
-@dirrm share/horde/locale/pl_PL/LC_MESSAGES
-@dirrm share/horde/locale/pl_PL
-@dirrm share/horde/locale/pt_BR/LC_MESSAGES
-@dirrm share/horde/locale/pt_BR
-@dirrm share/horde/locale/ru_koi/LC_MESSAGES
-@dirrm share/horde/locale/ru_koi
-@dirrm share/horde/locale/ru_win/LC_MESSAGES
-@dirrm share/horde/locale/ru_win
-@dirrm share/horde/locale/sv_SE/LC_MESSAGES
-@dirrm share/horde/locale/sv_SE
-@dirrm share/horde/locale/ko_KR/LC_MESSAGES
-@dirrm share/horde/locale/ko_KR
-@dirrm share/horde/locale
-@dirrm share/horde/templates/help
+@dirrm share/horde/util
 @dirrm share/horde/templates/wml/login
 @dirrm share/horde/templates/wml
 @dirrm share/horde/templates/problem
 @dirrm share/horde/templates/prefs
-@dirrm share/horde/templates/data
 @dirrm share/horde/templates/maintenance
-@dirrm share/horde/templates/horde
-@dirrm share/horde/templates/admin/user
-@dirrm share/horde/templates/admin
-@dirrm share/horde/templates/javascript
 @dirrm share/horde/templates/login
+@dirrm share/horde/templates/javascript
 @dirrm share/horde/templates/index
+@dirrm share/horde/templates/horde
+@dirrm share/horde/templates/help
+@dirrm share/horde/templates/data
+@dirrm share/horde/templates/categorytree
 @dirrm share/horde/templates
+@dirrm share/horde/scripts/mime_mapping
+@dirrm share/horde/scripts/ldap
 @dirrm share/horde/scripts/db
 @dirrm share/horde/scripts
 @dirrm share/horde/po
-@dirrm share/horde/util
-@dirrm share/horde/lib/Cache
-@dirrm share/horde/lib/Auth
+@dirrm share/horde/locale/zh_TW/LC_MESSAGES
+@dirrm share/horde/locale/zh_TW
+@dirrm share/horde/locale/zh_CN/LC_MESSAGES
+@dirrm share/horde/locale/zh_CN
+@dirrm share/horde/locale/uk_UA/LC_MESSAGES
+@dirrm share/horde/locale/uk_UA
+@dirrm share/horde/locale/sv_SE/LC_MESSAGES
+@dirrm share/horde/locale/sv_SE
+@dirrm share/horde/locale/sl_SI/LC_MESSAGES
+@dirrm share/horde/locale/sl_SI
+@dirrm share/horde/locale/sk_SK/LC_MESSAGES
+@dirrm share/horde/locale/sk_SK
+@dirrm share/horde/locale/ru_RU/LC_MESSAGES
+@dirrm share/horde/locale/ru_RU.KOI8-R/LC_MESSAGES
+@dirrm share/horde/locale/ru_RU.KOI8-R
+@dirrm share/horde/locale/ru_RU
+@dirrm share/horde/locale/ro_RO/LC_MESSAGES
+@dirrm share/horde/locale/ro_RO
+@dirrm share/horde/locale/pt_PT/LC_MESSAGES
+@dirrm share/horde/locale/pt_PT
+@dirrm share/horde/locale/pt_BR/LC_MESSAGES
+@dirrm share/horde/locale/pt_BR
+@dirrm share/horde/locale/pl_PL/LC_MESSAGES
+@dirrm share/horde/locale/pl_PL
+@dirrm share/horde/locale/nn_NO/LC_MESSAGES
+@dirrm share/horde/locale/nn_NO
+@dirrm share/horde/locale/nl_NL/LC_MESSAGES
+@dirrm share/horde/locale/nl_NL
+@dirrm share/horde/locale/nb_NO/LC_MESSAGES
+@dirrm share/horde/locale/nb_NO
+@dirrm share/horde/locale/lv_LV/LC_MESSAGES
+@dirrm share/horde/locale/lv_LV
+@dirrm share/horde/locale/lt_LT/LC_MESSAGES
+@dirrm share/horde/locale/lt_LT
+@dirrm share/horde/locale/ko_KR/LC_MESSAGES
+@dirrm share/horde/locale/ko_KR
+@dirrm share/horde/locale/ja_JP/LC_MESSAGES
+@dirrm share/horde/locale/ja_JP
+@dirrm share/horde/locale/it_IT/LC_MESSAGES
+@dirrm share/horde/locale/it_IT
+@dirrm share/horde/locale/hu_HU/LC_MESSAGES
+@dirrm share/horde/locale/hu_HU
+@dirrm share/horde/locale/fr_FR/LC_MESSAGES
+@dirrm share/horde/locale/fr_FR
+@dirrm share/horde/locale/fi_FI/LC_MESSAGES
+@dirrm share/horde/locale/fi_FI
+@dirrm share/horde/locale/et_EE/LC_MESSAGES
+@dirrm share/horde/locale/et_EE
+@dirrm share/horde/locale/es_ES/LC_MESSAGES
+@dirrm share/horde/locale/es_ES
+@dirrm share/horde/locale/en_US
+@dirrm share/horde/locale/el_GR/LC_MESSAGES
+@dirrm share/horde/locale/el_GR
+@dirrm share/horde/locale/de_DE/LC_MESSAGES
+@dirrm share/horde/locale/de_DE
+@dirrm share/horde/locale/da_DK/LC_MESSAGES
+@dirrm share/horde/locale/da_DK
+@dirrm share/horde/locale/cs_CZ/LC_MESSAGES
+@dirrm share/horde/locale/cs_CZ
+@dirrm share/horde/locale/bg_BG/LC_MESSAGES
+@dirrm share/horde/locale/bg_BG
+@dirrm share/horde/locale
+@dirrm share/horde/lib/VFS
+@dirrm share/horde/lib/Token
+@dirrm share/horde/lib/SessionHandler
 @dirrm share/horde/lib/Prefs
-@dirrm share/horde/lib/Perms
+@dirrm share/horde/lib/Notification
+@dirrm share/horde/lib/MIME/Viewer
 @dirrm share/horde/lib/MIME
+@dirrm share/horde/lib/Cipher/BlockMode
+@dirrm share/horde/lib/Cipher
 @dirrm share/horde/lib/Category
-@dirrm share/horde/lib/Token
+@dirrm share/horde/lib/Cache
+@dirrm share/horde/lib/Auth
 @dirrm share/horde/lib
-@dirrm share/horde/graphics/alerts
+@dirrm share/horde/graphics/tree
 @dirrm share/horde/graphics/mime
+@dirrm share/horde/graphics/alerts
 @dirrm share/horde/graphics
-@dirrm share/horde/admin/css/graphics
-@dirrm share/horde/admin/css/templates/colorpicker
-@dirrm share/horde/admin/css/templates
-@dirrm share/horde/admin/css
-@dirrm share/horde/admin
 @dirrm share/horde/config
 @dirrm share/horde
+@dirrm share/doc/horde
+@dirrm share/examples/horde
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 4611ddb2578..ae3d4a1984e 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/02/01 22:41:16 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2003/03/17 17:58:13 bouyer Exp $
 
-SHA1 (horde-2.0.tar.gz) = 0309739abb7040f8b32121b412a4c1116255124d
-Size (horde-2.0.tar.gz) = 336638 bytes
-SHA1 (patch-aa) = a3808c405b7fd2edc12249f929194a0e9c359f84
+SHA1 (horde-2.2.1.tar.gz) = adcfe2c546898a89f8f44a6e512d7cd58db6a560
+Size (horde-2.2.1.tar.gz) = 537836 bytes
+SHA1 (patch-aa) = d61d8c69c3f1cc2bf596a8609b7e0f034179b85c
diff --git a/www/horde/patches/patch-aa b/www/horde/patches/patch-aa
index a26e7d11c29..4b98c77b107 100644
--- a/www/horde/patches/patch-aa
+++ b/www/horde/patches/patch-aa
@@ -1,67 +1,54 @@
-$NetBSD: patch-aa,v 1.2 2002/02/01 22:41:17 bouyer Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/17 17:58:14 bouyer Exp $
 
---- config/horde.php.dist.orig	Wed Jan 30 01:15:31 2002
-+++ config/horde.php.dist	Wed Jan 30 11:01:55 2002
-@@ -84,11 +84,11 @@
- /* Which users should be treated as administrators (root, super-user)
-  * by Horde? Example: $conf['auth']['admins'] = array('admin', 'john');
-  */
--$conf['auth']['admins'] = array();
-+$conf['auth']['admins'] = array('root');
+--- config/horde.php.dist.orig	Thu Jan 23 09:46:48 2003
++++ config/horde.php.dist	Mon Mar 17 17:30:44 2003
+@@ -86,14 +86,14 @@
  
  // What backend should we use for authenticating users to Horde? Valid
- // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
+ // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp' and 'krb5'.
 -$conf['auth']['driver'] = '';
 +$conf['auth']['driver'] = 'imap';
  
- /* An array holding any parameters that the Auth object will need to
-  * function correctly. For IMAP, this is the server name, port,
-@@ -98,8 +98,8 @@
-  * authentication driver. A SQL script can be found in 
-  * horde/scripts/db/auth.sql .
-  */
--$conf['auth']['params'] = array();
--//$conf['auth']['params']['dsn'] = '{imap.example.com/imap:143}INBOX';
-+//$conf['auth']['params'] = array();
-+$conf['auth']['params']['dsn'] = '{localhost/imap:143}INBOX';
+ // An array holding any parameters that the Auth object will need to
+ // function correctly.
+ $conf['auth']['params'] = array();
  
+ // For IMAP, this is the server name, port, protocol, etc.
+-// $conf['auth']['params']['dsn'] = '{imap.example.com:143/imap}INBOX';
++$conf['auth']['params']['dsn'] = '{localhost:143/imap}INBOX';
  
- /**
-@@ -112,7 +112,7 @@
- /* What log driver should we use? Valid values are 'file', 'mcal',
-  * 'sql', and 'syslog'.
-  */
+ // See $conf['prefs']['params'] further down for an example how to
+ // setup a SQL backend. But you must use the horde_users SQL table for
+@@ -113,14 +113,14 @@
+ 
+ // What log driver should we use? Valid values are 'file', 'mcal',
+ // 'sql', and 'syslog'.
 -$conf['log']['type'] = 'file';
 +$conf['log']['type'] = 'syslog';
  
- /* What is the name of the log? For the 'file' driver, this is the
-  * path to a text file; for mcal, it would be the name of a calendar,
-@@ -120,7 +120,7 @@
-  * driver it is the facility as a _constant_ (with no quotes), e.g.:
-  * ... = LOG_LOCAL0;
-  */
+ // What is the name of the log? For the 'file' driver, this is the
+ // path to a text file; for mcal, it would be the name of a calendar,
+ // and for sql it would be the table name to use. For the 'syslog'
+ // driver it is the facility as a _constant_ (with no quotes), e.g.:
+ // ... = LOG_LOCAL0;
 -$conf['log']['name'] = '/tmp/horde.log';
 +$conf['log']['name'] = 'LOG_MAIL';
  
- /* What level of messages should we log? The values are LOG_EMERG,
-  * LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
-@@ -148,23 +148,23 @@
-  * 'session' (preferences only persist during the login), 'ldap', 
-  * and 'sql'.
-  */
+ // What level of messages should we log? The values are LOG_EMERG,
+ // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
+@@ -145,7 +145,7 @@
+ // (meaning use system defaults and don't save any user preferences),
+ // 'session' (preferences only persist during the login), 'ldap',
+ // and 'sql'.
 -$conf['prefs']['driver'] = 'none';
 +$conf['prefs']['driver'] = 'sql';
  
- /* Any parameters that the preferences driver needs. This includes
-  * database or ldap server, username/password to connect with, etc.
-  */
--$conf['prefs']['params'] = array();
-+//$conf['prefs']['params'] = array();
- 
- /* This is an example configuration for a MySQL preference backend. 
-  * Be sure to set the prefs driver to 'sql' above if you use this
-  * configuration. 
-  */
+ // Any parameters that the preferences driver needs. This includes
+ // database or ldap server, username/password to connect with, etc.
+@@ -154,12 +154,12 @@
+ // This is an example configuration for a MySQL preference backend.
+ // The SQL script to setup the preference database is placed in
+ // horde/scripts/db/prefs.sql.
 -// $conf['prefs']['params']['phptype'] = 'mysql';
 -// $conf['prefs']['params']['hostspec'] = 'localhost';
 -// $conf['prefs']['params']['username'] = 'horde';
@@ -75,49 +62,28 @@ $NetBSD: patch-aa,v 1.2 2002/02/01 22:41:17 bouyer Exp $
 +$conf['prefs']['params']['database'] = 'horde';
 +$conf['prefs']['params']['table'] = 'horde_prefs';
  
- 
- /**
-@@ -176,13 +176,17 @@
-  * only live for the duration of a single request - they are NOT
-  * stored in the user's session.
-  */
--$conf['category']['driver'] = 'none';
-+$conf['category']['driver'] = 'sql';
- 
- /* An array holding any parameters that the Category object will need
-  * to function correctly.
-  */
--$conf['category']['params'] = array();
--
-+$conf['category']['params']['phptype'] = 'mysql';
-+$conf['category']['params']['hostspec'] = 'localhost';
-+$conf['category']['params']['username'] = 'hordemgr';
-+$conf['category']['params']['password'] = 'hordemgr';
-+$conf['category']['params']['database'] = 'horde';
-+$conf['category']['params']['table'] = 'horde_categories';
- 
- /**
-  ** Cache System Settings
-@@ -215,8 +219,8 @@
-  * function correctly. For sendmail, this is mainly the sendmail_path
-  * option; SMTP requires at least a server and a port (if nonstandard).
-  */
+ // This is an example configuration for an LDAP preference backend.
+ // The schemas needed for ldap are in horde/scripts/ldap.  For more
+@@ -208,8 +208,8 @@
+ // option; SMTP requires at least a server and a port (if nonstandard).
+ // SMTP authentication can be enabled by setting the 'auth' parameter
+ // to true.
 -$conf['mailer']['params'] = array();
 -// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
 +//$conf['mailer']['params'] = array();
 +$conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
- // $conf['mailer']['params'] = array('server' => 'smtp.example.com');
+ // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
  
- /**
-@@ -226,10 +230,10 @@
- /* Should we display a problem reporting link in Horde application
-  * menus?
-  */
+ 
+@@ -282,10 +282,10 @@
+ 
+ // Should we display a problem reporting link in Horde application
+ // menus?
 -$conf['problems']['enabled'] = false;
 +$conf['problems']['enabled'] = true;
  
- /* If so, where should problem report emails be sent? */
--$conf['problems']['email'] = 'postmaster@example.com';
+ // If so, where should problem report emails be sent?
+-$conf['problems']['email'] = 'webmaster@example.com';
 +$conf['problems']['email'] = 'postmaster';