- update roundcubemail to 0.4

- simpler installation procedure, req by marco

mail/roundcubemail/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2010/02/24 13:40:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2010/08/22 12:37:14 sthen Exp $
 
 COMMENT =	imap4 webmail client
 
-DISTNAME =	roundcubemail-0.3.1
-PKGNAME =	${DISTNAME}p1
+DISTNAME =	roundcubemail-0.4
 CATEGORIES =	mail www
 HOMEPAGE =	http://www.roundcube.net/
 
@@ -25,14 +24,17 @@ PREFIX =	/var/www
 INSTDIR =	${PREFIX}/roundcubemail
 SUBST_VARS =	INSTDIR
 
-RUN_DEPENDS =	:php5-core-*:www/php5/core \
-		:php5-mbstring-*:www/php5/extensions,-mbstring
+RUN_DEPENDS =	::www/php5/core \
+		::www/php5/extensions,-mbstring \
+		:php5-mysql-*|php5-pgsql-*|php5-sqlite-*:www/php5/extensions,-sqlite
 
 do-install:
 	cp -Rp ${WRKDIST} ${INSTDIR}
 .for i in .htaccess config/mimetypes.php
 	mv ${INSTDIR}/$i ${INSTDIR}/$i.dist
 .endfor
+	${SUBST_CMD} -c ${FILESDIR}/roundcubemail.conf \
+	    ${INSTDIR}/roundcubemail.conf.dist
 	chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 	find ${INSTDIR} \( -name \*.orig -or -name \*.src \) -exec rm -f {} \;
 

mail/roundcubemail/distinfo

@@ -1,5 +1,5 @@
-MD5 (roundcubemail-0.3.1.tar.gz) = NOjhh3Ln6tqHabbFwg98jg==
-RMD160 (roundcubemail-0.3.1.tar.gz) = EEflCgR261Oosn3wsS6Vqxh6HEE=
-SHA1 (roundcubemail-0.3.1.tar.gz) = OSe7mcICEPxTkTCGXSZU6W4tU5A=
-SHA256 (roundcubemail-0.3.1.tar.gz) = eLcWDlj8NpJZHoqQlGSoWFAHaOXnp8B2tJanyvEZ3dE=
-SIZE (roundcubemail-0.3.1.tar.gz) = 1917564
+MD5 (roundcubemail-0.4.tar.gz) = bl0jEwh84eEgnrD0/XG+qw==
+RMD160 (roundcubemail-0.4.tar.gz) = /ivuMQTH8Dcf52N05yf7XLmxcRI=
+SHA1 (roundcubemail-0.4.tar.gz) = HsgMb/V6iROlPT2LturODSBJDsw=
+SHA256 (roundcubemail-0.4.tar.gz) = HaKlfw+oZsq8F50BwqKcgNz2EI1F5BUhASnvkP+LLBw=
+SIZE (roundcubemail-0.4.tar.gz) = 2159645

mail/roundcubemail/files/roundcubemail.conf

@@ -0,0 +1,5 @@
+# $OpenBSD: roundcubemail.conf,v 1.1 2010/08/22 12:37:14 sthen Exp $
+
+<Directory ${INSTDIR}>
+    AllowOverride Indexes FileInfo Options
+</DIrectory>

mail/roundcubemail/patches/patch-UPGRADING

@@ -1,13 +0,0 @@
-$OpenBSD: patch-UPGRADING,v 1.5 2009/09/05 15:46:24 sthen Exp $
---- UPGRADING.orig	Sun May 31 09:37:01 2009
-+++ UPGRADING	Mon Aug  3 15:53:03 2009
-@@ -57,6 +57,9 @@ from version 0.1.1
-   below the line "-- Updates from version 0.1.1"
- * check the config/main.inc.php.dist for new configuration 
-   options and add them to your config 
-+* the "db" backend has been removed, check config/db.inc.php
-+  and if you have configured it as db_backend, switch to "mdb2".
-+
- 
- 
- from version 0.1-stable

mail/roundcubemail/patches/patch-config_main_inc_php_dist

@@ -1,21 +1,12 @@
-$OpenBSD: patch-config_main_inc_php_dist,v 1.8 2009/11/02 17:20:10 sthen Exp $
---- config/main.inc.php.dist.orig	Wed Oct 21 09:47:40 2009
-+++ config/main.inc.php.dist	Sat Oct 31 15:23:57 2009
-@@ -99,7 +99,7 @@ $rcmail_config['virtuser_query'] = '';
- // to use SSL connection, set ssl://smtp.host.com
- // if left blank, the PHP mail() function is used
- // Use %h variable as replacement for user's IMAP hostname
--$rcmail_config['smtp_server'] = '';
-+$rcmail_config['smtp_server'] = '127.0.0.1';
- 
- // SMTP port (default is 25; 465 for SSL)
- $rcmail_config['smtp_port'] = 25;
-@@ -338,7 +338,7 @@ $rcmail_config['include_host_config'] = false;
- $rcmail_config['max_pagesize'] = 200;
+$OpenBSD: patch-config_main_inc_php_dist,v 1.9 2010/08/22 12:37:14 sthen Exp $
+--- config/main.inc.php.dist.orig	Wed Jun 23 10:55:08 2010
++++ config/main.inc.php.dist	Sat Aug  7 14:17:23 2010
+@@ -263,7 +263,7 @@ $rcmail_config['dont_override'] = array();
+ $rcmail_config['identities_level'] = 0;
  
  // mime magic database
 -$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
 +$rcmail_config['mime_magic'] = '../conf/magic';
  
- // default sort col
- $rcmail_config['message_sort_col'] = 'date';
+ // Enable DNS checking for e-mail address validation
+ $rcmail_config['email_dns_check'] = false;

mail/roundcubemail/patches/patch-program_include_main_inc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-program_include_main_inc,v 1.8 2009/09/05 15:46:24 sthen Exp $
---- program/include/main.inc.orig	Mon Aug 10 22:32:44 2009
-+++ program/include/main.inc	Sat Sep  5 16:41:25 2009
-@@ -884,7 +884,8 @@ function format_date($date, $format=NULL)
+$OpenBSD: patch-program_include_main_inc,v 1.9 2010/08/22 12:37:14 sthen Exp $
+--- program/include/main.inc.orig	Mon Jul 26 09:54:03 2010
++++ program/include/main.inc	Sat Aug  7 14:17:23 2010
+@@ -970,7 +970,8 @@ function format_date($date, $format=NULL)
      $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600;
    else {
      $tz = $CONFIG['timezone'];

mail/roundcubemail/pkg/MESSAGE

@@ -1,12 +1,9 @@
-RoundCube webmail has been installed into ${INSTDIR}
+With Apache, AllowOverride settings are required on the
+${INSTDIR} directory. You can configure this as follows:
 
-With Apache, this directory must be granted at least these:
-    AllowOverride Indexes FileInfo Options
+# ln -s ${PREFIX}/conf/modules.sample/roundcubemail.conf \
+        ${PREFIX}/conf/modules
+# apachectl stop
+# apachectl start
 
-Proceed to complete the installation or upgrade by reading:
-${INSTDIR}/INSTALL
-${INSTDIR}/UPGRADING
-
-A database is required to use this package; PostgreSQL, MySQL and
-SQLite are supported. If you have no requirements for either of the
-full-scale RDBMS, you might like to install the php5-sqlite package.
+Next, follow ${INSTDIR}/INSTALL or ${INSTDIR}/UPGRADING