ports/112166: squirrelmail-password_forget-plugin auto-install/remove fix

[Neil Darlow]

>Number:         112166
>Category:       ports
>Synopsis:       squirrelmail-password_forget-plugin auto-install/remove fix
>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 Apr 26 20:10:13 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Neil Darlow
>Release:        FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD router.darlow.co.uk 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #0: Sun Mar 18 20:52:24 GMT 2007 root at router.darlow.co.uk:/usr/obj/usr/src/sys/ROUTER i386 
>Description:
Modify port to include bsd.port.(pre|post).mk to fix auto-install/remove
		Adopt new PKGNAMEPREFIX-PORTNAME-PKGNAMESUFFIX standard for squirrelmail ports
		Bump PORTREVISION to reflect user-visible behaviour change of port
>How-To-Repeat:
N/A
>Fix:
Patch follows.
diff -ur mail/squirrelmail-password_forget-plugin.orig/Makefile mail/squirrelmail-password_forget-plugin/Makefile
--- mail/squirrelmail-password_forget-plugin.orig/Makefile	Fri Jan 26 09:41:20 2007
+++ mail/squirrelmail-password_forget-plugin/Makefile	Thu Apr 26 20:12:31 2007
@@ -4,12 +4,13 @@
 #
 # $FreeBSD: ports/mail/squirrelmail-password_forget-plugin/Makefile,v 1.3 2007/01/25 22:58:54 miwi Exp $
 
-PORTNAME=	squirrelmail
+PORTNAME=	password_forget
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMESUFFIX=	-${SQUIRREL_PLUGIN_NAME}-plugin
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}.${PORTVERSION}-1.0.1
 DIST_SUBDIR=	squirrelmail
 
@@ -19,7 +20,7 @@
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
 		${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
-SQUIRREL_PLUGIN_NAME=	password_forget
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
@@ -32,12 +33,15 @@
 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
 
+.include <bsd.port.pre.mk>
+
 pre-everything::
 	@${ECHO} ""
 .ifndef WITHOUT_ACTIVATE
@@ -66,4 +70,4 @@
 	@${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ur mail/squirrelmail-password_forget-plugin.orig/pkg-plist mail/squirrelmail-password_forget-plugin/pkg-plist
--- mail/squirrelmail-password_forget-plugin.orig/pkg-plist	Mon Dec  4 21:56:46 2006
+++ mail/squirrelmail-password_forget-plugin/pkg-plist	Thu Apr 26 20:14:01 2007
@@ -1,4 +1,4 @@
- at unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin password_forget; fi
+ at unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
 %%SQUIRRELDIR%%/plugins/password_forget/COPYING
 %%SQUIRRELDIR%%/plugins/password_forget/INSTALL
 %%SQUIRRELDIR%%/plugins/password_forget/README
@@ -8,4 +8,4 @@
 %%SQUIRRELDIR%%/plugins/password_forget/setup.php
 %%SQUIRRELDIR%%/plugins/password_forget/version
 @dirrmtry %%SQUIRRELDIR%%/plugins/password_forget
- at exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin password_forget; fi
+ at exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
>Release-Note:
>Audit-Trail:
>Unformatted: