ports/147302: [PATCH] mail/maildrop - update to 2.5.0 and add optional dovecot auth patch

[Marko Njezic]

>Number:         147302
>Category:       ports
>Synopsis:       [PATCH] mail/maildrop - update to 2.5.0 and add optional dovecot auth patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 02 01:00:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Marko Njezic
>Release:        8.0-RELEASE-p3
>Organization:
MAX Interactive corp.
>Environment:
FreeBSD vmbsd 8.0-RELEASE-p3 FreeBSD 8.0-RELEASE-p3 #0: Wed May 26 05:45:12 UTC 2010     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Attached patch updates maildrop port to the version 2.5.0 and adds support for optional Dovecot Authentication extension.

Also, there's no need for patching dbobj.h.in file, so patch-dbobj.h.in patch file can be removed from the port (I've tested compilation with both gdbm and db and configure script properly updated dbobj.h file in both cases).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur maildrop.original/Makefile maildrop/Makefile
--- maildrop.original/Makefile	2010-05-05 14:36:22.000000000 +0200
+++ maildrop/Makefile	2010-06-02 01:16:48.000000000 +0200
@@ -16,9 +16,11 @@
 # NO_MAILWRAPPER=yes	If defined, let configure guess which sendmail binary
 #			to use
 # MAILDROP_LOG_COLUMNS	lenght of 'File:' line in log - 8; default: 72
+# WITH_DOVECOTAUTH=yes	Enable optional support for Dovecot Authentication
+#			extension (http://wiki.dovecot.org/maildrop/)
 
 PORTNAME=	maildrop
-PORTVERSION=	2.4.3
+PORTVERSION=	2.5.0
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -76,6 +78,15 @@
 CONFIGURE_ARGS+=	--enable-trusted-users="${MAILDROP_TRUSTED_USERS}"
 .endif
 
+.if defined(WITH_DOVECOTAUTH)
+PATCH_SITES+=		http://www.max.rs/ozone/
+PATCHFILES+=		maildrop-2.3.0-dovecotauth.patch.txt
+PATCH_DIST_STRIP=	-p1
+PLIST_SUB+=	DOVECOTAUTH=""
+.else
+PLIST_SUB+=	DOVECOTAUTH="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \
 		${WRKSRC}/maildrop/log.C
@@ -112,6 +123,9 @@
 		${PREFIX}/etc/quotawarnmsg.sample
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.if defined(WITH_DOVECOTAUTH)
+	${INSTALL_DATA} ${WRKSRC}/README.dovecotauth ${DOCSDIR}
+.endif
 .endif
 .if defined(MAILDROP_SUID)
 	${CHMOD} u+s ${PREFIX}/bin/maildrop
diff -Naur maildrop.original/distinfo maildrop/distinfo
--- maildrop.original/distinfo	2010-05-05 14:36:22.000000000 +0200
+++ maildrop/distinfo	2010-06-01 12:08:36.000000000 +0200
@@ -1,3 +1,6 @@
-MD5 (maildrop-2.4.3.tar.bz2) = 15b7528ba5e7ab76e676596af6bcd1c9
-SHA256 (maildrop-2.4.3.tar.bz2) = b4f54f5ff659bf09e197141da5d19097091bc4b05fb19a7f73d1cbb996aed310
-SIZE (maildrop-2.4.3.tar.bz2) = 2413480
+MD5 (maildrop-2.5.0.tar.bz2) = efdd9a1324aa0c5b427a77d305ed5ecb
+SHA256 (maildrop-2.5.0.tar.bz2) = 49a35a29bf57b85e18577c8c270550ae43f5a772dd234d3f3b3564b88c4ef4ad
+SIZE (maildrop-2.5.0.tar.bz2) = 2413245
+MD5 (maildrop-2.3.0-dovecotauth.patch.txt) = f5e0fd910d76c4fba2a5fcdd40c6b375
+SHA256 (maildrop-2.3.0-dovecotauth.patch.txt) = 8a7ad72885da854649ea9057f3276b4377b30f67e647f71ec0ad35597769166f
+SIZE (maildrop-2.3.0-dovecotauth.patch.txt) = 22040
diff -Naur maildrop.original/files/patch-dbobj.h.in maildrop/files/patch-dbobj.h.in
--- maildrop.original/files/patch-dbobj.h.in	2009-07-01 19:12:52.000000000 +0200
+++ maildrop/files/patch-dbobj.h.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
---- dbobj.h.in.orig	2000-07-02 08:41:53.000000000 +0900
-+++ dbobj.h.in	2009-07-01 19:58:56.000000000 +0900
-@@ -29,9 +29,9 @@
- #define	dbobj_nextkey	gdbmobj_nextkey
- 
- #define	DBNAME	"gdbm"
--#endif
- 
--#if	@USE_DB@
-+#else
-+
- #include	"bdbobj/bdbobj.h"
- #define	DbObj	BDbObj
- 
diff -Naur maildrop.original/pkg-plist maildrop/pkg-plist
--- maildrop.original/pkg-plist	2010-05-05 14:36:22.000000000 +0200
+++ maildrop/pkg-plist	2010-06-02 01:34:38.000000000 +0200
@@ -14,6 +14,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%DOVECOTAUTH%%%%PORTDOCS%%%%DOCSDIR%%/README.dovecotauth
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html


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