- Update to version 1.1.3, development moved to GitHub

- Keep edited configuration file on port deinstallation
- Add NO_ARCH
- Update LICENSE
- Fix x-generate-plist target (remove deprecated @dirrm)

PR:		205972
Submitted by:	maintainer

3 files changed, 13 insertions, 14 deletions

diff --git a/mail/roundcube-thunderbird_labels/Makefile b/mail/roundcube-thunderbird_labels/Makefile
index c2c4efeb4ffd..d3d132605603 100644
--- a/mail/roundcube-thunderbird_labels/Makefile
+++ b/mail/roundcube-thunderbird_labels/Makefile
@@ -2,24 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird_labels
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.3
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
-MASTER_SITES=	https://googledrive.com/host/
 PKGNAMEPREFIX=	roundcube-
-DISTNAME=	0B7cAkeuoAZKaMGVieHl4LTdEbWM
-EXTRACT_SUFX=
 
 MAINTAINER=	moiseev@mezonplus.ru
 COMMENT=	Thunderbird Labels plugin for RoundCube webmail
 
-LICENSE=	GPLv2
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	roundcube>=0.5:${PORTSDIR}/mail/roundcube
 
 USES=		tar:bzip2
 NO_BUILD=	yes
+NO_ARCH=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	mike-kfed
+GH_PROJECT=	rcmail-thunderbird-labels
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 PLUGINDIR=	${WWWDIR:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
 PLUGINDIR_REL=	${WWWDIR_REL:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
 PLIST_SUB=	PLUGINDIR_REL="${PLUGINDIR_REL}"
@@ -29,14 +31,12 @@ x-generate-plist: build
 	make makeplist | \
 	${SED} \
 	    -e "s,^\(%%PLUGINDIR_REL%%/config\.inc\.php\.sample$$\),@sample \1," \
-	    -e "/^%%PLUGINDIR_REL%%\/config\.inc\.php$$/d" \
-	    -e "s,^\(@dirrm\)try\( %%PLUGINDIR_REL%%/\),\1\2," \
 	    >${.CURDIR}/pkg-plist.tmp
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PLUGINDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PLUGINDIR}
 	cd ${STAGEDIR}${PLUGINDIR} && \
-		${CP} config.inc.php config.inc.php.sample
+		${MV} config.inc.php config.inc.php.sample
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-thunderbird_labels/distinfo b/mail/roundcube-thunderbird_labels/distinfo
index 8234a2021949..bb5578ccc888 100644
--- a/mail/roundcube-thunderbird_labels/distinfo
+++ b/mail/roundcube-thunderbird_labels/distinfo
@@ -1,2 +1,2 @@
-SHA256 (0B7cAkeuoAZKaMGVieHl4LTdEbWM) = e14e968c2adfb63e08280228f125c7b3a1feeff1ea5ca978e761702513e1d5a4
-SIZE (0B7cAkeuoAZKaMGVieHl4LTdEbWM) = 21483
+SHA256 (mike-kfed-rcmail-thunderbird-labels-v1.1.3_GH0.tar.bz2) = 36044ffa39d9ab59426e8b64709d3e50c1748bba2da61471d9f42c9345d81a4e
+SIZE (mike-kfed-rcmail-thunderbird-labels-v1.1.3_GH0.tar.bz2) = 21744
diff --git a/mail/roundcube-thunderbird_labels/pkg-plist b/mail/roundcube-thunderbird_labels/pkg-plist
index 674de39c8129..c5bc119098e3 100644
--- a/mail/roundcube-thunderbird_labels/pkg-plist
+++ b/mail/roundcube-thunderbird_labels/pkg-plist
@@ -1,5 +1,6 @@
 %%PLUGINDIR_REL%%/Changelog
-%%PLUGINDIR_REL%%/README
+%%PLUGINDIR_REL%%/LICENSE.md
+%%PLUGINDIR_REL%%/README.md
 %%PLUGINDIR_REL%%/composer.json
 @sample %%PLUGINDIR_REL%%/config.inc.php.sample
 %%PLUGINDIR_REL%%/localization/bg_BG.inc
@@ -15,8 +16,6 @@
 %%PLUGINDIR_REL%%/localization/pl_PL.inc
 %%PLUGINDIR_REL%%/localization/ru_RU.inc
 %%PLUGINDIR_REL%%/localization/uk_UA.inc
-%%PLUGINDIR_REL%%/skins/classic/default/tb_label.css
-%%PLUGINDIR_REL%%/skins/classic/default/thunderbird_32.png
 %%PLUGINDIR_REL%%/skins/classic/tb_label.css
 %%PLUGINDIR_REL%%/skins/classic/thunderbird_32.png
 %%PLUGINDIR_REL%%/skins/default/tb_label.css