- Update to 2.2

- Implement bsd.squirrelmail.mk common include

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

3 files changed, 10 insertions, 58 deletions

diff --git a/mail/squirrelmail-password_forget-plugin/Makefile b/mail/squirrelmail-password_forget-plugin/Makefile
index fbf64f0a36e1..21c3803f3fc7 100644
--- a/mail/squirrelmail-password_forget-plugin/Makefile
+++ b/mail/squirrelmail-password_forget-plugin/Makefile
@@ -5,69 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	password_forget
-PORTVERSION=	2.1
-PORTREVISION=	3
+PORTVERSION=	2.2
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX=	squirrelmail-
 PKGNAMESUFFIX=	-plugin
-DISTNAME=	${SQUIRREL_PLUGIN_NAME}.${PORTVERSION}-1.0.1
+DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.0.1
 DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	neil@darlow.co.uk
 COMMENT=	Prevent reuse of login details by browsers at public terminals
 
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-		${SQUIRRELDIR}/plugins/compatibility:${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=	${SQUIRRELDIR}/plugins/compatibility:${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-password_forget-plugin/distinfo b/mail/squirrelmail-password_forget-plugin/distinfo
index 4916c5fbaa73..37d5bb3385bb 100644
--- a/mail/squirrelmail-password_forget-plugin/distinfo
+++ b/mail/squirrelmail-password_forget-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/password_forget.2.1-1.0.1.tar.gz) = 33ffd387d5190b690d53358cb3b4e691
-SHA256 (squirrelmail/password_forget.2.1-1.0.1.tar.gz) = c9297692550a29dfb9b1760fe4837a2fb8c451d472dd5493d51f3631772e2ed1
-SIZE (squirrelmail/password_forget.2.1-1.0.1.tar.gz) = 8971
+MD5 (squirrelmail/password_forget-2.2-1.0.1.tar.gz) = 96568816f6ef310a5413d562befb7007
+SHA256 (squirrelmail/password_forget-2.2-1.0.1.tar.gz) = 88c65779d8f8dd3259240f228f90f844d3b88735c2fd357897787844a2b0ba08
+SIZE (squirrelmail/password_forget-2.2-1.0.1.tar.gz) = 12157
diff --git a/mail/squirrelmail-password_forget-plugin/pkg-plist b/mail/squirrelmail-password_forget-plugin/pkg-plist
index 9a71ebe7c009..52a311b81806 100644
--- a/mail/squirrelmail-password_forget-plugin/pkg-plist
+++ b/mail/squirrelmail-password_forget-plugin/pkg-plist
@@ -2,9 +2,11 @@
 %%SQUIRRELDIR%%/plugins/password_forget/COPYING
 %%SQUIRRELDIR%%/plugins/password_forget/INSTALL
 %%SQUIRRELDIR%%/plugins/password_forget/README
-%%SQUIRRELDIR%%/plugins/password_forget/config.php.sample
+%%SQUIRRELDIR%%/plugins/password_forget/config_default.php
+%%SQUIRRELDIR%%/plugins/password_forget/config_example.php
 %%SQUIRRELDIR%%/plugins/password_forget/functions.php
 %%SQUIRRELDIR%%/plugins/password_forget/index.php
+%%SQUIRRELDIR%%/plugins/password_forget/make_release.sh
 %%SQUIRRELDIR%%/plugins/password_forget/setup.php
 %%SQUIRRELDIR%%/plugins/password_forget/version
 @dirrmtry %%SQUIRRELDIR%%/plugins/password_forget