- Update to 0.6

- Take maintainership

Feature safe:	yes

3 files changed, 36 insertions, 80 deletions

diff --git a/mail/squirrelmail-email_footer-plugin/Makefile b/mail/squirrelmail-email_footer-plugin/Makefile
index 9ce289466c93..2fed4a9a3f8b 100644
--- a/mail/squirrelmail-email_footer-plugin/Makefile
+++ b/mail/squirrelmail-email_footer-plugin/Makefile
@@ -4,73 +4,18 @@
 #
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		0.5
-PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.2
-DIST_SUBDIR=		squirrelmail
+PORTNAME=	email_footer
+PORTVERSION=	0.6
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.2
+DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Automatically appends footer to SquirrelMail-generated emails
+MAINTAINER=	tabthorpe@FreeBSD.org
+COMMENT=	Automatically appends footer to SquirrelMail-generated emails
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-			${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
-SQUIRREL_PLUGIN_NAME=	email_footer
+LICENSE=	GPLv2
 
-.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
-
-SUB_FILES=		pkg-message
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
-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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-email_footer-plugin/distinfo b/mail/squirrelmail-email_footer-plugin/distinfo
index 200462ba8d66..da416d56457c 100644
--- a/mail/squirrelmail-email_footer-plugin/distinfo
+++ b/mail/squirrelmail-email_footer-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squirrelmail/email_footer-0.5-1.4.2.tar.gz) = a8df3bdbffd559c8407a69f04f348a23b20274a7757e7957a1b3c529eda6a761
-SIZE (squirrelmail/email_footer-0.5-1.4.2.tar.gz) = 12045
+SHA256 (squirrelmail/email_footer-0.6-1.4.2.tar.gz) = 8a79fadcb1c5e8a25055263c92f728cc82ab61d7dc08e867f9c7072e41dcccbe
+SIZE (squirrelmail/email_footer-0.6-1.4.2.tar.gz) = 16818
diff --git a/mail/squirrelmail-email_footer-plugin/pkg-plist b/mail/squirrelmail-email_footer-plugin/pkg-plist
index 711a3e98ae92..57ad3c10e9d1 100644
--- a/mail/squirrelmail-email_footer-plugin/pkg-plist
+++ b/mail/squirrelmail-email_footer-plugin/pkg-plist
@@ -1,12 +1,23 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin email_footer; fi
-%%SQUIRRELDIR%%/plugins/email_footer/COPYING
-%%SQUIRRELDIR%%/plugins/email_footer/INSTALL
-%%SQUIRRELDIR%%/plugins/email_footer/README
-%%SQUIRRELDIR%%/plugins/email_footer/config.sample.php
-%%SQUIRRELDIR%%/plugins/email_footer/functions.php
-%%SQUIRRELDIR%%/plugins/email_footer/index.php
-%%SQUIRRELDIR%%/plugins/email_footer/make_release.sh
-%%SQUIRRELDIR%%/plugins/email_footer/setup.php
-%%SQUIRRELDIR%%/plugins/email_footer/version
-@dirrm %%SQUIRRELDIR%%/plugins/email_footer/
-@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin email_footer; fi
+@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/README
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config_default.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config_example.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/docs/.htaccess
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/docs/COPYING
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/docs/INSTALL
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/docs/README
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/docs/index.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/functions.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/index.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/.htaccess
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/%%SQUIRREL_PLUGIN_NAME%%.pot
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/getpot
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/index.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/make_release.sh
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/setup.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/version
+@dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale
+@dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/docs
+@dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/
+@dirrmtry %%SQUIRRELDIR%%/plugins
+@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi