Create a generic PKGMESSAGE, and use it where appropriate.

Make sure that bsd.port.pre.mk is included before bsd.squirrelmail.mk.

For ports with maintainers, I haven't switched you to the new
PKGMESSAGE, but I have corrected paths in pkg-message.in where
necessary. I also got a little over-zealous in cleaning redundant
definitions from the headers. Apologies in advance if this rubs
you the wrong way.

3 files changed, 5 insertions, 44 deletions

diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index 438ba1cb6142..777750e08cde 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -4,25 +4,22 @@
 PORTNAME=		sasql
 PORTVERSION=	3.2.0
 PORTREVISION=	1
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit SpamAssassin settings stored in an SQL DB
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
 
 post-patch:
-	@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/*.orig ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/.cvsignore
+	@${REINPLACE_CMD} -e "s/\(\$$imap_server_type == \'cyrus\'\)/\1 || \$$imap_server_type == \'courier\'/g" \
+		-e 's/session_register/sqsession_register/g' \
+		${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/sasql_hooks.php
+	-@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/*.bak ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/.cvsignore
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
diff --git a/mail/squirrelmail-sasql-plugin/files/patch-sasql_hooks.php b/mail/squirrelmail-sasql-plugin/files/patch-sasql_hooks.php
deleted file mode 100644
index 3867c8b945ce..000000000000
--- a/mail/squirrelmail-sasql-plugin/files/patch-sasql_hooks.php
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur sasql.orig/sasql_hooks.php sasql/sasql_hooks.php
---- sasql.orig/sasql_hooks.php	2006-11-09 21:29:21.000000000 +0100
-+++ sasql/sasql_hooks.php	2006-12-10 12:13:12.000000000 +0100
-@@ -74,23 +74,23 @@
- 
-     if (!sqimap_mailbox_exists($imap_stream, $mailbox)) {
-       sqimap_mailbox_create($imap_stream, $mailbox, '');
--      if ($imap_server_type == 'cyrus') {
-+      if ($imap_server_type == 'cyrus' || $imap_server_type == 'courier') {
- 	$boxes = sqimap_mailbox_list($imap_stream);
-       } else {
- 	$boxes = sqimap_mailbox_list($imap_stream, true);
-       }
--      session_register($boxes, 'boxesnew');
-+      sqsession_register($boxes, 'boxesnew');
-       // echo "<foo sasql created: $box />";
-     }
- 
-     if (!sqimap_mailbox_is_subscribed($imap_stream, $mailbox)) {
-       sqimap_subscribe($imap_stream, $mailbox);
--      if ($imap_server_type == 'cyrus') {
-+      if ($imap_server_type == 'cyrus' || $imap_server_type == 'courier') {
- 	$boxes = sqimap_mailbox_list($imap_stream);
-       } else {
- 	$boxes = sqimap_mailbox_list($imap_stream, true);
-       }
--      session_register($boxes, 'boxesnew');
-+      sqsession_register($boxes, 'boxesnew');
-       // echo "<foo sasql subscried: $box />";
-     }
-   }
diff --git a/mail/squirrelmail-sasql-plugin/files/pkg-message.in b/mail/squirrelmail-sasql-plugin/files/pkg-message.in
deleted file mode 100644
index d7c91e1439a2..000000000000
--- a/mail/squirrelmail-sasql-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%SQUIRRELDIR%%/plugins/sasql/sasql_conf.php.dist
-to
-%%SQUIRRELDIR%%/plugins/sasql/sasql_conf.php
-and edit the configuration to meet your needs.