- Update horde to 3.0.3

- Whitespace police
- PLIST sorting and fixing
- Fix postgresql support to now extend to 8.0 as noted in PR# 29590 by
   jaapb (at) kerguelen.org, thanks for the PR.

> Major changes compared to the Horde version 3.0.3-RC1 are:
>     * Added support for clearing user preferences to LDAP driver.
>     * Minor bug fixes and improvements.
>
> Major changes compared to the Horde version 3.0.2 are:
>     * Improved layout of wrapping menus in Gecko and KHTML based browsers.
>     * Fixed some session handler issues.
>     * Fixed caching in the Version Control library, used by Chora.
>     * Fixed updating of IMAP folder trees when (un)subscribing IMAP folders.
>     * Improved performance of DataTree library, used by IMP's message history.
>     * Changed log level of logins and logouts.
>     * Updated German and Japanese translations.
>     * Minor bug and layout fixes.
>

5 files changed, 48 insertions, 38 deletions

diff --git a/www/horde3/MESSAGE b/www/horde3/MESSAGE
index 7ef684c0a4b..df61449ad90 100644
--- a/www/horde3/MESSAGE
+++ b/www/horde3/MESSAGE
@@ -1,18 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/01/16 21:10:16 adrianp Exp $
+$NetBSD: MESSAGE,v 1.2 2005/03/04 22:35:22 adrianp Exp $
 
 Please refer to the file:
 
 	${PREFIX}/share/doc/horde/INSTALL
 
-to setup Horde to access its user preferences store properly.  The short 
+to setup Horde to access its user preferences store properly.  The short
 summary is to run the appropriate scripts in:
 
 	${HORDEDIR}/scripts/db
 
-to setup the horde preferences store.  Horde is setup by default to access 
-MySQL.  It's recommended that you change the password of the 'horde' user used 
-to connect to the horde database.  
+to setup the horde preferences store.  Horde is setup by default to access
+MySQL.  It's recommended that you change the password of the 'horde' user used
+to connect to the horde database.
 
 You will also need to make Horde accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following line
@@ -21,7 +21,7 @@ to httpd.conf:
 	Include ${PKG_SYSCONFDIR}/horde.conf
 
 to make Horde accessible through:
-	
+
 	http://www.domain.com/horde/
 
 ===========================================================================
diff --git a/www/horde3/Makefile b/www/horde3/Makefile
index fec2cffb4d5..b17f024a828 100644
--- a/www/horde3/Makefile
+++ b/www/horde3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/16 21:10:17 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/04 22:35:22 adrianp Exp $
 
-DISTNAME=	horde-3.0.2
+DISTNAME=	horde-3.0.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
@@ -91,12 +91,12 @@ do-install:
 .	for d in ${PAXDIRS}
 		${INSTALL_DATA_DIR} ${HORDEDIR}/${d}
 .	endfor
-.	undef d 
+.	undef d
 
 .	for d in ${PAXDIRS}
 		cd ${WRKSRC}/${d} && ${PAX} -rw . ${HORDEDIR}/${d}
 .	endfor
