- Update to 1.4

- Use bsd.squirrelmail.mk framework

Notified by:	portscout via miwibot

2 files changed, 5 insertions, 62 deletions

diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index 30459ab9f635..0462775383e0 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	secure_login
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX=	squirrelmail-
@@ -18,64 +17,8 @@ DIST_SUBDIR=	squirrelmail
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	This plugin will automatically turn on SSL security during login
 
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
-
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
-
-.ifdef SQUIRRELDIR
-PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
-SUB_LIST+=	"SQUIRRELDIR=${SQUIRRELDIR}"
-.else
-.ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=	${PREFIX}/www/squirrelmail
-PLIST_SUB+=	SQUIRRELDIR=www/squirrelmail
-SUB_LIST+=	"SQUIRRELDIR=www/squirrelmail"
-.else
-SQUIRRELDIR=	${PREFIX}/squirrelmail
-PLIST_SUB+=	SQUIRRELDIR=squirrelmail
-SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
-.endif
-.endif
-PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
 SUB_FILES=	pkg-message
 
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
 .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
-	@${ECHO} ""
-	@${CAT} ${PKGMESSAGE}
-
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-secure_login-plugin/distinfo b/mail/squirrelmail-secure_login-plugin/distinfo
index d9a8e365c3e2..5d586a4a7b44 100644
--- a/mail/squirrelmail-secure_login-plugin/distinfo
+++ b/mail/squirrelmail-secure_login-plugin/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (squirrelmail/secure_login-1.4-1.2.8.tar.gz) = e511a8e78beab042b123d468ea7e0df9
+SHA256 (squirrelmail/secure_login-1.4-1.2.8.tar.gz) = b6ede807a79c9b5300b43565c920570c583a1cc4d339bcea715c32196518837e
+SIZE (squirrelmail/secure_login-1.4-1.2.8.tar.gz) = 16993