The mail/roundcube port was updated yesterday to 1.0 and requires updates to plugins as well Fix: See patch Patch attached with submission follows:
Maintainer of mail/roundcube-sieverules, Please note that PR ports/188457 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/188457 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-ports-bugs->bdrewery I'll take it.
----- Forwarded message from Anes Mukhametov <anes@anes.su> ----- Date: Fri, 11 Apr 2014 22:52:34 +0400 From: Anes Mukhametov <anes@anes.su> To: bdrewery@freebsd.org Cc: freebsd-ports-bugs@freebsd.org Subject: Re: ports/188457: [mail/roundcube-sieverules] Update for roundcube 1.0 Seems like the patch is broken: Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file roundcube-sieverules/Makefile using Plan A... Hunk #1 failed at 2. Hunk #2 failed at 11. 2 out of 2 hunks failed--saving rejects to roundcube-sieverules/Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file roundcube-sieverules/distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file roundcube-sieverules/pkg-plist using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 31. Hunk #3 succeeded at 47. Hunk #4 succeeded at 60 with fuzz 1. done -- Best regards Anes Mukhametov ----- End forwarded message -----
Author: bdrewery Date: Mon Apr 21 02:45:32 2014 New Revision: 351666 URL: http://svnweb.freebsd.org/changeset/ports/351666 QAT: https://qat.redports.org/buildarchive/r351666/ Log: - Update to 2.1.2 - Stage PR: ports/188457 Submitted by: Spil <spil.oss@gmail.com> Reviewed by: Anes Mukhametov <anes@anes.su> (maintainer) Modified: head/mail/roundcube-sieverules/Makefile head/mail/roundcube-sieverules/distinfo head/mail/roundcube-sieverules/pkg-plist Modified: head/mail/roundcube-sieverules/Makefile ============================================================================== --- head/mail/roundcube-sieverules/Makefile Mon Apr 21 02:39:02 2014 (r351665) +++ head/mail/roundcube-sieverules/Makefile Mon Apr 21 02:45:32 2014 (r351666) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sieverules -PORTVERSION= 0.9.2 +PORTVERSION= 2.1.2 PORTEPOCH= 1 CATEGORIES= mail PKGNAMEPREFIX= roundcube- @@ -12,14 +12,14 @@ COMMENT= Roundcube webmail sieve plugin 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 @@ -34,9 +34,8 @@ x-generate-plist: build -e "s,^\.$$,@dirrmtry %%WWWDIR%%," \ -e "s,^\.,@dirrm %%WWWDIR%%," >>${WRKDIR}/pkg-plist.tmp -NO_STAGE= yes do-install: - ${MKDIR} ${WWWDIR} - cd ${WRKSRC} && ${PAX} -r -w . ${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} + cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR} .include <bsd.port.mk> Modified: head/mail/roundcube-sieverules/distinfo ============================================================================== --- head/mail/roundcube-sieverules/distinfo Mon Apr 21 02:39:02 2014 (r351665) +++ head/mail/roundcube-sieverules/distinfo Mon Apr 21 02:45:32 2014 (r351666) @@ -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 Modified: head/mail/roundcube-sieverules/pkg-plist ============================================================================== --- head/mail/roundcube-sieverules/pkg-plist Mon Apr 21 02:39:02 2014 (r351665) +++ head/mail/roundcube-sieverules/pkg-plist Mon Apr 21 02:45:32 2014 (r351666) @@ -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 +@dirrm %%WWWDIR%%/skins/larry/images @dirrm %%WWWDIR%%/skins/larry @dirrm %%WWWDIR%%/skins/classic/templates +@dirrm %%WWWDIR%%/skins/classic/images @dirrm %%WWWDIR%%/skins/classic @dirrm %%WWWDIR%%/skins @dirrm %%WWWDIR%%/localization -@dirrm %%WWWDIR%%/lib/Net +@dirrm %%WWWDIR%%/lib/Roundcube @dirrm %%WWWDIR%%/lib -@dirrm %%WWWDIR%%/include @dirrm %%WWWDIR%%/importFilters @dirrmtry %%WWWDIR%% _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed. NOTE that PORTEPOCH should never be removed. I also staged it.