- Update to 3.10.1

- Implement bsd.squirrelmail.mk common include

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

3 files changed, 19 insertions, 69 deletions

diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index f8255ca33d28..0e4169efe009 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		vlogin
-PORTVERSION=		3.9.2
-PORTREVISION=	1
+PORTVERSION=		3.10.1
 CATEGORIES=		mail www
 MASTER_SITES=		http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX=		squirrelmail-
@@ -17,57 +16,8 @@ DIST_SUBDIR=		squirrelmail
 MAINTAINER=		neil@darlow.co.uk
 COMMENT=		Adds multi-site-hosting capabilities to SquirrelMail
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-			squirrelmail-compatibility-plugin>=2.0.5:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
-
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
-
-.ifdef SQUIRRELDIR
-PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
-.else
-.	ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=		${PREFIX}/www/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=www/squirrelmail
-.	else
-SQUIRRELDIR=		${PREFIX}/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=squirrelmail
-.	endif
-.endif
-PLIST_SUB+=		SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-WANT_PHP_WEB=		yes
+RUN_DEPENDS=		squirrelmail-compatibility-plugin>=2.0.14:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
 .include <bsd.port.pre.mk>
-
-pre-everything::
-	@${ECHO} ""
-.ifndef WITHOUT_ACTIVATE
-	@${ECHO} "Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you don't want to automatically activate the plug-in set"
-	@${ECHO} "WITHOUT_ACTIVATE=yes"
-.else
-	@${ECHO} "NOT Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you want to automatically activate the plug-in unset"
-	@${ECHO} "WITHOUT_ACTIVATE"
-.endif
-	@${ECHO} ""
-
-do-install:
-	${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
-
-post-install:
-.ifndef WITHOUT_ACTIVATE
-.if exists( ${SQUIRRELDIR}/config/config.php )
-	@${ECHO} "Activating plug-in in SquirrelMail"
-	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-.endif
-.else
-	@${ECHO} "To activate the plug-in in SquirrelMail use"
-	@${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
-.endif
-
+.include "../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-vlogin-plugin/distinfo b/mail/squirrelmail-vlogin-plugin/distinfo
index 5ca699b68c9b..e340fa6710e3 100644
--- a/mail/squirrelmail-vlogin-plugin/distinfo
+++ b/mail/squirrelmail-vlogin-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/vlogin-3.9.2-1.2.7.tar.gz) = 2903bfc71c935adce42c959d622928e2
-SHA256 (squirrelmail/vlogin-3.9.2-1.2.7.tar.gz) = b0881ee623f9aa2b205b6b9ed1e15a52fb76257c902c83aacdefba235fb5da10
-SIZE (squirrelmail/vlogin-3.9.2-1.2.7.tar.gz) = 57003
+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
diff --git a/mail/squirrelmail-vlogin-plugin/pkg-plist b/mail/squirrelmail-vlogin-plugin/pkg-plist
index c1c5b86db784..ab7935d18907 100644
--- a/mail/squirrelmail-vlogin-plugin/pkg-plist
+++ b/mail/squirrelmail-vlogin-plugin/pkg-plist
@@ -1,22 +1,22 @@
 @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/.htaccess
 %%SQUIRRELDIR%%/plugins/vlogin/data/service_levels/index.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/service_levels/premium.sample.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/domains/.htaccess
-%%SQUIRRELDIR%%/plugins/vlogin/data/domains/domain.com.vlogin.config.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/.htaccess
 %%SQUIRRELDIR%%/plugins/vlogin/data/index.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/config.sample.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/config.sample.per_user_functions_only.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/config.sample.service_level_functions_only.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/config.sample.typical.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/hostmap.sample.php
+%%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/hostmap_example.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/meta_config.add_default_domain.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/meta_config.sample.php
+%%SQUIRRELDIR%%/plugins/vlogin/data/meta_config_example.php
 %%SQUIRRELDIR%%/plugins/vlogin/data/meta_config.strip_domain.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/users.sample.php
-%%SQUIRRELDIR%%/plugins/vlogin/data/service_levels.sample.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