From 039663a06cdb8d6f6b38474525023c4272faa1a7 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 14 Mar 2012 16:20:47 +0000
Subject: [PATCH] In the sample roundcubemail.conf apache config file, don't
 bother to force PHP variables which are already set that way by default.
 Suggested by aja@

---
 mail/roundcubemail/Makefile                 | 3 ++-
 mail/roundcubemail/files/roundcubemail.conf | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile
index a74e15f36db..5db76aa9bf7 100644
--- a/mail/roundcubemail/Makefile
+++ b/mail/roundcubemail/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.52 2012/03/12 16:20:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.53 2012/03/14 16:20:47 sthen Exp $
 
 COMMENT=	imap4 webmail client
 
 DISTNAME=	roundcubemail-0.7.2
+REVISION=	0
 CATEGORIES=	mail www
 HOMEPAGE=	http://www.roundcube.net/
 
diff --git a/mail/roundcubemail/files/roundcubemail.conf b/mail/roundcubemail/files/roundcubemail.conf
index 7cd1ec4c0a3..171fb25066a 100644
--- a/mail/roundcubemail/files/roundcubemail.conf
+++ b/mail/roundcubemail/files/roundcubemail.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: roundcubemail.conf,v 1.8 2011/04/22 15:11:08 sthen Exp $
+# $OpenBSD: roundcubemail.conf,v 1.9 2012/03/14 16:20:47 sthen Exp $
 
 Alias /roundcubemail ${TINSTDIR}
 
@@ -9,9 +9,6 @@ Alias /roundcubemail ${TINSTDIR}
 <Directory ${TINSTDIR}>
     AllowOverride Indexes FileInfo Options
     <IfModule mod_php5.c>
-	php_value file_uploads			1
-	php_value session.auto_start		0
-	php_value mbstring.func_overload	0
 	# If you have session problems, try setting this
 	# to your database server's timezone.
 	php_value date.timezone			UTC