3 files changed, 24 insertions, 21 deletions

diff --git a/mail/roundcube-sieverules/Makefile b/mail/roundcube-sieverules/Makefile
index 127daf7d534e..b24195b9be03 100644
--- a/mail/roundcube-sieverules/Makefile
+++ b/mail/roundcube-sieverules/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sieverules
-PORTVERSION=	2.1.2
+DISTVERSION=	2.3
 PORTEPOCH=	1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
@@ -16,16 +16,15 @@ BUILD_DEPENDS=	roundcube>=1.0:mail/roundcube
 RUN_DEPENDS=	roundcube>=1.0:mail/roundcube
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	JohnDoh
-GH_PROJECT=	Roundcube-Plugin-SieveRules-Managesieve
-
+GH_ACCOUNT=	johndoh
+GH_PROJECT=	roundcube-sieverules
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-WWWDIR=		${PREFIX}/www/roundcube/plugins/sieverules
+WWWDIR=		${PREFIX}/www/roundcube/plugins/${PORTNAME}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${WWWDIR}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-sieverules/distinfo b/mail/roundcube-sieverules/distinfo
index 05bb6cc4a6df..0292506bef31 100644
--- a/mail/roundcube-sieverules/distinfo
+++ b/mail/roundcube-sieverules/distinfo
@@ -1,2 +1,3 @@
-SHA256 (JohnDoh-Roundcube-Plugin-SieveRules-Managesieve-2.1.2_GH0.tar.gz) = 4496b763bd2b0e4ddf6a40e39db2fda8810414eccf5cb1fb87a09bc7fc6d521b
-SIZE (JohnDoh-Roundcube-Plugin-SieveRules-Managesieve-2.1.2_GH0.tar.gz) = 124450
+TIMESTAMP = 1519366336
+SHA256 (johndoh-roundcube-sieverules-2.3_GH0.tar.gz) = 8903c0cec5691eb11e5654f39903cb932171e9c500e87849bbdc68a39ade9c62
+SIZE (johndoh-roundcube-sieverules-2.3_GH0.tar.gz) = 136317
diff --git a/mail/roundcube-sieverules/pkg-plist b/mail/roundcube-sieverules/pkg-plist
index a923fda53f8d..b560ea931e68 100644
--- a/mail/roundcube-sieverules/pkg-plist
+++ b/mail/roundcube-sieverules/pkg-plist
@@ -1,13 +1,12 @@
 %%WWWDIR%%/.gitignore
 %%WWWDIR%%/CHANGELOG
-%%WWWDIR%%/README.md
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config.inc.php.dist
-%%WWWDIR%%/importFilters/avelsieve.php
-%%WWWDIR%%/importFilters/ingo.php
+%%WWWDIR%%/importFilters/avelsieve.php.ex
+%%WWWDIR%%/importFilters/ingo.php.ex
 %%WWWDIR%%/jquery.maskedinput.min.js
-%%WWWDIR%%/lib/Roundcube/rcube_sieve.php
 %%WWWDIR%%/lib/Roundcube/rcube_sieve_script.php
+%%WWWDIR%%/lib/Roundcube/rcube_sieve.php
 %%WWWDIR%%/localization/ca_ES.inc
 %%WWWDIR%%/localization/cs_CZ.inc
 %%WWWDIR%%/localization/de_CH.inc
@@ -31,32 +30,36 @@
 %%WWWDIR%%/localization/sl_SI.inc
 %%WWWDIR%%/localization/sv_SE.inc
 %%WWWDIR%%/localization/zh_TW.inc
+%%WWWDIR%%/mail.js
+%%WWWDIR%%/README.md
 %%WWWDIR%%/sieverules.js
 %%WWWDIR%%/sieverules.php
-%%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/cross.png
+%%WWWDIR%%/skins/classic/images/help.png
 %%WWWDIR%%/skins/classic/images/icons.png
-%%WWWDIR%%/skins/classic/images/tick.gif
-%%WWWDIR%%/skins/classic/safari.css
+%%WWWDIR%%/skins/classic/images/mail_toolbar.png
+%%WWWDIR%%/skins/classic/images/messageactions.png
+%%WWWDIR%%/skins/classic/images/tick.png
+%%WWWDIR%%/skins/classic/mailstyles.css
 %%WWWDIR%%/skins/classic/sieverules.css
 %%WWWDIR%%/skins/classic/tabstyles.css
 %%WWWDIR%%/skins/classic/templates/advancededitor.html
 %%WWWDIR%%/skins/classic/templates/editsieverule.html
 %%WWWDIR%%/skins/classic/templates/setupsieverules.html
 %%WWWDIR%%/skins/classic/templates/sieverules.html
-%%WWWDIR%%/skins/larry/iehacks.css
+%%WWWDIR%%/skins/classic/templates/vacation.html
 %%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/mail_toolbar.png
+%%WWWDIR%%/skins/larry/images/messageactions.png
 %%WWWDIR%%/skins/larry/images/tick.png
-%%WWWDIR%%/skins/larry/safari.css
+%%WWWDIR%%/skins/larry/mailstyles.css
 %%WWWDIR%%/skins/larry/sieverules.css
 %%WWWDIR%%/skins/larry/tabstyles.css
 %%WWWDIR%%/skins/larry/templates/advancededitor.html
 %%WWWDIR%%/skins/larry/templates/editsieverule.html
 %%WWWDIR%%/skins/larry/templates/setupsieverules.html
 %%WWWDIR%%/skins/larry/templates/sieverules.html
+%%WWWDIR%%/skins/larry/templates/vacation.html