- Adds dbmail-timsieved.sh

- Adds workaround for installations after some previous revision which
  didn't deinstall completely
- Adds fix for bug #461 from dbmail bugtracker

PR:		ports/106760
Submitted by:	Mark Starovoytov <mark_sf@kikg.ifmo.ru> (maintainer)

6 files changed, 148 insertions, 2 deletions

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 38d6d7e0c056..f6652b99e672 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbmail
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
 
@@ -27,7 +28,7 @@ USE_AUTOTOOLS=	libtool:15
 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
 USE_GNOME=	glib20 pkgconfig
 USE_OPENSSL=	YES
 
@@ -109,6 +110,15 @@ post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
 				${WRKSRC}/dbmail.h
 
+# remove leftovers which are not removed by some revisions of port
+# fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error.
+pre-install:
+	@for f in 'a' 'la' 'so' 'so.0'; do \
+	  if [ -f ${PREFIX}/lib/libdbmail.$$f ] ; then \
+	    ${RM} ${PREFIX}/lib/libdbmail.$$f; \
+	  fi; \
+	done
+
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
 	@if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \
diff --git a/mail/dbmail/files/dbmail-timsieved.sh.in b/mail/dbmail/files/dbmail-timsieved.sh.in
new file mode 100644
index 000000000000..26b5888cba6d
--- /dev/null
+++ b/mail/dbmail/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/dbmail/files/patch-2.2.1_001_461 b/mail/dbmail/files/patch-2.2.1_001_461
new file mode 100644
index 000000000000..972841a08572
--- /dev/null
+++ b/mail/dbmail/files/patch-2.2.1_001_461
@@ -0,0 +1,31 @@
+Index: misc.c
+===================================================================
+--- misc.c	(revision 2388)
++++ misc.c	(revision 2390)
+@@ -2112,8 +2112,14 @@
+ 	char prev,next=0;
+ 	unsigned incode=0, inquote=0;
+ 	size_t i, l;
+-	GString *s = g_string_new("");
++	GString *s;
++
++	if (!a)
++		return g_strdup("");
++	if (!a[0])
++		return g_strdup("");
+ 	
++	s = g_string_new("");
+ 	t = g_strdup(a);
+ 	inptr = t;
+ 	inptr = g_strstrip(inptr);
+@@ -2130,9 +2136,8 @@
+ 	}
+ 
+ 	l = strlen(inptr);
++	for (i = 0; i < l - 1; i++) {
+ 
+-	for (i=0; i<l-1; i++) {
+-
+ 		next=inptr[i+1];
+ 
+ 		if (inptr[i] == '<')
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 38d6d7e0c056..f6652b99e672 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbmail
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
 
@@ -27,7 +28,7 @@ USE_AUTOTOOLS=	libtool:15
 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
 USE_GNOME=	glib20 pkgconfig
 USE_OPENSSL=	YES
 
@@ -109,6 +110,15 @@ post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
 				${WRKSRC}/dbmail.h
 
+# remove leftovers which are not removed by some revisions of port
+# fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error.
+pre-install:
+	@for f in 'a' 'la' 'so' 'so.0'; do \
+	  if [ -f ${PREFIX}/lib/libdbmail.$$f ] ; then \
+	    ${RM} ${PREFIX}/lib/libdbmail.$$f; \
+	  fi; \
+	done
+
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
 	@if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \
diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.sh.in
new file mode 100644
index 000000000000..26b5888cba6d
--- /dev/null
+++ b/mail/dbmail22/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/dbmail22/files/patch-2.2.1_001_461 b/mail/dbmail22/files/patch-2.2.1_001_461
new file mode 100644
index 000000000000..972841a08572
--- /dev/null
+++ b/mail/dbmail22/files/patch-2.2.1_001_461
@@ -0,0 +1,31 @@
+Index: misc.c
+===================================================================
+--- misc.c	(revision 2388)
++++ misc.c	(revision 2390)
+@@ -2112,8 +2112,14 @@
+ 	char prev,next=0;
+ 	unsigned incode=0, inquote=0;
+ 	size_t i, l;
+-	GString *s = g_string_new("");
++	GString *s;
++
++	if (!a)
++		return g_strdup("");
++	if (!a[0])
++		return g_strdup("");
+ 	
++	s = g_string_new("");
+ 	t = g_strdup(a);
+ 	inptr = t;
+ 	inptr = g_strstrip(inptr);
+@@ -2130,9 +2136,8 @@
+ 	}
+ 
+ 	l = strlen(inptr);
++	for (i = 0; i < l - 1; i++) {
+ 
+-	for (i=0; i<l-1; i++) {
+-
+ 		next=inptr[i+1];
+ 
+ 		if (inptr[i] == '<')