-.	undef d 
+.	undef d
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${HORDEDIR}/config
 	${INSTALL_DATA} ${WRKSRC}/*.php ${HORDEDIR}
diff --git a/www/horde3/PLIST b/www/horde3/PLIST
index 3bcaadaafdf..eb3d56b3218 100644
--- a/www/horde3/PLIST
+++ b/www/horde3/PLIST
@@ -1,19 +1,36 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/16 21:10:17 adrianp Exp $
-share/doc/horde/COPYING
-share/doc/horde/README
+@comment $NetBSD: PLIST,v 1.2 2005/03/04 22:35:22 adrianp Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
+share/doc/horde/COPYING
 share/doc/horde/CREDITS
 share/doc/horde/HACKING
 share/doc/horde/INSTALL
 share/doc/horde/PERFORMANCE
+share/doc/horde/README
 share/doc/horde/RELEASE
 share/doc/horde/RELEASE_NOTES
 share/doc/horde/SECURITY
 share/doc/horde/TODO
 share/doc/horde/TRANSLATIONS
 share/doc/horde/UPGRADING
+share/horde/admin/cmdshell.php
+share/horde/admin/datatree.php
+share/horde/admin/groups.php
+share/horde/admin/index.php
+share/horde/admin/locale/en_US/help.xml
+share/horde/admin/locale/fi_FI/help.xml
+share/horde/admin/perms/addchild.php
+share/horde/admin/perms/delete.php
+share/horde/admin/perms/edit.php
+share/horde/admin/perms/index.php
+share/horde/admin/phpshell.php
+share/horde/admin/setup/config.php
+share/horde/admin/setup/diff.php
+share/horde/admin/setup/index.php
+share/horde/admin/setup/scripts.php
+share/horde/admin/sqlshell.php
+share/horde/admin/templates.php
 share/horde/config/conf.php.dist
 share/horde/config/conf.xml.dist
 share/horde/config/hooks.php.dist
@@ -1260,6 +1277,7 @@ share/horde/themes/green/info.php
 share/horde/themes/green/screen.css
 share/horde/themes/grey/info.php
 share/horde/themes/grey/screen.css
+share/horde/themes/ie.css
 share/horde/themes/ie5mac.css
 share/horde/themes/kolab/graphics/bg.png
 share/horde/themes/kolab/graphics/kolab.png
@@ -1281,6 +1299,7 @@ share/horde/themes/mozilla/graphics/menu-active.png
 share/horde/themes/mozilla/graphics/menu.png
 share/horde/themes/mozilla/info.php
 share/horde/themes/mozilla/screen.css
+share/horde/themes/opera.css
 share/horde/themes/postnuke/info.php
 share/horde/themes/postnuke/screen.css
 share/horde/themes/print/screen.css
@@ -1485,6 +1504,7 @@ share/horde/util/regex_test.php
 @dirrm share/horde/lib/Net
 @dirrm share/horde/lib/Horde/tests
 @dirrm share/horde/lib/Horde/iCalendar
+@dirrm share/horde/lib/Horde/docs/examples
 @dirrm share/horde/lib/Horde/docs
 @dirrm share/horde/lib/Horde/VC
 @dirrm share/horde/lib/Horde/UI/VarRenderer
@@ -1542,5 +1562,11 @@ share/horde/util/regex_test.php
 @dirrm share/horde/lib
 @dirrm share/horde/js
 @dirrm share/horde/config
+@dirrm share/horde/admin/locale/fi_FI
+@dirrm share/horde/admin/locale/en_US
+@dirrm share/horde/admin/locale
+@dirrm share/horde/admin/setup
+@dirrm share/horde/admin/perms
+@dirrm share/horde/admin
 @dirrm share/horde
 @dirrm share/doc/horde
diff --git a/www/horde3/distinfo b/www/horde3/distinfo
index a32b3ae209a..92e2fc95a30 100644
--- a/www/horde3/distinfo
+++ b/www/horde3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:08:32 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/03/04 22:35:22 adrianp Exp $
 
-SHA1 (horde-3.0.2.tar.gz) = 5856c33fe0b22ec5c077382c9d4851af20cc0363
-RMD160 (horde-3.0.2.tar.gz) = dfbb70c851f4c604e0d320d677e46971bdb073fd
-Size (horde-3.0.2.tar.gz) = 3114659 bytes
+SHA1 (horde-3.0.3.tar.gz) = fe784cdbb52aae3e59e3181c16e21fcc5249f612
+RMD160 (horde-3.0.3.tar.gz) = eb2e100b26b45773bc589870f48c15639c24c54c
+Size (horde-3.0.3.tar.gz) = 3246122 bytes
diff --git a/www/horde3/options.mk b/www/horde3/options.mk
index d8996cab525..bd7264a1b2d 100644
--- a/www/horde3/options.mk
+++ b/www/horde3/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/01/16 21:10:16 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2005/03/04 22:35:22 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.horde
-PKG_SUPPORTED_OPTIONS=	ldap postgresql73 postgresql74 mysql
+PKG_SUPPORTED_OPTIONS=	ldap postgresql mysql
 
 .if !defined(PKG_OPTIONS.horde)
 PKG_DEFAULT_OPTIONS+=	mysql
@@ -9,14 +9,6 @@ PKG_DEFAULT_OPTIONS+=	mysql
 .include "../../mk/bsd.options.mk"
 
 ###
-### Can't support both versions of PostgreSQL
-###
-.if !empty(PKG_OPTIONS:Mpostgresql73) && !empty(PKG_OPTIONS:Mpostgresql74)
-PKG_FAIL_REASON+=	"PostgreSQL 7.3 and 7.4 cannot both be compiled in." \
-			"Please change ${PKG_OPTIONS_VAR} to one or the other."
-.endif
-
-###
 ### Use OpenLDAP for storing user details
 ###
 .if !empty(PKG_OPTIONS:Mldap)
@@ -25,18 +17,10 @@ DEPENDS+=	php-ldap>=4.3.3:../../databases/php-ldap
 .endif
 
 ###
-### Use PostgreSQL v7.3 for storing user details
-###
-.if !empty(PKG_OPTIONS:Mpostgresql73)
-.	include "../../databases/postgresql73-lib/buildlink3.mk"
-DEPENDS+=	php-pgsql>=4.3.3:../../databases/php-pgsql
-.endif
-
-###
-### Use PostgreSQL v7.4 for storing user details
+### Use PostgreSQL for storing user details
 ###
-.if !empty(PKG_OPTIONS:Mpostgresql74)
-.	include "../../databases/postgresql74-lib/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mpostgresql)
+.	include "../../mk/pgsql.buildlink3.mk"
 DEPENDS+=	php-pgsql>=4.3.3:../../databases/php-pgsql
 .endif