3 files changed, 70 insertions, 63 deletions

diff --git a/mail/roundcube-contextmenu/Makefile b/mail/roundcube-contextmenu/Makefile
index 5553880a0f6e..2283c507eb05 100644
--- a/mail/roundcube-contextmenu/Makefile
+++ b/mail/roundcube-contextmenu/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	contextmenu
-PORTVERSION=	1.10 # PLEASE MIRROR DISTFILE WITH VERSIONED DIR
+PORTVERSION=	1.13
 CATEGORIES=	mail
-MASTER_SITES=	http://www.tehinterweb.co.uk/roundcube/plugins/ \
-		LOCAL/bdrewery/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	GH
 PKGNAMEPREFIX=	roundcube-
 DISTNAME=	${PORTNAME}
 
@@ -14,24 +13,29 @@ COMMENT=	RoundCube webmail contextmenu plugin
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	roundcube>=0.9:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=1.0:${PORTSDIR}/mail/roundcube
 
 NO_BUILD=	yes
 
-WWWDIR?=	${PREFIX}/www/roundcube/plugins/contextmenu
+USE_GITHUB=	YES
+GH_ACCOUNT=	JohnDoh
+GH_PROJECT=	Roundcube-Plugin-Context-Menu
+GH_TAGNAME=	1.13
+GH_COMMIT=	53e7f7c
+
+PLUGINDIR=	${WWWDIR:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
+RCDIR_REL=	${WWWDIR_REL:S,/${PORTNAME}$$,,}/roundcube
+PLIST_SUB=	RCDIR_REL="${RCDIR_REL}"
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist: build
-	cd ${WRKSRC}; \
-	${FIND} . ! -type d ! -name '*.orig' | ${SORT} | \
-		${SED} -e "s,^\.,%%WWWDIR%%," >${.CURDIR}/pkg-plist.tmp ; \
-	${FIND} . -type d | ${SORT} -r | ${SED} \
-		-e "s,^\.$$,@dirrmtry %%WWWDIR%%," \
-		-e "s,^\.,@dirrm %%WWWDIR%%," >>${.CURDIR}/pkg-plist.tmp
-
-NO_STAGE=	yes
+	make makeplist | \
+	${SED} \
+	    -e "s,^\(@dirrm\)try\( %%RCDIR_REL%%/plugins/contextmenu\),\1\2," \
+	    >${.CURDIR}/pkg-plist.tmp
+
 do-install:
-	${MKDIR} ${WWWDIR}
-	cd ${WRKSRC} && ${PAX} -r -w . ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${PLUGINDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PLUGINDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-contextmenu/distinfo b/mail/roundcube-contextmenu/distinfo
index 0f6cb8bda9a2..d2bb967dfaf3 100644
--- a/mail/roundcube-contextmenu/distinfo
+++ b/mail/roundcube-contextmenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (contextmenu.tar.gz) = 79a63e91ca7bc361872976e19f0ab6559c95e32618776bddd3e44a30e3148192
-SIZE (contextmenu.tar.gz) = 47350
+SHA256 (contextmenu.tar.gz) = 65244fbc429f005e5ae6ac59a1ef38bd1fb34a137da8497525476c1b65a7b600
+SIZE (contextmenu.tar.gz) = 47132
diff --git a/mail/roundcube-contextmenu/pkg-plist b/mail/roundcube-contextmenu/pkg-plist
index d15d527539f1..f4e40491d285 100644
--- a/mail/roundcube-contextmenu/pkg-plist
+++ b/mail/roundcube-contextmenu/pkg-plist
@@ -1,46 +1,49 @@
-%%WWWDIR%%/CHANGELOG
-%%WWWDIR%%/README.md
-%%WWWDIR%%/contextmenu.js
-%%WWWDIR%%/contextmenu.php
-%%WWWDIR%%/jquery.contextMenu.js
-%%WWWDIR%%/jquery.mousewheel.js
-%%WWWDIR%%/localization/ca_ES.inc
-%%WWWDIR%%/localization/cs_CZ.inc
-%%WWWDIR%%/localization/da_DK.inc
-%%WWWDIR%%/localization/de_CH.inc
-%%WWWDIR%%/localization/de_DE.inc
-%%WWWDIR%%/localization/en_GB.inc
-%%WWWDIR%%/localization/en_US.inc
-%%WWWDIR%%/localization/es_ES.inc
-%%WWWDIR%%/localization/fr_FR.inc
-%%WWWDIR%%/localization/gl_ES.inc
-%%WWWDIR%%/localization/hu_HU.inc
-%%WWWDIR%%/localization/it_IT.inc
-%%WWWDIR%%/localization/nl_NL.inc
-%%WWWDIR%%/localization/pl_PL.inc
-%%WWWDIR%%/localization/pt_BR.inc
-%%WWWDIR%%/localization/ro_RO.inc
-%%WWWDIR%%/localization/ru_RU.inc
-%%WWWDIR%%/localization/sv_SE.inc
-%%WWWDIR%%/localization/tr_TR.inc
-%%WWWDIR%%/localization/uk_UA.inc
-%%WWWDIR%%/localization/zh_TW.inc
-%%WWWDIR%%/package.xml
-%%WWWDIR%%/skins/classic/contexticons.gif
-%%WWWDIR%%/skins/classic/contexticons.png
-%%WWWDIR%%/skins/classic/contextmenu.css
-%%WWWDIR%%/skins/classic/folders.gif
-%%WWWDIR%%/skins/classic/folders.png
-%%WWWDIR%%/skins/classic/ie6hacks.css
-%%WWWDIR%%/skins/classic/messageactions.gif
-%%WWWDIR%%/skins/classic/messageactions.png
-%%WWWDIR%%/skins/larry/contexticons.png
-%%WWWDIR%%/skins/larry/contextmenu.css
-%%WWWDIR%%/skins/larry/folders.png
-%%WWWDIR%%/skins/larry/ie6hacks.css
-%%WWWDIR%%/skins/larry/messageactions.png
-@dirrm %%WWWDIR%%/skins/larry
-@dirrm %%WWWDIR%%/skins/classic
-@dirrm %%WWWDIR%%/skins
-@dirrm %%WWWDIR%%/localization
-@dirrmtry %%WWWDIR%%
+%%RCDIR_REL%%/plugins/contextmenu/CHANGELOG
+%%RCDIR_REL%%/plugins/contextmenu/README.md
+%%RCDIR_REL%%/plugins/contextmenu/composer.json
+%%RCDIR_REL%%/plugins/contextmenu/contextmenu.js
+%%RCDIR_REL%%/plugins/contextmenu/contextmenu.php
+%%RCDIR_REL%%/plugins/contextmenu/jquery.contextmenu.min.js
+%%RCDIR_REL%%/plugins/contextmenu/localization/ca_ES.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/cs_CZ.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/da_DK.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/de_CH.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/de_DE.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/en_GB.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/en_US.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/es_ES.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/fr_FR.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/gl_ES.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/hu_HU.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/it_IT.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/ja_JP.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/nl_NL.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/pl_PL.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/pt_BR.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/pt_PT.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/ro_RO.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/ru_RU.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/sv_SE.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/tr_TR.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/uk_UA.inc
+%%RCDIR_REL%%/plugins/contextmenu/localization/zh_TW.inc
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/contextmenu.css
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/ie6hacks.css
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/images/contexticons.gif
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/images/contexticons.png
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/images/folders.gif
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/images/folders.png
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/images/messageactions.gif
+%%RCDIR_REL%%/plugins/contextmenu/skins/classic/images/messageactions.png
+%%RCDIR_REL%%/plugins/contextmenu/skins/larry/contextmenu.css
+%%RCDIR_REL%%/plugins/contextmenu/skins/larry/ie6hacks.css
+%%RCDIR_REL%%/plugins/contextmenu/skins/larry/images/contexticons.png
+%%RCDIR_REL%%/plugins/contextmenu/skins/larry/images/folders.png
+%%RCDIR_REL%%/plugins/contextmenu/skins/larry/images/messageactions.png
+@dirrm %%RCDIR_REL%%/plugins/contextmenu/skins/larry/images
+@dirrm %%RCDIR_REL%%/plugins/contextmenu/skins/larry
+@dirrm %%RCDIR_REL%%/plugins/contextmenu/skins/classic/images
+@dirrm %%RCDIR_REL%%/plugins/contextmenu/skins/classic
+@dirrm %%RCDIR_REL%%/plugins/contextmenu/skins
+@dirrm %%RCDIR_REL%%/plugins/contextmenu/localization
+@dirrm %%RCDIR_REL%%/plugins/contextmenu