ports/188457: [mail/roundcube-sieverules] Update for roundcube 1.0

[Spil]

>Number:         188457
>Category:       ports
>Synopsis:       [mail/roundcube-sieverules] Update for roundcube 1.0
>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:   Fri Apr 11 14:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Spil
>Release:        10.0-RELEASE
>Organization:
n.a.
>Environment:
FreeBSD beastie.example.org 10.0-RELEASE FreeBSD 10.0-RELEASE #0: Wed Jan 15 15:26:34 CET 2014     root at beastie.example.org:/usr/obj/usr/src/sys/BEASTIE100  amd64

>Description:
The mail/roundcube port was updated yesterday to 1.0 and requires updates to plugins as well
>How-To-Repeat:

>Fix:
See patch 

Patch attached with submission follows:

diff -ruN roundcube-sieverules.orig/Makefile roundcube-sieverules/Makefile
--- roundcube-sieverules.orig/Makefile  2013-09-20 21:59:12.000000000 +0200
+++ roundcube-sieverules/Makefile       2014-04-11 13:14:53.966995848 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: head/mail/roundcube-sieverules/Makefile 327742 2013-09-20 19:59:12Z bapt $

 PORTNAME=      sieverules
-PORTVERSION=   0.9.2
-PORTEPOCH=     1
+PORTVERSION=   2.1.2
 CATEGORIES=    mail
 PKGNAMEPREFIX= roundcube-

@@ -12,14 +11,14 @@

 LICENSE=       GPLv3

-BUILD_DEPENDS= roundcube>=0.9.2:${PORTSDIR}/mail/roundcube
-RUN_DEPENDS=   roundcube>=0.9.2:${PORTSDIR}/mail/roundcube
+BUILD_DEPENDS= roundcube>=1.0:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=   roundcube>=1.0:${PORTSDIR}/mail/roundcube

 USE_GITHUB=    yes
 GH_ACCOUNT=    JohnDoh
 GH_PROJECT=    Roundcube-Plugin-SieveRules-Managesieve
-GH_TAGNAME=    v${PORTVERSION}
-GH_COMMIT=     6eda4de
+GH_TAGNAME=    ${PORTVERSION}
+GH_COMMIT=     f606c1a

 NO_BUILD=      yes

diff -ruN roundcube-sieverules.orig/distinfo roundcube-sieverules/distinfo
--- roundcube-sieverules.orig/distinfo  2013-07-15 16:56:04.000000000 +0200
+++ roundcube-sieverules/distinfo       2014-04-11 13:14:21.955999831 +0200
@@ -1,2 +1,2 @@
-SHA256 (sieverules-0.9.2.tar.gz) = a912862a902ff20a65bfc7dbbdabf6d70043da15a8699a7bef57bc73553ff9bb
-SIZE (sieverules-0.9.2.tar.gz) = 130070
+SHA256 (sieverules-2.1.2.tar.gz) = 5a3d3f3e2a297ff41aba3c8b5b22246abcedcc9db917ae9c0a7d6e57e4c2b155
+SIZE (sieverules-2.1.2.tar.gz) = 124469
diff -ruN roundcube-sieverules.orig/pkg-plist roundcube-sieverules/pkg-plist
--- roundcube-sieverules.orig/pkg-plist 2013-05-07 17:23:01.000000000 +0200
+++ roundcube-sieverules/pkg-plist      2014-04-11 13:15:20.000000000 +0200
@@ -1,13 +1,13 @@
 %%WWWDIR%%/.gitignore
 %%WWWDIR%%/CHANGELOG
 %%WWWDIR%%/README.md
+%%WWWDIR%%/composer.json
 %%WWWDIR%%/config.inc.php.dist
 %%WWWDIR%%/importFilters/avelsieve.php
 %%WWWDIR%%/importFilters/ingo.php
