- Update to 2.3.4

PR:		ports/119267
Submitted by:	Gerrit Beine <gerrit.beine gmx.de> (maintainer)

5 files changed, 36 insertions, 20 deletions

diff --git a/mail/squirrelmail-multilogin-plugin/Makefile b/mail/squirrelmail-multilogin-plugin/Makefile
index 665bd80abba..45e0cfa339c 100644
--- a/mail/squirrelmail-multilogin-plugin/Makefile
+++ b/mail/squirrelmail-multilogin-plugin/Makefile
@@ -4,20 +4,22 @@
 #
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		2.3.2
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.2
-DIST_SUBDIR=		squirrelmail
+PORTNAME=	multilogin
+PORTVERSION=	2.3.4
+CATEGORIES=	mail www
+MASTER_SITES=	http://www.squirrelmail.org/plugins/
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.9
+DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		gerrit.beine@gmx.de
-COMMENT=		Allows manual selection of login server on login page
+MAINTAINER=	gerrit.beine@gmx.de
+COMMENT=	Allows manual selection of login server on login page
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-			${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
+		${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
-SQUIRREL_PLUGIN_NAME=	multilogin
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
@@ -64,7 +66,7 @@ post-install:
 .if exists( ${SQUIRRELDIR}/config/config.php )
 	@${ECHO} "Activating plug-in in SquirrelMail"
 	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-	cd ${SQUIRRELDIR} && ${PATCH} -p0 < plugins/multilogin/patches/multilogin-squirrelmail-1.4.6.diff
+	cd ${SQUIRRELDIR} && ${PATCH} -p0 < plugins/${SQUIRREL_PLUGIN_NAME}/patches/multilogin-squirrelmail-1.4.12.diff
 .endif
 .else
 	@${ECHO} "To activate the plug-in in SquirrelMail use"
diff --git a/mail/squirrelmail-multilogin-plugin/distinfo b/mail/squirrelmail-multilogin-plugin/distinfo
index dbd477bfd1a..848e96cb7da 100644
--- a/mail/squirrelmail-multilogin-plugin/distinfo
+++ b/mail/squirrelmail-multilogin-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/multilogin-2.3.2-1.2.tar.gz) = 7784bdc9852973a3fbb06c6fafacbce5
-SHA256 (squirrelmail/multilogin-2.3.2-1.2.tar.gz) = f5bb58f30b51dc56e39467a965663495ae161a9e9194a2c4fc8163c72074b6d3
-SIZE (squirrelmail/multilogin-2.3.2-1.2.tar.gz) = 15391
+MD5 (squirrelmail/multilogin-2.3.4-1.2.9.tar.gz) = 2cda505b54142f38ef11ea886a93b3aa
+SHA256 (squirrelmail/multilogin-2.3.4-1.2.9.tar.gz) = a888a2cc4fcf7ea4b86426d369feddc1adb5b44ba8dedc367d3b5210ae2a4e70
+SIZE (squirrelmail/multilogin-2.3.4-1.2.9.tar.gz) = 19170
diff --git a/mail/squirrelmail-multilogin-plugin/files/pkg-message.in b/mail/squirrelmail-multilogin-plugin/files/pkg-message.in
index af75254c740..5a52e022b02 100644
--- a/mail/squirrelmail-multilogin-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-multilogin-plugin/files/pkg-message.in
@@ -1,5 +1,5 @@
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/multilogin/config.php.sample
+%%PREFIX%%/%%SQUIRRELDIR%%/plugins/multilogin/config.sample.php
 to
 %%PREFIX%%/%%SQUIRRELDIR%%/plugins/multilogin/config.php
 and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-multilogin-plugin/pkg-descr b/mail/squirrelmail-multilogin-plugin/pkg-descr
index ba2bc2d7b41..4906eb8ea7b 100644
--- a/mail/squirrelmail-multilogin-plugin/pkg-descr
+++ b/mail/squirrelmail-multilogin-plugin/pkg-descr
@@ -1,4 +1,4 @@
 This plugin displays a pull-down select box with IMAP server choices on the
 login page. The user will be logged in using the IMAP server that is chosen.
 
-WWW: http://www.squirrelmail.org
+WWW: http://www.squirrelmail.org/plugin_view.php?id=148
diff --git a/mail/squirrelmail-multilogin-plugin/pkg-plist b/mail/squirrelmail-multilogin-plugin/pkg-plist
index 573fd0bd730..05ceaaaa309 100644
--- a/mail/squirrelmail-multilogin-plugin/pkg-plist
+++ b/mail/squirrelmail-multilogin-plugin/pkg-plist
@@ -1,15 +1,26 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin multilogin; fi
+@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
+%%SQUIRRELDIR%%/plugins/multilogin/patches/index.php
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.1.diff
+%%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.12.diff
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.2.diff
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.3a.diff
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.4.diff
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.5.diff
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.6.diff
+%%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.7.diff
+%%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.8.diff
+%%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.4.9.diff
 %%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.5.0.diff
+%%SQUIRRELDIR%%/plugins/multilogin/patches/multilogin-squirrelmail-1.5.1.diff
+%%SQUIRRELDIR%%/plugins/multilogin/templates/default_smarty/index.php
+%%SQUIRRELDIR%%/plugins/multilogin/templates/default_smarty/login_form.tpl
+%%SQUIRRELDIR%%/plugins/multilogin/templates/default/index.php
+%%SQUIRRELDIR%%/plugins/multilogin/templates/default/login_form.tpl
+%%SQUIRRELDIR%%/plugins/multilogin/templates/index.php
 %%SQUIRRELDIR%%/plugins/multilogin/COPYING
 %%SQUIRRELDIR%%/plugins/multilogin/INSTALL
 %%SQUIRRELDIR%%/plugins/multilogin/README
-%%SQUIRRELDIR%%/plugins/multilogin/config.php.sample
+%%SQUIRRELDIR%%/plugins/multilogin/config.sample.php
 %%SQUIRRELDIR%%/plugins/multilogin/functions.php
 %%SQUIRRELDIR%%/plugins/multilogin/index.php
 %%SQUIRRELDIR%%/plugins/multilogin/setup.php
@@ -17,6 +28,9 @@
 %%SQUIRRELDIR%%/plugins/multilogin/make_release.sh
 %%SQUIRRELDIR%%/plugins/multilogin/multilogin.pot
 %%SQUIRRELDIR%%/plugins/multilogin/version
+@dirrm %%SQUIRRELDIR%%/plugins/multilogin/templates/default_smarty
+@dirrm %%SQUIRRELDIR%%/plugins/multilogin/templates/default
+@dirrm %%SQUIRRELDIR%%/plugins/multilogin/templates
 @dirrm %%SQUIRRELDIR%%/plugins/multilogin/patches
 @dirrmtry %%SQUIRRELDIR%%/plugins/multilogin/
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin multilogin; fi
+@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi