Update to horde 2.0, as 1.2.7 doesn't work with the new php.

"has been released. The 2.0 release is a massive upgrade of the Horde Application Framework. Many components have been added or streamlined. Inter-application support is much more robust, a generic MIME_Viewer framework is included, a new preferences system supports global or application scope for preferences, and more!"

12 files changed, 483 insertions, 557 deletions

diff --git a/www/horde/MESSAGE b/www/horde/MESSAGE
index dd53804cdd2..b6614e4780f 100644
--- a/www/horde/MESSAGE
+++ b/www/horde/MESSAGE
@@ -1,26 +1,25 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/26 07:34:07 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2002/02/01 22:41:15 bouyer Exp $
 
 Please refer to the file:
 
-	${PHPLIBDIR}/README
+	${PREFIX}/share/doc/horde/INSTALL
 
 to setup Horde to access it's database properly.  The short summary is to
 edit:
 
-	${PHPLIBDIR}/local.inc
-	${PHPLIBDIR}/prepend.php3
+	${HORDEDIR}/config/horde.php
 
 to specify the correct backend database, and run the appropriate scripts
 in:
 
-	${HORDEDIR}/scripts/databases
+	${HORDEDIR}/scripts/db
 
 to setup the horde database.  Horde is setup by default to access MySQL.
 It's recommended that you change the password of the 'hordemgr' user used
 to connect to the horde database.  For localhost security, the file
 
-	${PHPLIBDIR}/local.inc
+	${HORDEDIR}/config/horde.php
 
 should be accessible only to the webserver process as it contains the
 horde database password.
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 2ccf6158699..7dc6ca4ce1c 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:46 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/02/01 22:41:15 bouyer Exp $
 
-DISTNAME=	horde-1.2.7
+DISTNAME=	horde-2.0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
@@ -8,84 +8,54 @@ MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.horde.org/
 COMMENT=	PHP application framework
 
-DEPENDS+=	php>3.0.17:../../www/php4
-DEPENDS+=	php-pcre>3.0.17:../../devel/php4-pcre
+DEPENDS+=	php>4.0.0:../../www/php4
+DEPENDS+=	php-pcre>4.0.0:../../devel/php4-pcre
 
 DOCDIR=		${PREFIX}/share/doc/horde
 EGDIR=		${PREFIX}/share/examples/horde
 HORDEDIR=	${PREFIX}/share/horde
-PHPLIBDIR=	${PREFIX}/share/horde/phplib
 
 MESSAGE_SUBST+=	HORDEDIR=${HORDEDIR}
