- Add rc-script for dbmail-timsieved

- Fix potential problem with LDFLAGS
- Edit pkg-descr to make portlint a bit happier

PR:             ports/106762
Submitted by:   Mark Starovoytov <mark_sf@kikg.ifmo.r (maintainer)

3 files changed, 37 insertions, 7 deletions

diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 31d1f49e380c..3ed0e11ebd50 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	dbmail
 PORTVERSION=	2.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.1/
 
 MAINTAINER=	mark_sf@kikg.ifmo.ru
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
-CONFLICTS=	dbmail-*-2.0.*
+CONFLICTS=	dbmail-*-2.0.* dbmail-2.2.*
 
 OPTIONS=	MYSQL		"Build with MySQL support" on \
 		POSTGRESQL	"Build with PostgreSQL support"	off \
@@ -28,14 +28,14 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	YES
 USE_GCC=	3.2+
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
+USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
 
 LIB_DEPENDS+=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
 USE_GNOME=	glib20
 USE_OPENSSL=	YES
 
-CFLAGS+=	-fPIC -I${LOCALBASE}/include -L${LOCALBASE}/lib
-LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 
 PORTDOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
diff --git a/mail/dbmail21/files/dbmail-timsieved.sh.in b/mail/dbmail21/files/dbmail-timsieved.sh.in
new file mode 100644
index 000000000000..26b5888cba6d
--- /dev/null
+++ b/mail/dbmail21/files/dbmail-timsieved.sh.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: dbmail-timsieved
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
+#
+#dbmail_timsieved_enable="YES"
+#
+# See dbmail-timsieved(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=dbmail_timsieved
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/dbmail-timsieved
+pidfile=/var/run/dbmail-timsieved.pid
+required_files=%%PREFIX%%/etc/dbmail.conf
+
+# read settings, set default values
+load_rc_config "$name"
+: ${dbmail_timsieved_enable="NO"}
+: ${dbmail_timsieved_flags=""}
+
+run_rc_command "$1"
diff --git a/mail/dbmail21/pkg-descr b/mail/dbmail21/pkg-descr
index 975d756571ae..7b316a199e50 100644
--- a/mail/dbmail21/pkg-descr
+++ b/mail/dbmail21/pkg-descr
@@ -2,8 +2,6 @@ Dbmail is the name of a group of programs that enable the possiblilty
 of storing and retrieving mail messages from a database (currently
 MySQL, PostgreSQL or SQLite).
 
-What are the advantages?
-
     * Scalability.
       Dbmail is as scalable as the database that is used for the
       mail storage.