-%%WWWDIR%%/include/rcube_sieve.php
-%%WWWDIR%%/include/rcube_sieve_script.php
-%%WWWDIR%%/jquery.maskedinput.js
-%%WWWDIR%%/lib/Net/Sieve.php
+%%WWWDIR%%/jquery.maskedinput.min.js
+%%WWWDIR%%/lib/Roundcube/rcube_sieve.php
+%%WWWDIR%%/lib/Roundcube/rcube_sieve_script.php
 %%WWWDIR%%/localization/ca_ES.inc
 %%WWWDIR%%/localization/cs_CZ.inc
 %%WWWDIR%%/localization/de_CH.inc
@@ -31,15 +31,15 @@
 %%WWWDIR%%/localization/sl_SI.inc
 %%WWWDIR%%/localization/sv_SE.inc
 %%WWWDIR%%/localization/zh_TW.inc
-%%WWWDIR%%/package.xml
 %%WWWDIR%%/sieverules.js
 %%WWWDIR%%/sieverules.php
-%%WWWDIR%%/skins/classic/cross.gif
-%%WWWDIR%%/skins/classic/help.gif
-%%WWWDIR%%/skins/classic/icons.gif
-%%WWWDIR%%/skins/classic/icons.png
 %%WWWDIR%%/skins/classic/ie6hacks.css
 %%WWWDIR%%/skins/classic/iehacks.css
+%%WWWDIR%%/skins/classic/images/cross.gif
+%%WWWDIR%%/skins/classic/images/help.gif
+%%WWWDIR%%/skins/classic/images/icons.gif
+%%WWWDIR%%/skins/classic/images/icons.png
+%%WWWDIR%%/skins/classic/images/tick.gif
 %%WWWDIR%%/skins/classic/safari.css
 %%WWWDIR%%/skins/classic/sieverules.css
 %%WWWDIR%%/skins/classic/tabstyles.css
@@ -47,12 +47,12 @@
 %%WWWDIR%%/skins/classic/templates/editsieverule.html
 %%WWWDIR%%/skins/classic/templates/setupsieverules.html
 %%WWWDIR%%/skins/classic/templates/sieverules.html
-%%WWWDIR%%/skins/classic/tick.gif
-%%WWWDIR%%/skins/larry/cross.png
-%%WWWDIR%%/skins/larry/help.png
-%%WWWDIR%%/skins/larry/icons.png
 %%WWWDIR%%/skins/larry/iehacks.css
-%%WWWDIR%%/skins/larry/listicons.png
+%%WWWDIR%%/skins/larry/images/cross.png
+%%WWWDIR%%/skins/larry/images/help.png
+%%WWWDIR%%/skins/larry/images/icons.png
+%%WWWDIR%%/skins/larry/images/listicons.png
+%%WWWDIR%%/skins/larry/images/tick.png
 %%WWWDIR%%/skins/larry/safari.css
 %%WWWDIR%%/skins/larry/sieverules.css
 %%WWWDIR%%/skins/larry/tabstyles.css
@@ -60,15 +60,15 @@
 %%WWWDIR%%/skins/larry/templates/editsieverule.html
 %%WWWDIR%%/skins/larry/templates/setupsieverules.html
 %%WWWDIR%%/skins/larry/templates/sieverules.html
-%%WWWDIR%%/skins/larry/tick.png
 @dirrm %%WWWDIR%%/skins/larry/templates
+ at dirrm %%WWWDIR%%/skins/larry/images
 @dirrm %%WWWDIR%%/skins/larry
 @dirrm %%WWWDIR%%/skins/classic/templates
+ at dirrm %%WWWDIR%%/skins/classic/images
 @dirrm %%WWWDIR%%/skins/classic
 @dirrm %%WWWDIR%%/skins
 @dirrm %%WWWDIR%%/localization
- at dirrm %%WWWDIR%%/lib/Net
+ at dirrm %%WWWDIR%%/lib/Roundcube
 @dirrm %%WWWDIR%%/lib
- at dirrm %%WWWDIR%%/include
 @dirrm %%WWWDIR%%/importFilters
 @dirrmtry %%WWWDIR%%


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