-MESSAGE_SUBST+=	PHPLIBDIR=${PHPLIBDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR?=	httpd
 
 CONF_FILES=	${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
-CONF_FILES+=	${PHPLIBDIR}/local.inc.dist ${PHPLIBDIR}/local.inc
-CONF_FILES+=	${PHPLIBDIR}/prepend.php3.dist ${PHPLIBDIR}/prepend.php3
-CONF_FILES+=	${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3
-SUPPORT_FILES=	${HORDEDIR}/config/MOTD.html.dist ${HORDEDIR}/config/MOTD.html
-SUPPORT_FILES+=	${HORDEDIR}/config/header.txt.dist ${HORDEDIR}/config/header.txt
-SUPPORT_FILES+=	${HORDEDIR}/config/html.php3.dist ${HORDEDIR}/config/html.php3
-SUPPORT_FILES+=	${HORDEDIR}/config/lang.php3.dist ${HORDEDIR}/config/lang.php3
-SUPPORT_FILES+=	${HORDEDIR}/config/menu.txt.dist ${HORDEDIR}/config/menu.txt
-SUPPORT_FILES+=	${HORDEDIR}/config/mime.php3.dist ${HORDEDIR}/config/mime.php3
-
-post-extract:
-	cd ${WRKSRC}/phplib;						\
-	for file in local.inc prepend.php3; do				\
-		${MV} $${file} $${file}.dist;				\
-	done
-	cd ${WRKSRC}/config;						\
-	for file in							\
-		MOTD.html header.txt html.php3 lang.php3 menu.txt	\
-		mime.php3;						\
-	do								\
-		${MV} $${file} $${file}.dist;				\
-	done
+CONF_FILES+=	${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
+SUPPORT_FILES+=	${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
+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/registry.php.dist ${HORDEDIR}/config/registry.php
 
 post-patch:
 	cd ${WRKSRC}/scripts;						\
-	for file in add_horde_string.pl add_lang_string.pl; do		\
+	for file in mime_mapping/convert.pl; do		\
 		${MV} -f $${file} $${file}.orig;			\
 		${SED}	-e "s|/usr/bin/perl|${PERL5}|g"			\
 			$${file}.orig > $${file};			\
 	done
-	cd ${WRKSRC}/scripts/database;					\
-	for file in pgsql_cuser.sh; do					\
-		${MV} -f $${file} $${file}.orig;			\
-		${SED}	-e "s|/usr/bin/psql|${LOCALBASE}/bin/psql|g"	\
-			$${file}.orig > $${file};			\
-	done
 
 do-build:
 	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
-	${FIND} ${WRKSRC} -name "*.pl" -exec ${CHMOD} +x {} \;
-	${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \;
+	${FIND} ${WRKSRC} -name .htaccess -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC}/scripts -name "*.pl" -exec ${CHMOD} +x {} \;
+	${FIND} ${WRKSRC}/scripts -name "*.sh" -exec ${CHMOD} +x {} \;
 
 pre-install:
 	${SED}	-e "s|@HORDEDIR@|${HORDEDIR}|g"				\
-		-e "s|@PHPLIBDIR@|${PHPLIBDIR}|g"			\
 		${FILESDIR}/horde.conf.dist > ${WRKDIR}/horde.conf.dist
-	${SED}	-e "s|@HORDEDIR@|${HORDEDIR}|g"				\
-		${FILESDIR}/horde_setup.sh > ${WRKDIR}/horde_setup.sh
-	${SED}	-e "s|@HORDEDIR@|${HORDEDIR}|g"				\
-		${FILESDIR}/horde_secure.sh > ${WRKDIR}/horde_secure.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/horde_setup.sh ${PREFIX}/sbin/horde_setup
-	${INSTALL_SCRIPT} ${WRKDIR}/horde_secure.sh ${PREFIX}/sbin/horde_secure
-	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${HORDEDIR} ${PHPLIBDIR}
+	${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}/phplib; ${INSTALL_DATA} * ${PHPLIBDIR}
-	cd ${WRKSRC}; ${CP} -R graphics lib locale scripts templates ${HORDEDIR}
+	cd ${WRKSRC}; ${CP} -R admin graphics lib locale po scripts templates util ${HORDEDIR}
 	${INSTALL_DATA_DIR} ${HORDEDIR}/config
 	cd ${WRKSRC}/config; ${INSTALL_DATA} * ${HORDEDIR}/config
-	cd ${WRKSRC}; ${INSTALL_DATA} *.php3 ${HORDEDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} *.php ${HORDEDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HORDEDIR}
 	${CHMOD} -R a-w ${HORDEDIR}
 
diff --git a/www/horde/PLIST b/www/horde/PLIST
index b1fd8f5f4d2..2574fad05e8 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,334 +1,334 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/11 19:30:07 bouyer Exp $
-sbin/horde_setup
-sbin/horde_secure
-share/doc/horde/CHANGES
+@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/DATABASE
-share/doc/horde/HELP
+share/doc/horde/HACKING
 share/doc/horde/INSTALL
-share/doc/horde/README
-share/doc/horde/SECURITY
 share/examples/horde/horde.conf
-share/horde/config/MOTD.html.dist
-share/horde/config/header.txt.dist
-share/horde/config/horde.php3.dist
-share/horde/config/html.php3.dist
-share/horde/config/lang.php3.dist
-share/horde/config/menu.txt.dist
-share/horde/config/mime.php3.dist
-share/horde/graphics/bottom_left_corner.gif
-share/horde/graphics/bottom_right_corner.gif
-share/horde/graphics/close.gif
-share/horde/graphics/edit.gif
-share/horde/graphics/exclamation.gif
-share/horde/graphics/filler_block.gif
+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
+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/mime/binary.gif
+share/horde/graphics/mime/compressed.gif
+share/horde/graphics/mime/csv.gif
+share/horde/graphics/mime/deb.gif
+share/horde/graphics/mime/encryption.gif
+share/horde/graphics/mime/executable.gif
+share/horde/graphics/mime/html.gif
+share/horde/graphics/mime/image.gif
+share/horde/graphics/mime/inf.gif
+share/horde/graphics/mime/mail.gif
+share/horde/graphics/mime/makefile.gif
+share/horde/graphics/mime/msexcel.gif
+share/horde/graphics/mime/msi.gif
+share/horde/graphics/mime/msp.gif
+share/horde/graphics/mime/mspowerpoint.gif
+share/horde/graphics/mime/msword.gif
+share/horde/graphics/mime/pdf.gif
+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/setup.gif
+share/horde/graphics/mime/signed.gif
+share/horde/graphics/mime/source-c.gif
+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/help1.gif
-share/horde/graphics/horde.small.gif
+share/horde/graphics/home.gif
+share/horde/graphics/keyboard.gif
 share/horde/graphics/login.gif
 share/horde/graphics/logout.gif
-share/horde/graphics/search.gif
-share/horde/graphics/thumbsup.gif
-share/horde/graphics/top_left_corner.gif
-share/horde/graphics/top_right_corner.gif
-share/horde/graphics/trash.gif
-share/horde/help.php3
-share/horde/index.php3
-share/horde/lib/horde.lib
-share/horde/lib/js/browser_detect.js
-share/horde/lib/js/msie_generic_help.js
-share/horde/lib/js/ns_generic_help.js
-share/horde/lib/mime.lib
-share/horde/lib/version.php
-share/horde/locale/da/status.lang
-share/horde/locale/da/horde.lang
-share/horde/locale/da/login.lang
-share/horde/locale/da/logo.lang
-share/horde/locale/da/menu.lang
-share/horde/locale/da/modules.lang
-share/horde/locale/da/problem.lang
-share/horde/locale/da/setup.lang
-share/horde/locale/da/signup.help
-share/horde/locale/da/signup.lang
-share/horde/locale/da/help.lang
-share/horde/locale/de/help.lang
-share/horde/locale/de/horde.lang
-share/horde/locale/de/login.lang
-share/horde/locale/de/logo.lang
-share/horde/locale/de/menu.lang
-share/horde/locale/de/modules.lang
-share/horde/locale/de/problem.lang
-share/horde/locale/de/setup.lang
-share/horde/locale/de/signup.help
-share/horde/locale/de/signup.lang
-share/horde/locale/de/status.lang
-share/horde/locale/defines/signup.help
-share/horde/locale/en/help.lang
-share/horde/locale/en/horde.lang
-share/horde/locale/en/login.lang
-share/horde/locale/en/logo.lang
-share/horde/locale/en/menu.lang
-share/horde/locale/en/modules.lang
-share/horde/locale/en/problem.lang
-share/horde/locale/en/setup.lang
-share/horde/locale/en/signup.help
-share/horde/locale/en/signup.lang
-share/horde/locale/en/status.lang
-share/horde/locale/es/help.lang
-share/horde/locale/es/horde.lang
-share/horde/locale/es/login.lang
-share/horde/locale/es/logo.lang
-share/horde/locale/es/menu.lang
-share/horde/locale/es/modules.lang
-share/horde/locale/es/problem.lang
-share/horde/locale/es/setup.lang
-share/horde/locale/es/signup.help
-share/horde/locale/es/signup.lang
-share/horde/locale/es/status.lang
-share/horde/locale/fi/help.lang
-share/horde/locale/fi/horde.lang
-share/horde/locale/fi/login.lang
-share/horde/locale/fi/logo.lang
-share/horde/locale/fi/menu.lang
-share/horde/locale/fi/modules.lang
-share/horde/locale/fi/problem.lang
-share/horde/locale/fi/setup.lang
-share/horde/locale/fi/signup.help
-share/horde/locale/fi/signup.lang
-share/horde/locale/fi/status.lang
-share/horde/locale/fr/help.lang
-share/horde/locale/fr/horde.lang
-share/horde/locale/fr/login.lang
-share/horde/locale/fr/logo.lang
-share/horde/locale/fr/menu.lang
-share/horde/locale/fr/modules.lang
-share/horde/locale/fr/problem.lang
-share/horde/locale/fr/setup.lang
-share/horde/locale/fr/signup.help
-share/horde/locale/fr/signup.lang
-share/horde/locale/fr/status.lang
-share/horde/locale/it/help.lang
-share/horde/locale/it/horde.lang
-share/horde/locale/it/login.lang
-share/horde/locale/it/logo.lang
-share/horde/locale/it/menu.lang
-share/horde/locale/it/modules.lang
-share/horde/locale/it/problem.lang
-share/horde/locale/it/setup.lang
-share/horde/locale/it/signup.help
-share/horde/locale/it/signup.lang
-share/horde/locale/it/status.lang
-share/horde/locale/kr/help.lang
-share/horde/locale/kr/horde.lang
-share/horde/locale/kr/login.lang
-share/horde/locale/kr/logo.lang
-share/horde/locale/kr/menu.lang
-share/horde/locale/kr/modules.lang
-share/horde/locale/kr/problem.lang
-share/horde/locale/kr/setup.lang
-share/horde/locale/kr/signup.help
-share/horde/locale/kr/signup.lang
-share/horde/locale/kr/status.lang
-share/horde/locale/local/help.lang
-share/horde/locale/local/horde.lang
-share/horde/locale/local/lang.lang
-share/horde/locale/local/login.lang
-share/horde/locale/local/logo.lang
-share/horde/locale/local/menu.lang
-share/horde/locale/local/modules.lang
-share/horde/locale/local/problem.lang
-share/horde/locale/local/setup.lang
-share/horde/locale/local/signup.help
-share/horde/locale/local/signup.lang
-share/horde/locale/local/status.lang
-share/horde/locale/lt/help.lang
-share/horde/locale/lt/horde.lang
-share/horde/locale/lt/login.lang
-share/horde/locale/lt/logo.lang
-share/horde/locale/lt/menu.lang
-share/horde/locale/lt/modules.lang
-share/horde/locale/lt/problem.lang
-share/horde/locale/lt/setup.lang
-share/horde/locale/lt/signup.help
-share/horde/locale/lt/signup.lang
-share/horde/locale/lt/status.lang
-share/horde/locale/nl/help.lang
-share/horde/locale/nl/horde.lang
-share/horde/locale/nl/login.lang
-share/horde/locale/nl/logo.lang
-share/horde/locale/nl/menu.lang
-share/horde/locale/nl/modules.lang
-share/horde/locale/nl/problem.lang
-share/horde/locale/nl/setup.lang
-share/horde/locale/nl/signup.help
-share/horde/locale/nl/signup.lang
-share/horde/locale/nl/status.lang
-share/horde/locale/pt-BR/help.lang
-share/horde/locale/pt-BR/horde.lang
-share/horde/locale/pt-BR/login.lang
-share/horde/locale/pt-BR/logo.lang
-share/horde/locale/pt-BR/menu.lang
-share/horde/locale/pt-BR/modules.lang
-share/horde/locale/pt-BR/problem.lang
-share/horde/locale/pt-BR/setup.lang
-share/horde/locale/pt-BR/signup.help
-share/horde/locale/pt-BR/signup.lang
-share/horde/locale/pt-BR/status.lang
-share/horde/locale/se/status.lang
-share/horde/locale/se/horde.lang
-share/horde/locale/se/login.lang
-share/horde/locale/se/logo.lang
-share/horde/locale/se/menu.lang
-share/horde/locale/se/modules.lang
-share/horde/locale/se/problem.lang
-share/horde/locale/se/setup.lang
-share/horde/locale/se/signup.help
-share/horde/locale/se/signup.lang
-share/horde/locale/se/help.lang
-share/horde/locale/sk/help.lang
-share/horde/locale/sk/horde.lang
-share/horde/locale/sk/login.lang
-share/horde/locale/sk/logo.lang
-share/horde/locale/sk/menu.lang
-share/horde/locale/sk/modules.lang
-share/horde/locale/sk/problem.lang
-share/horde/locale/sk/setup.lang
-share/horde/locale/sk/signup.help
-share/horde/locale/sk/signup.lang
-share/horde/locale/sk/status.lang
-share/horde/login.php3
-share/horde/logo.php3
-share/horde/menu.php3
-share/horde/modules.php3
-share/horde/phplib/README
-share/horde/phplib/ct_dba.inc
-share/horde/phplib/ct_dbm.inc
-share/horde/phplib/ct_file.inc
-share/horde/phplib/ct_informix.inc
-share/horde/phplib/ct_ldap.inc
-share/horde/phplib/ct_null.inc
-share/horde/phplib/ct_shm.inc
-share/horde/phplib/ct_split_sql.inc
-share/horde/phplib/ct_sql.inc
-share/horde/phplib/ct_sql_compat.inc
-share/horde/phplib/db_msql.inc
-share/horde/phplib/db_mssql.inc
-share/horde/phplib/db_mysql.inc
-share/horde/phplib/db_oci8.inc
-share/horde/phplib/db_odbc.inc
-share/horde/phplib/db_oracle.inc
-share/horde/phplib/db_pgsql.inc
-share/horde/phplib/db_sybase.inc
-share/horde/phplib/db_usql.inc
-share/horde/phplib/horde_loginform.ihtml
-share/horde/phplib/horde_perminvalid.ihtml
-share/horde/phplib/local.inc.dist
-share/horde/phplib/page.inc
-share/horde/phplib/prepend.php3.dist
-share/horde/phplib/session.inc
-share/horde/problem.php3
-share/horde/scripts/add_horde_string.pl
-share/horde/scripts/add_lang_string.pl
-share/horde/scripts/database/INFORMIX
-share/horde/scripts/database/MYSQL
-share/horde/scripts/database/ORACLE
-share/horde/scripts/database/POSTGRESQL
-share/horde/scripts/database/SYBASE
-share/horde/scripts/database/dbpasswd.sh
-share/horde/scripts/database/ifmx_create.sql
-share/horde/scripts/database/mysql_alter.sql
-share/horde/scripts/database/mysql_create.sql
-share/horde/scripts/database/mysql_drop.sql
-share/horde/scripts/database/oracle_create.sql
-share/horde/scripts/database/pgsql_create.sql
-share/horde/scripts/database/pgsql_cuser.sh
-share/horde/scripts/database/sybase_create.sql
-share/horde/scripts/horde-rsync.sh
-share/horde/setup.php3
-share/horde/signup.php3
-share/horde/status.php3
-share/horde/templates/doctype.inc
-share/horde/templates/form/form_hidden_elem.inc
-share/horde/templates/form/form_multiselect_elem.inc
-share/horde/templates/form/form_password_elem.inc
-share/horde/templates/form/form_section_title.inc
-share/horde/templates/form/form_text_elem.inc
-share/horde/templates/form/form_true_false_elem.inc
-share/horde/templates/generic-footer.inc
-share/horde/templates/generic-header.inc
-share/horde/templates/help/body.inc
-share/horde/templates/index/frames_index.inc
-share/horde/templates/index/horde_configurable.inc
-share/horde/templates/index/horde_notconfigured.inc
-share/horde/templates/index/imp_frames.inc
-share/horde/templates/index/sub_frames_index.inc
-share/horde/templates/index/unknown_browser.inc
-share/horde/templates/login/login.inc
-share/horde/templates/logo/horde_logo.inc
-share/horde/templates/logo/logo.inc
-share/horde/templates/menu/menu.inc
-share/horde/templates/modules/modules.inc
-share/horde/templates/problem/javascript.inc
-share/horde/templates/problem/lynx_problem.inc
-share/horde/templates/problem/problem.inc
-share/horde/templates/setup/form_elem_desc.inc
-share/horde/templates/setup/form_footer.inc
-share/horde/templates/setup/form_header.inc
-share/horde/templates/setup/form_hidden_elem.inc
-share/horde/templates/setup/form_multiselect_elem.inc
-share/horde/templates/setup/form_text_elem.inc
-share/horde/templates/setup/form_true_false_elem.inc
-share/horde/templates/setup/imp/database.inc
-share/horde/templates/setup/imp/external_binaries.inc
-share/horde/templates/setup/imp/language.inc
-share/horde/templates/setup/imp/mail_server.inc
-share/horde/templates/setup/imp/message_options.inc
-share/horde/templates/setup/imp/new_mail_popup.inc
-share/horde/templates/setup/imp/server_specific.inc
-share/horde/templates/setup/imp/user_abilites.inc
-share/horde/templates/setup/imp/verify_write_file.inc
-share/horde/templates/setup/imp/web_server.inc
-share/horde/templates/setup/imp/write_file.inc
-share/horde/templates/setup/session.lib
-share/horde/templates/setup/stub_form.inc
-share/horde/templates/signup/lynx_signup.inc
-share/horde/templates/signup/signup.inc
-share/horde/templates/status/status.inc
-share/horde/test.php3
-@dirrm share/horde/templates/status
-@dirrm share/horde/templates/signup
-@dirrm share/horde/templates/setup/imp
-@dirrm share/horde/templates/setup
+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/help.php
+share/horde/index.php
+share/horde/javascript.php
+share/horde/login.php
+share/horde/maintenance.php
+share/horde/menu.php
+share/horde/problem.php
+share/horde/status.php
+share/horde/test.php
+
+@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/templates/wml/login
+@dirrm share/horde/templates/wml
 @dirrm share/horde/templates/problem
-@dirrm share/horde/templates/modules
-@dirrm share/horde/templates/menu
-@dirrm share/horde/templates/logo
+@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/index
-@dirrm share/horde/templates/help
-@dirrm share/horde/templates/form
 @dirrm share/horde/templates
-@dirrm share/horde/scripts/database
+@dirrm share/horde/scripts/db
 @dirrm share/horde/scripts
-@dirrm share/horde/locale/sk
-@dirrm share/horde/locale/se
-@dirrm share/horde/locale/pt-BR
-@dirrm share/horde/locale/nl
-@dirrm share/horde/locale/local
-@dirrm share/horde/locale/lt
-@dirrm share/horde/locale/kr
-@dirrm share/horde/locale/it
-@dirrm share/horde/locale/fr
-@dirrm share/horde/locale/fi
-@dirrm share/horde/locale/es
-@dirrm share/horde/locale/en
-@dirrm share/horde/locale/defines
-@dirrm share/horde/locale/de
-@dirrm share/horde/locale/da
-@dirrm share/horde/locale
-@dirrm share/horde/lib/js
+@dirrm share/horde/po
+@dirrm share/horde/util
+@dirrm share/horde/lib/Cache
+@dirrm share/horde/lib/Auth
+@dirrm share/horde/lib/Prefs
+@dirrm share/horde/lib/Perms
+@dirrm share/horde/lib/MIME
+@dirrm share/horde/lib/Category
+@dirrm share/horde/lib/Token
 @dirrm share/horde/lib
+@dirrm share/horde/graphics/alerts
+@dirrm share/horde/graphics/mime
 @dirrm share/horde/graphics
-@dirrm share/examples/horde
-@dirrm share/doc/horde
+@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
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 6f12264660b..4611ddb2578 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2001/11/11 19:30:08 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2002/02/01 22:41:16 bouyer Exp $
 
-SHA1 (horde-1.2.7.tar.gz) = dec75eec52c9a07de766bcdde4b2997f81bed6c0
-Size (horde-1.2.7.tar.gz) = 143844 bytes
-SHA1 (patch-aa) = 31c6653a6c0d237684caa441f5d95b69dee16976
-SHA1 (patch-ab) = 2beb9e66918e113ed1c3112e74cf42ff06975614
-SHA1 (patch-ac) = e8c2702cae1698f2274ecf8ebd676eb25e451c66
-SHA1 (patch-ad) = 76cdb0970d66c7b97f83b5dc4033eb44705e251a
-SHA1 (patch-ae) = c0e0befce11c535d6f655e3c8bc7a6c0487c1d78
+SHA1 (horde-2.0.tar.gz) = 0309739abb7040f8b32121b412a4c1116255124d
+Size (horde-2.0.tar.gz) = 336638 bytes
+SHA1 (patch-aa) = a3808c405b7fd2edc12249f929194a0e9c359f84
diff --git a/www/horde/files/horde.conf.dist b/www/horde/files/horde.conf.dist
index b1e98690e99..8b35d5e2d78 100644
--- a/www/horde/files/horde.conf.dist
+++ b/www/horde/files/horde.conf.dist
@@ -1,4 +1,4 @@
-# $NetBSD: horde.conf.dist,v 1.2 2001/02/13 03:54:00 jlam Exp $
+# $NetBSD: horde.conf.dist,v 1.3 2002/02/01 22:41:16 bouyer Exp $
 #
 # Horde configuration file fragment for Apache
 
@@ -11,15 +11,7 @@
     AllowOverride None
     Order allow,deny
     Allow from all
-    <IfModule mod_php3.c>
-	php3_include_path '@PHPLIBDIR@:.'
-	php3_auto_prepend_file @PHPLIBDIR@/prepend.php3
-	php3_magic_quotes_gpc Off
-	php3_track_vars On
-    </IfModule>
     <IfModule mod_php4.c>
-	php_value include_path '@PHPLIBDIR@:.'
-	php_value auto_prepend_file @PHPLIBDIR@/prepend.php3
 	php_flag magic_quotes_gpc Off
 	php_flag track_vars On
     </IfModule>
@@ -32,6 +24,10 @@
     Order deny,allow
     Deny from all
 </Directory>
+<Directory "@HORDEDIR@/docs">
+    Order deny,allow
+    Deny from all
+</Directory>
 <Directory "@HORDEDIR@/lib">
     Order deny,allow
     Deny from all
@@ -44,6 +40,10 @@
     Order deny,allow
     Deny from all
 </Directory>
+<Directory "@HORDEDIR@/po">
+    Order deny,allow
+    Deny from all
+</Directory>
 <Directory "@HORDEDIR@/scripts">
     Order deny,allow
     Deny from all
@@ -52,3 +52,7 @@
     Order deny,allow
     Deny from all
 </Directory>
+<Directory "@HORDEDIR@/util">
+    Order deny,allow
+    Deny from all
+</Directory>
diff --git a/www/horde/files/horde_secure.sh b/www/horde/files/horde_secure.sh
deleted file mode 100644
index f07b1f3bf5f..00000000000
--- a/www/horde/files/horde_secure.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: horde_secure.sh,v 1.1.1.1 2001/02/12 15:26:04 jlam Exp $
-
-HORDEDIR=@HORDEDIR@
-
-for file in config/horde.php3 imp/config/defaults.php3
-do
-	if [ ! -e ${HORDEDIR}/${file} ]
-	then
-		echo "${HORDEDIR}/${file} could not be found."
-		exit 1
-	fi
-	chmod 444 ${HORDEDIR}/${file}
-done
-
-for file in setup.php3 test.php3
-do
-	if [ ! -e ${HORDEDIR}/${file} ]
-	then
-		echo "${HORDEDIR}/${file} could not be found."
-		exit 1
-	fi
-	chmod 000 ${HORDEDIR}/${file}
-done
-
-cat << EOF
-
-The Horde/IMP configuration files have been set to read-only, and the
-setup and test pages have been set to no-access.
-
-EOF
-exit 0
diff --git a/www/horde/files/horde_setup.sh b/www/horde/files/horde_setup.sh
deleted file mode 100644
index fc093e9a0f7..00000000000
--- a/www/horde/files/horde_setup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: horde_setup.sh,v 1.1.1.1 2001/02/12 15:26:04 jlam Exp $
-
-HORDEDIR=@HORDEDIR@
-
-for file in config/horde.php3 imp/config/defaults.php3
-do
-	if [ ! -e ${HORDEDIR}/${file} ]
-	then
-		echo "${HORDEDIR}/${file} could not be found."
-		exit 1
-	fi
-	chmod a+rw ${HORDEDIR}/${file}
-done
-
-cat << EOF
-
-Horde/IMP may now by configured by pointing a web browser at:
-
-	http://localhost/horde/setup.php3
-
-Please run 'horde_secure' after configuration is complete to re-protect
-the Horde configuration files.
-
-EOF
-exit 0
diff --git a/www/horde/patches/patch-aa b/www/horde/patches/patch-aa
index ff753f5b4cc..a26e7d11c29 100644
--- a/www/horde/patches/patch-aa
+++ b/www/horde/patches/patch-aa
@@ -1,45 +1,124 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/02/01 22:41:17 bouyer Exp $
 
---- phplib/local.inc.dist.orig	Thu Sep 21 09:48:43 2000
-+++ phplib/local.inc.dist
-@@ -27,23 +27,23 @@
-  */
- 
- /* To use an SQL database, uncomment and edit the following: */
--#class HordeDB extends DB_Sql {
--#  var $Host = 'localhost';
--#  var $Database = 'horde';
--#  var $User = 'hordemgr';
--#  var $Password = 'hordemgr';
--#  var $Port = '';
--#
--#  function halt($msg) {
--#    // Printing here causes race condition trouble, so don't.
--#    //printf("<b>Database error (HordeDB):</b> %s<br>\n", $msg);
--#  }
--#}
--#
--#class HordeCT extends CT_Sql {
--#  var $database_class = 'HordeDB';         // Which database class to use...
--#  var $database_table = 'active_sessions'; // and find our data in this table.
--#}
-+class HordeDB extends DB_Sql {
-+  var $Host = 'localhost';
-+  var $Database = 'horde';
-+  var $User = 'hordemgr';
-+  var $Password = 'hordemgr';
-+  var $Port = '';
-+
-+  function halt($msg) {
-+    // Printing here causes race condition trouble, so don't.
-+    //printf("<b>Database error (HordeDB):</b> %s<br>\n", $msg);
-+  }
-+}
-+
-+class HordeCT extends CT_Sql {
-+  var $database_class = 'HordeDB';         // Which database class to use...
-+  var $database_table = 'active_sessions'; // and find our data in this table.
-+}
- 
- /* To use shared memory, uncomment and edit the following: */
- /* NOTE: If you do this, you must edit prepend.php3 to include ct_shm.inc
+--- 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');
+ 
+ // What backend should we use for authenticating users to Horde? Valid
+ // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
+-$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';
+ 
+ 
+ /**
+@@ -112,7 +112,7 @@
+ /* 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;
+  */
+-$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'.
+  */
+-$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. 
+  */
+-// $conf['prefs']['params']['phptype'] = 'mysql';
+-// $conf['prefs']['params']['hostspec'] = 'localhost';
+-// $conf['prefs']['params']['username'] = 'horde';
+-// $conf['prefs']['params']['password'] = '*****';
+-// $conf['prefs']['params']['database'] = 'horde';
+-// $conf['prefs']['params']['table'] = 'horde_prefs';
++$conf['prefs']['params']['phptype'] = 'mysql';
++$conf['prefs']['params']['hostspec'] = 'localhost';
++$conf['prefs']['params']['username'] = 'hordemgr';
++$conf['prefs']['params']['password'] = 'hordemgr';
++$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).
+  */
+-$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');
+ 
+ /**
+@@ -226,10 +230,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';
++$conf['problems']['email'] = 'postmaster';
+ 
+ 
+ /**
diff --git a/www/horde/patches/patch-ab b/www/horde/patches/patch-ab
deleted file mode 100644
index fa587f1221e..00000000000
--- a/www/horde/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- scripts/database/dbpasswd.sh.orig	Fri Sep 29 15:13:55 2000
-+++ scripts/database/dbpasswd.sh
-@@ -17,7 +17,7 @@
- # Determine OS and its techniques.
- #
- case "`uname -s`" in
--Linux|FreeBSD|OpenBSD)
-+Linux|FreeBSD|NetBSD|OpenBSD)
-     N="-n"; C=""
-     ;;
- *)
diff --git a/www/horde/patches/patch-ac b/www/horde/patches/patch-ac
deleted file mode 100644
index 7ffa8022ec7..00000000000
--- a/www/horde/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- setup.php3.orig	Wed Sep 20 12:18:50 2000
-+++ setup.php3
-@@ -634,7 +634,7 @@
-   */
-   $form_title = '';
-   include( './templates/setup/form_header.inc' );
--  echo '<p>Please go to the top level directory for your installation and run "sh ./install.sh"; this will enable the configuration manager.</p>';
-+  echo '<p>Please run "horde_setup"; this will enable the configuration manager.</p>';
-   
- } else if (
- 	   ! is_writeable( './config/horde.php3' )
-@@ -642,7 +642,7 @@
- 	   ) {
-   $form_title = '';
-   include './templates/setup/form_header.inc';
--  echo '<p>Please go to the top level directory for your installation and run "sh ./install.sh"; this will enable the configuration manager.</p>';
-+  echo '<p>Please run "horde_setup"; this will enable the configuration manager.</p>';
- } else {
- 
- 
diff --git a/www/horde/patches/patch-ad b/www/horde/patches/patch-ad
deleted file mode 100644
index 1e7039cb62f..00000000000
--- a/www/horde/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- templates/index/horde_notconfigured.inc.orig	Wed Oct 18 15:52:49 2000
-+++ templates/index/horde_notconfigured.inc
-@@ -11,8 +11,7 @@
- <p>You can also use the horde setup wizard. In order to use the setup wizard you will need to enable write privileges to your configuration files by running the following commands:
- <ul>
- <li>UN*X People: <br><br>
--<code>cd &lt;your horde root&gt;</code><br>
--<code>sh ./install.sh</code><br>
-+<code>horde_setup</code><br>
- Click here: <a href="setup.php3">setup.php3</a>
- <br><br>
- <li>win32: The best option at this time is to build the libs and defaults files on a unix machine, and transfer them over. If you're a win32 scripting wizard and want to provide win32 setup scripts, that'd be great! Let us know: <a href="mailto:dev@lists.horde.org">dev@lists.horde.org</a>.
diff --git a/www/horde/patches/patch-ae b/www/horde/patches/patch-ae
deleted file mode 100644
index 26b9346bcf3..00000000000
--- a/www/horde/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- templates/setup/imp/write_file.inc.orig	Wed Sep 13 13:08:39 2000
-+++ templates/setup/imp/write_file.inc
-@@ -26,7 +26,7 @@
-       <br> 
-          <ul>
-          <?php echo $lang->go_run_unix ?><br>
--         sh ./secure.sh
-+         horde_secure
-          </ul>
-       </td>
-    </tr>