3 files changed, 20 insertions, 15 deletions

diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index 9e54a71cd199..50665f011338 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -5,21 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTNAME=	secure_login
+PORTVERSION=	1.3
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
-DISTNAME=	${SQUIRREL_PLUGIN_NAME}-1.2-${PORTVERSION}
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.8
 DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	This plugin will automatically turn on SSL security during login
 
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-		${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
-SQUIRREL_PLUGIN_NAME=	secure_login
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
@@ -35,6 +35,7 @@ PLIST_SUB+=	SQUIRRELDIR=squirrelmail
 SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
 .endif
 .endif
+PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 
 SUB_FILES=	pkg-message
 
@@ -44,6 +45,8 @@ USE_PERL5_BUILD=	yes
 USE_PHP=		yes
 WANT_PHP_WEB=		yes
 
+.include <bsd.port.pre.mk>
+
 pre-everything::
 	@${ECHO} ""
 .ifndef WITHOUT_ACTIVATE
@@ -74,4 +77,4 @@ post-install:
 	@${ECHO} ""
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-secure_login-plugin/distinfo b/mail/squirrelmail-secure_login-plugin/distinfo
index 2176b660005c..d9a8e365c3e2 100644
--- a/mail/squirrelmail-secure_login-plugin/distinfo
+++ b/mail/squirrelmail-secure_login-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/secure_login-1.2-1.2.8.tar.gz) = 73d2c111579e2fad17c289f62e0be855
-SHA256 (squirrelmail/secure_login-1.2-1.2.8.tar.gz) = b3cf5fbf15206ca9f0e00b573408fc78b287fbb2e0d5fcbba93fe6e75ceb4a0b
-SIZE (squirrelmail/secure_login-1.2-1.2.8.tar.gz) = 6361
+MD5 (squirrelmail/secure_login-1.3-1.2.8.tar.gz) = 3dcd0c5bca4053621226ba7df955e51f
+SHA256 (squirrelmail/secure_login-1.3-1.2.8.tar.gz) = 0c44112114e1d3f2b8615b5b586631fb50fb1877037a438c37f4b890f46b0ccc
+SIZE (squirrelmail/secure_login-1.3-1.2.8.tar.gz) = 16075
diff --git a/mail/squirrelmail-secure_login-plugin/pkg-plist b/mail/squirrelmail-secure_login-plugin/pkg-plist
index ad22eeee744e..a08a58b37b9f 100644
--- a/mail/squirrelmail-secure_login-plugin/pkg-plist
+++ b/mail/squirrelmail-secure_login-plugin/pkg-plist
@@ -1,10 +1,12 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin secure_login; fi
+@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
+%%SQUIRRELDIR%%/plugins/secure_login/COPYING
 %%SQUIRRELDIR%%/plugins/secure_login/functions.php
 %%SQUIRRELDIR%%/plugins/secure_login/README
 %%SQUIRRELDIR%%/plugins/secure_login/setup.php
 %%SQUIRRELDIR%%/plugins/secure_login/index.php
+%%SQUIRRELDIR%%/plugins/secure_login/make_release.sh
 %%SQUIRRELDIR%%/plugins/secure_login/version
 %%SQUIRRELDIR%%/plugins/secure_login/INSTALL
-%%SQUIRRELDIR%%/plugins/secure_login/config.php.sample
-@dirrm %%SQUIRRELDIR%%/plugins/secure_login
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin secure_login; fi
+%%SQUIRRELDIR%%/plugins/secure_login/config.sample.php
+@dirrmtry %%SQUIRRELDIR%%/plugins/secure_login
+@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi