[pkgsrc/pkgsrc-2006Q1]: pkgsrc/mail/dovecot Pullup ticket 1646 - requested by...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/274b65e42c16
branches:  pkgsrc-2006Q1
changeset: 510283:274b65e42c16
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon May 22 14:21:47 2006 +0000

description:
Pullup ticket 1646 - requested by ghen
portability build fix for dovecot

Revisions pulled up:
- pkgsrc/mail/dovecot/Makefile                  1.52
- pkgsrc/mail/dovecot/distinfo                  1.30
- pkgsrc/mail/dovecot/patches/patch-af          1.1

   Module Name:         pkgsrc
   Committed By:        ghen
   Date:                Sun May 21 13:48:51 UTC 2006

   Modified Files:
        pkgsrc/mail/dovecot: Makefile distinfo
   Added Files:
        pkgsrc/mail/dovecot/patches: patch-af

   Log Message:
   Fix a problem with non-C99 compilers (reported on NetBSD 1.6 and
   Solaris).  The patch is from dovecot CVS (see the thread following
   http://www.dovecot.org/list/dovecot/2006-May/013389.html), via PR
   pkg/33489.  Bump PKGREVISION.

diffstat:

 mail/dovecot/Makefile         |   3 ++-
 mail/dovecot/distinfo         |   3 ++-
 mail/dovecot/patches/patch-af |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r 06332fc21689 -r 274b65e42c16 mail/dovecot/Makefile
--- a/mail/dovecot/Makefile     Mon May 22 14:15:46 2006 +0000
+++ b/mail/dovecot/Makefile     Mon May 22 14:21:47 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46.2.1 2006/05/15 16:08:41 salo Exp $
+# $NetBSD: Makefile,v 1.46.2.2 2006/05/22 14:21:47 salo Exp $
 
 DISTNAME=              dovecot-1.0.beta8
 PKGNAME=               ${DISTNAME:S/.beta/beta/}
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dovecot.org/releases/
 
diff -r 06332fc21689 -r 274b65e42c16 mail/dovecot/distinfo
--- a/mail/dovecot/distinfo     Mon May 22 14:15:46 2006 +0000
+++ b/mail/dovecot/distinfo     Mon May 22 14:21:47 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25.2.1 2006/05/15 16:08:41 salo Exp $
+$NetBSD: distinfo,v 1.25.2.2 2006/05/22 14:21:47 salo Exp $
 
 SHA1 (dovecot-1.0.beta8.tar.gz) = fedd38c29a2bc396df386636ed5d8b65ecab0ff6
 RMD160 (dovecot-1.0.beta8.tar.gz) = 101a7011467691ba5f4a6f48e21d6d1dc5626c16
 Size (dovecot-1.0.beta8.tar.gz) = 1392106 bytes
 SHA1 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
 SHA1 (patch-ab) = a674cc1cb195e31f7c8cd1cd2735c69e3562fca7
+SHA1 (patch-af) = 8a8a219feba0bc575c1319ff7743f1ae5281413a
diff -r 06332fc21689 -r 274b65e42c16 mail/dovecot/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot/patches/patch-af     Mon May 22 14:21:47 2006 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-af,v 1.1.2.2 2006/05/22 14:21:47 salo Exp $
+
+From dovecot CVS: fix problem with non-C99 compilers.
+
+--- src/master/master-settings.c.orig  2006-04-25 11:00:07.000000000 +0900
++++ src/master/master-settings.c
+@@ -366,7 +366,6 @@ struct settings default_settings = {
+       MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
+ 
+       /* .. */
+-      MEMBER(login_uid) 0,
+       MEMBER(listen_fd) -1,
+       MEMBER(ssl_listen_fd) -1
+ };
+--- src/master/master-settings.h.orig  2006-04-15 11:00:07.000000000 +0900
++++ src/master/master-settings.h
+@@ -116,14 +116,15 @@ struct settings {
+       const char *pop3_logout_format;
+ 
+       /* .. */
+-      uid_t login_uid;
++      int listen_fd, ssl_listen_fd;
+ 
+-      const char *imap_generated_capability;
++      uid_t login_uid;
+ 
+-      int listen_fd, ssl_listen_fd;
+       struct ip_addr listen_ip, ssl_listen_ip;
+       unsigned int listen_port, ssl_listen_port;
+ 
++      const char *imap_generated_capability;
++
+       array_t ARRAY_DEFINE(plugin_envs, const char *);
+ };
+