- Update to 3.10.2

PR:		ports/142829
Submitted by:	Neil Darlow <neil darlow.co.uk> (maintainer)

3 files changed, 45 insertions, 28 deletions

diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index db147a201f1b..8437812e9229 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -4,22 +4,38 @@
 #
 # $FreeBSD$
 
-PORTNAME=		vlogin
-PORTVERSION=		3.10.1
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=		squirrelmail-
-PKGNAMESUFFIX=		-plugin
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.2.7
-DIST_SUBDIR=		squirrelmail
+PORTNAME=	vlogin
+PORTVERSION=	3.10.2
+CATEGORIES=	mail www
+MASTER_SITES=	http://www.squirrelmail.org/plugins/
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.7
+DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		neil@darlow.co.uk
-COMMENT=		Adds multi-site-hosting capabilities to SquirrelMail
+MAINTAINER=	neil@darlow.co.uk
+COMMENT=	Adds multi-site-hosting capabilities to SquirrelMail
 
-RUN_DEPENDS=		squirrelmail-compatibility-plugin>=2.0.14:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+USE_PERL5_RUN=	yes
+USE_SM_COMPAT=	yes
 
-USE_PERL5_RUN=		yes
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.pre.mk>
-.include "../squirrelmail/bsd.squirrelmail.mk"
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+
+# We need to rearrange, install and cleanup documentation pre-install
+# because bsd.squirrelmail.mk installs everything under ${WRKSRC}/${PORTNAME}.
+pre-install::
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/${PORTNAME}/docs \
+	&& ${RM} .htaccess index.php \
+	&& ${MKDIR} ${DOCSDIR} \
+	&& ${COPYTREE_SHARE} \* ${DOCSDIR} \
+	&& cd ${WRKSRC}/${PORTNAME} \
+	&& ${RM} -rf README docs
+.else
+	cd ${WRKSRC}/${PORTNAME} && ${RM} -rf README docs
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-vlogin-plugin/distinfo b/mail/squirrelmail-vlogin-plugin/distinfo
index e340fa6710e3..c3662cd59fd6 100644
--- a/mail/squirrelmail-vlogin-plugin/distinfo
+++ b/mail/squirrelmail-vlogin-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/vlogin-3.10.1-1.2.7.tar.gz) = 4fd840c950bdc4d957e53937370ea5d6
-SHA256 (squirrelmail/vlogin-3.10.1-1.2.7.tar.gz) = 5e1aa6eda401dfe70c1b4dddddf37c6bcc508082657b3b3fb96c52288f5ae947
-SIZE (squirrelmail/vlogin-3.10.1-1.2.7.tar.gz) = 70058
+MD5 (squirrelmail/vlogin-3.10.2-1.2.7.tar.gz) = da2098ca1ada1fca40ad28006b24b081
+SHA256 (squirrelmail/vlogin-3.10.2-1.2.7.tar.gz) = 5ef49e8882a837583309290ae5ebac7a81b8d4ae3e2475c43f0ce61bd44be4f0
+SIZE (squirrelmail/vlogin-3.10.2-1.2.7.tar.gz) = 69345
diff --git a/mail/squirrelmail-vlogin-plugin/pkg-plist b/mail/squirrelmail-vlogin-plugin/pkg-plist
index ab7935d18907..f67db8303be4 100644
--- a/mail/squirrelmail-vlogin-plugin/pkg-plist
+++ b/mail/squirrelmail-vlogin-plugin/pkg-plist
@@ -1,35 +1,36 @@
 @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
-%%SQUIRRELDIR%%/plugins/vlogin/data/service_levels/index.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/service_levels/premium_example.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/domains/example.com.vlogin.config.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/domains/index.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/index.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/.htaccess
 %%SQUIRRELDIR%%/plugins/vlogin/data/config_default.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/config_example.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/config_example_per_user_functions_only.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/config_example_service_level_functions_only.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/config_example_typical.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/domains/example.com.vlogin.config.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/domains/index.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/hostmap_example.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/index.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/meta_config.add_default_domain.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/meta_config_example.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/meta_config.strip_domain.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/meta_config_example.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/service_levels/index.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/service_levels/premium_example.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/service_levels_example.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/users_example.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/users.paul.php
-%%SQUIRRELDIR%%/plugins/vlogin/CONFIGURATION
-%%SQUIRRELDIR%%/plugins/vlogin/COPYING
-%%SQUIRRELDIR%%/plugins/vlogin/INSTALL
-%%SQUIRRELDIR%%/plugins/vlogin/README
 %%SQUIRRELDIR%%/plugins/vlogin/functions.php
 %%SQUIRRELDIR%%/plugins/vlogin/index.php
+%%SQUIRRELDIR%%/plugins/vlogin/make_release.sh
 %%SQUIRRELDIR%%/plugins/vlogin/per_user_functions.php
 %%SQUIRRELDIR%%/plugins/vlogin/service_level_functions.php
 %%SQUIRRELDIR%%/plugins/vlogin/setup.php
 %%SQUIRRELDIR%%/plugins/vlogin/sql_settings_lookup.php
-%%SQUIRRELDIR%%/plugins/vlogin/make_release.sh
 %%SQUIRRELDIR%%/plugins/vlogin/version
+%%PORTDOCS%%%%DOCSDIR%%/CONFIGURATION
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
 @dirrmtry %%SQUIRRELDIR%%/plugins/vlogin/data/service_levels
 @dirrmtry %%SQUIRRELDIR%%/plugins/vlogin/data/domains
 @dirrmtry %%SQUIRRELDIR%%/plugins/vlogin/data
 @dirrmtry %%SQUIRRELDIR%%/plugins/vlogin
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi