ports/140262: [PATCH] mail/roundcube: update to 0.3.1

[Sahil Tandon]

>Number:         140262
>Category:       ports
>Synopsis:       [PATCH] mail/roundcube: update to 0.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 04 04:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sahil Tandon
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:

	
>Description:
- update to 0.3.1
- slight tweak of pkg-message
- remove files/patch-plugins_password_drivers_sql.php; the problem is fixed upstream
>How-To-Repeat:
	
>Fix:

	



--- roundcube.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/roundcube/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile	8 Sep 2009 14:57:39 -0000	1.53
+++ Makefile	4 Nov 2009 04:29:38 -0000
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	roundcube
-DISTVERSION=	0.3
-PORTREVISION=	1
+DISTVERSION=	0.3.1
 PORTEPOCH=	1
 CATEGORIES=	mail www
-MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}-stable
-DISTNAME=	${PORTNAME}mail-${DISTVERSION}-stable
+MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}
+DISTNAME=	${PORTNAME}mail-${DISTVERSION}
 
 MAINTAINER=	ale at FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
@@ -29,7 +28,7 @@
 USE_PHP=	pcre mbstring session iconv dom xml
 IGNORE_WITH_PHP=4
 
-SUB_FILES=	pkg-install
+SUB_FILES=	pkg-install pkg-message
 PKGDEINSTALL=	${PKGINSTALL}
 
 REINPLACE_ARGS=	-i ""
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/roundcube/distinfo,v
retrieving revision 1.34
diff -u -r1.34 distinfo
--- distinfo	7 Sep 2009 20:57:06 -0000	1.34
+++ distinfo	4 Nov 2009 04:29:38 -0000
@@ -1,3 +1,3 @@
-MD5 (roundcubemail-0.3-stable.tar.gz) = 741bb3dace2e2824c0cbb3e86142be5b
-SHA256 (roundcubemail-0.3-stable.tar.gz) = 11b1618692000b82c4fde26527b2cf5c18850eb6f48c6c0004758c39308dfd04
-SIZE (roundcubemail-0.3-stable.tar.gz) = 1888994
+MD5 (roundcubemail-0.3.1.tar.gz) = 34e8e18772e7eada8769b6c5c20f7c8e
+SHA256 (roundcubemail-0.3.1.tar.gz) = 78b7160e58fc3692591e8a909464a858500768e5e7a7c076b496a7caf119ddd1
+SIZE (roundcubemail-0.3.1.tar.gz) = 1917564
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	7 Jan 2009 13:24:30 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-------------------------------------------------------------------
-FIRST INSTALLATION
-
-. Create a new database and a database user for RoundCube
-. Create database tables using the queries in file
-   'SQL/*.initial.sql'
-. Modify the files in config/* to suit your local environment
-. Don't forget to set db.inc.php mode to 660.
-
-UPGRADING
-
-If you already had a previous version of RoundCube installed,
-you should check your config files and DB schema are up-to-date.
-------------------------------------------------------------------
Index: files/patch-plugins_password_drivers_sql.php
===================================================================
RCS file: files/patch-plugins_password_drivers_sql.php
diff -N files/patch-plugins_password_drivers_sql.php
--- files/patch-plugins_password_drivers_sql.php	10 Sep 2009 08:19:29 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- plugins/password/drivers/sql.php.orig	2009-09-10 10:17:30.000000000 +0200
-+++ plugins/password/drivers/sql.php	2009-09-10 10:18:05.000000000 +0200
-@@ -81,7 +81,7 @@
-     $user_info = explode('@', $_SESSION['username']);
-     if (count($user_info) >= 2) {
- 	$sql = str_replace('%l', $db->quote($user_info[0], 'text'), $sql);
--	$sql = str_replace('%d', $db->quote($user_info[0], 'text'), $sql);
-+	$sql = str_replace('%d', $db->quote($user_info[1], 'text'), $sql);
-     }
-     
-     $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	4 Nov 2009 04:29:38 -0000
@@ -0,0 +1,14 @@
+------------------------------------------------------------------
+FIRST INSTALLATION
+
+. Create a new database and a database user for RoundCube
+. Create database tables using the queries in file
+   '%%WWWDIR%%/SQL/*.initial.sql'
+. Modify the files in %%WWWDIR%%/config/* to suit your local environment
+. Don't forget to set db.inc.php mode to 660.
+
+UPGRADING
+
+If you already had a previous version of RoundCube installed,
+you should check your config files and DB schema are up-to-date.
+------------------------------------------------------------------
--- roundcube.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: