Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/squirrelmail-pupdate-plugin/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	4 Jul 2006 23:04:48 -0000	1.1
+++ Makefile	15 Mar 2007 02:18:21 -0000
@@ -5,20 +5,22 @@
 # $FreeBSD: ports/mail/squirrelmail-pupdate-plugin/Makefile,v 1.1 2006/07/04 23:04:48 garga Exp $
 #
 
-PORTNAME=	squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
+PORTNAME=	pupdate
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
-DISTNAME=	${SQUIRREL_PLUGIN_NAME}.${PORTVERSION}-1.4.2
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.2
 DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	Checks for plugin updates by parsing the SM site
 
-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=	pupdate
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
@@ -34,6 +36,7 @@
 SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
 .endif
 .endif
+PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 
 SUB_FILES=	pkg-message
 
@@ -43,6 +46,8 @@
 USE_PHP=		yes
 WANT_PHP_WEB=		yes
 
+.include <bsd.port.pre.mk>
+
 pre-everything::
 	@${ECHO} ""
 .ifndef WITHOUT_ACTIVATE
@@ -73,4 +78,4 @@
 	@${ECHO} ""
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/squirrelmail-pupdate-plugin/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	4 Jul 2006 23:04:48 -0000	1.1
+++ pkg-plist	15 Mar 2007 02:18:21 -0000
@@ -1,4 +1,4 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin pupdate; fi
+@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
 %%SQUIRRELDIR%%/plugins/pupdate/docs/index.php
 %%SQUIRRELDIR%%/plugins/pupdate/docs/INSTALL
 %%SQUIRRELDIR%%/plugins/pupdate/docs/README
@@ -17,4 +17,4 @@
 @dirrm %%SQUIRRELDIR%%/plugins/pupdate/docs
 @dirrm %%SQUIRRELDIR%%/plugins/pupdate/udata
 @dirrm %%SQUIRRELDIR%%/plugins/pupdate
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin pupdate; fi
+@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi