From nobody@FreeBSD.org  Mon Sep  7 14:32:16 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34FDE1065670
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  7 Sep 2009 14:32:16 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A6138FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  7 Sep 2009 14:32:16 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n87EWFLC080145
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 7 Sep 2009 14:32:15 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n87EWFIO080144;
	Mon, 7 Sep 2009 14:32:15 GMT
	(envelope-from nobody)
Message-Id: <200909071432.n87EWFIO080144@www.freebsd.org>
Date: Mon, 7 Sep 2009 14:32:15 GMT
From: Edmondas Girkantas <eg@fbsd.lt>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] mail/roundcube to 0.3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         138612
>Category:       ports
>Synopsis:       [UPDATE] mail/roundcube to 0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 07 14:40:01 UTC 2009
>Closed-Date:    Mon Sep 07 20:58:05 UTC 2009
>Last-Modified:  Mon Sep 07 20:58:05 UTC 2009
>Originator:     Edmondas Girkantas
>Release:        7.2-RELEASE
>Organization:
>Environment:
FreeBSD ic405.fbsd.lt 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May  1 08:49:13 UTC 2009     root@walker.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
- updated to 0.3 version
- removed old patch for rcube_message.php file (it is fixed in distribution)
>How-To-Repeat:

>Fix:
apply given patch

Patch attached with submission follows:

diff -ruN roundcube.orig/Makefile roundcube/Makefile
--- roundcube.orig/Makefile	2009-09-07 17:15:57.000000000 +0300
+++ roundcube/Makefile	2009-09-07 17:24:25.000000000 +0300
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	roundcube
-DISTVERSION=	0.2.2
+DISTVERSION=	0.3
 PORTEPOCH=	1
 CATEGORIES=	mail www
-MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}
-DISTNAME=	${PORTNAME}mail-${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}-stable
+DISTNAME=	${PORTNAME}mail-${DISTVERSION}-stable
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
diff -ruN roundcube.orig/distinfo roundcube/distinfo
--- roundcube.orig/distinfo	2009-09-07 17:15:57.000000000 +0300
+++ roundcube/distinfo	2009-09-07 11:23:19.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (roundcubemail-0.2.2.tar.gz) = 992bd125a5f3c91e81f1eebbdef63575
-SHA256 (roundcubemail-0.2.2.tar.gz) = 57df1dfa6b88973f74131adf0262de4fbf5217be3bc6739faeccff77a9dfffa3
-SIZE (roundcubemail-0.2.2.tar.gz) = 1703629
+MD5 (roundcubemail-0.3-stable.tar.gz) = 741bb3dace2e2824c0cbb3e86142be5b
+SHA256 (roundcubemail-0.3-stable.tar.gz) = 11b1618692000b82c4fde26527b2cf5c18850eb6f48c6c0004758c39308dfd04
+SIZE (roundcubemail-0.3-stable.tar.gz) = 1888994
diff -ruN roundcube.orig/files/patch-program_include_rcube_message.php roundcube/files/patch-program_include_rcube_message.php
--- roundcube.orig/files/patch-program_include_rcube_message.php	2009-09-07 17:15:57.000000000 +0300
+++ roundcube/files/patch-program_include_rcube_message.php	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./program/include/rcube_message.php.orig	2009-07-30 14:35:17.000000000 +0200
-+++ ./program/include/rcube_message.php	2009-07-30 14:35:35.000000000 +0200
-@@ -373,7 +373,7 @@
- 
-         // part is file/attachment
-         else if ($mail_part->disposition == 'attachment' || $mail_part->disposition == 'inline' ||
--                 $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) {
-+                 $mail_part->headers['content-id'] || $mail_part->filename) {
-           // skip apple resource forks
-           if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
-             continue;


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Sep 7 14:40:12 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138612 

From: Sahil Tandon <sahil@tandon.net>
To: bug-followup@FreeBSD.org
Cc: ale@FreeBSD.org, eg@fbsd.lt
Subject: Re: ports/138612: [UPDATE] mail/roundcube to 0.3
Date: Mon, 7 Sep 2009 15:13:38 -0400

 Edmondas,
 
 Your patch does not appear to be adequate.  Note that 0.3 is distributed with
 an additional directory (plugins) that was not present in 0.2.x.  Without
 this directory, attempts to access RoundCube will likely fail.  To resolve
 this, you should update the RCUBECOMP variable (which is used to create the
 plist) in the port's Makefile.  I have not tested this, but something like
 the below should suffice:
 
 --- Makefile.orig	2009-09-07 15:11:14.000000000 -0400
 +++ Makefile	2009-09-07 14:46:07.000000000 -0400
 @@ -6,18 +6,18 @@
  #
  
  PORTNAME=	roundcube
 -DISTVERSION=	0.2.2
 +DISTVERSION=	0.3
  PORTEPOCH=	1
  CATEGORIES=	mail www
 -MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}
 -DISTNAME=	${PORTNAME}mail-${DISTVERSION}
 +MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}-stable
 +DISTNAME=	${PORTNAME}mail-${DISTVERSION}-stable
  
  MAINTAINER=	ale@FreeBSD.org
  COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
  
  NO_BUILD=	yes
  
 -RCUBECOMP=	SQL bin config index.php logs program robots.txt skins temp
 +RCUBECOMP=	SQL bin config index.php logs plugins program robots.txt skins temp
  PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADING
  
  SCRIPTS_ENV=	SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
 
 -- 
 Sahil Tandon <sahil@tandon.net>
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Mon Sep 7 20:57:34 UTC 2009 
State-Changed-Why:  
Committed a really working update :-) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138612 
>Unformatted:
