ports/110311: [MAINTAINER] mail/squirrelmail-timeout_user-plugin: fix automatic activation

[Thomas Abthorpe]

>Number:         110311
>Category:       ports
>Synopsis:       [MAINTAINER] mail/squirrelmail-timeout_user-plugin: fix automatic activation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 15 03:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Abthorpe
>Release:        FreeBSD 6.2-RELEASE-p1 i386
>Organization:
GoodKing.Ca
>Environment:
System: FreeBSD goodking.goodking.ca 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #2: Thu Feb 15 14:49:58 EST 2007
>Description:
- fix automatic activation
- move toward new SM plugin configuration standard
- bump PORTREVISION

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- squirrelmail-timeout_user-plugin-1.1.1_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/squirrelmail-timeout_user-plugin/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/mail/squirrelmail-timeout_user-plugin/Makefile
--- /usr/ports/mail/squirrelmail-timeout_user-plugin/Makefile	Thu Jan 25 17:58:44 2007
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/mail/squirrelmail-timeout_user-plugin/Makefile	Wed Mar 14 22:05:07 2007
@@ -5,12 +5,14 @@
 # $FreeBSD: ports/mail/squirrelmail-timeout_user-plugin/Makefile,v 1.2 2007/01/25 22:58:44 miwi Exp $
 #
 
-PORTNAME=	squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
+PORTNAME=	timeout_user
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
-DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-0.5
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}-${PORTVERSION}-0.5
 DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	thomas at goodking.ca
@@ -19,7 +21,7 @@
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
 		${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
-SQUIRREL_PLUGIN_NAME=	timeout_user
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
@@ -35,6 +37,7 @@
 SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
 .endif
 .endif
+PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
@@ -42,6 +45,8 @@
 USE_PHP=		yes
 WANT_PHP_WEB=		yes
 
+.include <bsd.port.pre.mk>
+
 pre-everything::
 	@${ECHO} ""
 .ifndef WITHOUT_ACTIVATE
@@ -71,4 +76,4 @@
 .endif
 	@${ECHO} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/mail/squirrelmail-timeout_user-plugin/pkg-plist /usr/local/tinderbox/portstrees/FreeBSD/ports/mail/squirrelmail-timeout_user-plugin/pkg-plist
--- /usr/ports/mail/squirrelmail-timeout_user-plugin/pkg-plist	Thu Jan 25 17:58:44 2007
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/mail/squirrelmail-timeout_user-plugin/pkg-plist	Wed Mar 14 22:06:00 2007
@@ -1,4 +1,4 @@
- at unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin timeout_user; fi
+ at unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
 %%SQUIRRELDIR%%/plugins/timeout_user/version
 %%SQUIRRELDIR%%/plugins/timeout_user/README
 %%SQUIRRELDIR%%/plugins/timeout_user/index.php
@@ -7,4 +7,4 @@
 %%SQUIRRELDIR%%/plugins/timeout_user/functions.php
 %%SQUIRRELDIR%%/plugins/timeout_user/config.php
 @dirrm %%SQUIRRELDIR%%/plugins/timeout_user
- at exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin timeout_user; fi
+ at exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
--- squirrelmail-timeout_user-plugin-1.1.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: