3 files changed, 57 insertions, 40 deletions

diff --git a/mail/roundcube-thunderbird_labels/Makefile b/mail/roundcube-thunderbird_labels/Makefile
index 5dbe263efb63..c2c4efeb4ffd 100644
--- a/mail/roundcube-thunderbird_labels/Makefile
+++ b/mail/roundcube-thunderbird_labels/Makefile
@@ -2,36 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird_labels
-PORTVERSION=	0.8.1
+PORTVERSION=	1.0.0
 CATEGORIES=	mail
-MASTER_SITES=	http://rcmail-thunderbird-labels.googlecode.com/files/
+MASTER_SITES=	https://googledrive.com/host/
 PKGNAMEPREFIX=	roundcube-
+DISTNAME=	0B7cAkeuoAZKaMGVieHl4LTdEbWM
+EXTRACT_SUFX=
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	moiseev@mezonplus.ru
 COMMENT=	Thunderbird Labels plugin for RoundCube webmail
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	roundcube>=0.5:${PORTSDIR}/mail/roundcube
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-WWWDIR?=	${PREFIX}/www/roundcube/plugins/${PORTNAME}
+PLUGINDIR=	${WWWDIR:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
+PLUGINDIR_REL=	${WWWDIR_REL:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
+PLIST_SUB=	PLUGINDIR_REL="${PLUGINDIR_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,^\(%%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} ${WWWDIR}
-	cd ${WRKSRC} && ${PAX} -r -w . ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${PLUGINDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PLUGINDIR}
+	cd ${STAGEDIR}${PLUGINDIR} && \
+		${CP} 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 7fb57585d1e9..8234a2021949 100644
--- a/mail/roundcube-thunderbird_labels/distinfo
+++ b/mail/roundcube-thunderbird_labels/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird_labels-0.8.1.tar.bz2) = b0bbb64f8a7f08b266ceb97046816c702a20750cc3cba97ea7938bd0b1eda99a
-SIZE (thunderbird_labels-0.8.1.tar.bz2) = 12620
+SHA256 (0B7cAkeuoAZKaMGVieHl4LTdEbWM) = e14e968c2adfb63e08280228f125c7b3a1feeff1ea5ca978e761702513e1d5a4
+SIZE (0B7cAkeuoAZKaMGVieHl4LTdEbWM) = 21483
diff --git a/mail/roundcube-thunderbird_labels/pkg-plist b/mail/roundcube-thunderbird_labels/pkg-plist
index e7bacbec8146..6c0fcd15fce4 100644
--- a/mail/roundcube-thunderbird_labels/pkg-plist
+++ b/mail/roundcube-thunderbird_labels/pkg-plist
@@ -1,23 +1,35 @@
-%%WWWDIR%%/Changelog
-%%WWWDIR%%/README
-%%WWWDIR%%/localization/cs_CZ.inc
-%%WWWDIR%%/localization/de_DE.inc
-%%WWWDIR%%/localization/en_US.inc
-%%WWWDIR%%/localization/fr_FR.inc
-%%WWWDIR%%/localization/hu_HU.inc
-%%WWWDIR%%/localization/pl_PL.inc
-%%WWWDIR%%/localization/ru_RU.inc
-%%WWWDIR%%/skins/classic/tb_label.css
-%%WWWDIR%%/skins/classic/thunderbird_32.png
-%%WWWDIR%%/skins/default/tb_label.css
-%%WWWDIR%%/skins/default/thunderbird_32.png
-%%WWWDIR%%/skins/larry/tb_label.css
-%%WWWDIR%%/skins/larry/thunderbird_32.png
-%%WWWDIR%%/tb_label.js
-%%WWWDIR%%/thunderbird_labels.php
-@dirrm %%WWWDIR%%/skins/larry
-@dirrm %%WWWDIR%%/skins/default
-@dirrm %%WWWDIR%%/skins/classic
-@dirrm %%WWWDIR%%/skins
-@dirrm %%WWWDIR%%/localization
-@dirrmtry %%WWWDIR%%
+%%PLUGINDIR_REL%%/Changelog
+%%PLUGINDIR_REL%%/README
+%%PLUGINDIR_REL%%/composer.json
+@sample %%PLUGINDIR_REL%%/config.inc.php.sample
+%%PLUGINDIR_REL%%/localization/bg_BG.inc
+%%PLUGINDIR_REL%%/localization/ca_ES.inc
+%%PLUGINDIR_REL%%/localization/cs_CZ.inc
+%%PLUGINDIR_REL%%/localization/de_DE.inc
+%%PLUGINDIR_REL%%/localization/en_US.inc
+%%PLUGINDIR_REL%%/localization/es_ES.inc
+%%PLUGINDIR_REL%%/localization/fr_FR.inc
+%%PLUGINDIR_REL%%/localization/hu_HU.inc
+%%PLUGINDIR_REL%%/localization/it_IT.inc
+%%PLUGINDIR_REL%%/localization/lv_LV.inc
+%%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
+%%PLUGINDIR_REL%%/skins/default/thunderbird_32.png
+%%PLUGINDIR_REL%%/skins/larry/tb_label.css
+%%PLUGINDIR_REL%%/skins/larry/thunderbird_24.png
+%%PLUGINDIR_REL%%/skins/larry/thunderbird_32.png
+%%PLUGINDIR_REL%%/tb_label.js
+%%PLUGINDIR_REL%%/thunderbird_labels.php
+@dirrm %%PLUGINDIR_REL%%/localization
+@dirrm %%PLUGINDIR_REL%%/skins/classic/default
+@dirrm %%PLUGINDIR_REL%%/skins/classic
+@dirrm %%PLUGINDIR_REL%%/skins/default
+@dirrm %%PLUGINDIR_REL%%/skins/larry
+@dirrm %%PLUGINDIR_REL%%/skins
+@dirrmtry %%PLUGINDIR_REL%%