ports/80736: [PATCH] mail/dbmail: update to 2.0.4

[Radim Kolar]

>Number:         80736
>Category:       ports
>Synopsis:       [PATCH] mail/dbmail: update to 2.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 07 17:20:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Sanatana Dharma
>Environment:
System: FreeBSD sanatana.dharma 5.4-STABLE FreeBSD 5.4-STABLE #6: Sat Apr 30 20:15:38 CEST 2005
>Description:
- Update to 2.0.4
This is major update against 2.0.0
* lot of bugfixes and memory leaks
* major postgresql speedup
* everyone running 2.0.0 should update

Port changes:
startup scripts now works
fixed packaging list for libtool15
fixed packaging list for postgresql backend
do not install .la files

Added file(s):
- files/patch-sort.c

Port maintainer (seanc at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- dbmail-postgresql-2.0.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/dbmail-postgresql/Makefile /home/hsn/hacked/dbmail/Makefile
--- /usr/ports/mail/dbmail-postgresql/Makefile	Mon Jan 31 18:26:58 2005
+++ /home/hsn/hacked/dbmail/Makefile	Fri May  6 20:39:59 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTVERSION=	2.0.4
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -21,10 +21,12 @@
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	YES
 USE_OPENSSL=	YES
+USE_LIBTOOL_VER=	15
+USE_RC_SUBR=	YES
 
 CFLAGS += -fPIC
 
-SED_SCRIPT+=    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
+SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
 		-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
 		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
@@ -63,7 +65,7 @@
 	@${ECHO} ""
 
 post-patch:
-	@${FIND} ${WRKSRC} -name CVS -type d | xargs ${RM} -fr
+	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
 
 post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
@@ -98,6 +100,5 @@
 	@${ECHO} "	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in"
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
-
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/dbmail-postgresql/distinfo /home/hsn/hacked/dbmail/distinfo
--- /usr/ports/mail/dbmail-postgresql/distinfo	Mon Nov 29 18:29:32 2004
+++ /home/hsn/hacked/dbmail/distinfo	Fri May  6 19:30:19 2005
@@ -1,2 +1,2 @@
-MD5 (dbmail-2.0.0.tgz) = 936307da839d2e26e9860af6ba67b983
-SIZE (dbmail-2.0.0.tgz) = 530847
+MD5 (dbmail-2.0.4.tgz) = fc80ac11a24286aa78ee71dd78c965a1
+SIZE (dbmail-2.0.4.tgz) = 589603
diff -ruN --exclude=CVS /usr/ports/mail/dbmail-postgresql/files/patch-sort.c /home/hsn/hacked/dbmail/files/patch-sort.c
--- /usr/ports/mail/dbmail-postgresql/files/patch-sort.c	Thu Jan  1 01:00:00 1970
+++ /home/hsn/hacked/dbmail/files/patch-sort.c	Fri May  6 19:42:30 2005
@@ -0,0 +1,11 @@
+--- sort/sort.c.orig	Mon Mar 14 12:54:00 2005
++++ sort/sort.c	Fri May  6 19:41:24 2005
+@@ -58,7 +58,7 @@
+  *
+  * Then do it!
+  * */
+-dsn_class_t sort_and_deliver(u64_t msgidnr,
++sort_result_t sort_and_deliver(u64_t msgidnr,
+ 		const char *header UNUSED, 
+ 		u64_t headersize UNUSED, 
+ 		u64_t totalmsgsize, 
diff -ruN --exclude=CVS /usr/ports/mail/dbmail-postgresql/pkg-descr /home/hsn/hacked/dbmail/pkg-descr
--- /usr/ports/mail/dbmail-postgresql/pkg-descr	Tue Oct  7 03:17:49 2003
+++ /home/hsn/hacked/dbmail/pkg-descr	Fri May  6 20:50:54 2005
@@ -1,5 +1,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 or PostgreSQL).
+Dbmail is the name of a group of daemons (LMTP, IMAP4, POP3) that enable
+the possiblilty of storing and retrieving mail messages from a
+database (currently MySQL or PostgreSQL).
 
 What are the advantages?
 
diff -ruN --exclude=CVS /usr/ports/mail/dbmail-postgresql/pkg-plist /home/hsn/hacked/dbmail/pkg-plist
--- /usr/ports/mail/dbmail-postgresql/pkg-plist	Mon Nov 29 18:29:32 2004
+++ /home/hsn/hacked/dbmail/pkg-plist	Fri May  6 20:06:51 2005
@@ -2,18 +2,15 @@
 etc/rc.d/dbmail-imapd.sh
 etc/rc.d/dbmail-lmtpd.sh
 etc/rc.d/dbmail-pop3d.sh
-lib/dbmail/libauthdbmail.0
+lib/dbmail/libauthdbmail.so.0
+lib/dbmail/libauthdbmail.so
 lib/dbmail/libauthdbmail.a
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libauthdbmail
-lib/dbmail/libsortdbmail.0
+lib/dbmail/libsortdbmail.so.0
+lib/dbmail/libsortdbmail.so
 lib/dbmail/libsortdbmail.a
-lib/dbmail/libsortdbmail.la
-lib/dbmail/libsortdbmail
-lib/libdbmail
-lib/libdbmail.0
+lib/libdbmail.so.0
+lib/libdbmail.so
 lib/libdbmail.a
-lib/libdbmail.la
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
@@ -24,16 +21,14 @@
 %%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
 %%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql
 %%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%lib/dbmail/libmysqldbmail.0
+%%MYSQL%%lib/dbmail/libmysqldbmail.so.0
 %%MYSQL%%lib/dbmail/libmysqldbmail.a
-%%MYSQL%%lib/dbmail/libmysqldbmail.la
-%%MYSQL%%lib/dbmail/libmysqldbmail
+%%MYSQL%%lib/dbmail/libmysqldbmail.so
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
 %%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.0
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.a
-%%PGSQL%%/lib/dbmail/libpgsqldbmail.la
-%%PGSQL%%/lib/dbmail/libpgsqldbmail
+%%PGSQL%%lib/dbmail/libpgsqldbmail.so.0
+%%PGSQL%%lib/dbmail/libpgsqldbmail.a
+%%PGSQL%%lib/dbmail/libpgsqldbmail.so
 @dirrm lib/dbmail
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
--- dbmail-postgresql-2.0.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: