Update to 1.0.rc7.

Submitted by:	maintainer
PR:		ports/102249

6 files changed, 42 insertions, 34 deletions

diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index 6d7747f4f456..f023cd7e2e0d 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dovecot
-DISTVERSION=	1.0.rc2
+DISTVERSION=	1.0.rc7
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/
 
@@ -22,6 +22,10 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-shadow --localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+USE_LDCONFIG=	${PREFIX}/lib/dovecot \
+		${PREFIX}/lib/dovecot/imap \
+		${PREFIX}/lib/dovecot/pop3 \
+		${PREFIX}/lib/dovecot/lda
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	USE-WIKI-INSTEAD \
@@ -47,7 +51,7 @@ OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
 ## kqueue(2) support
 #
 .if !defined(WITHOUT_KQUEUE)
-CONFIGURE_ARGS+=	--with-ioloop=kqueue --with-notify=kqueue
+CONFIGURE_ARGS+=	--with-ioloop=kqueue
 .endif
 
 ## SASL2 support
@@ -105,7 +109,7 @@ CONFIGURE_ARGS+=	--with-sqlite
 
 ## IPv6 support
 #
-.if defined(WITHOUT_IPV6) || $(OSVERSION) <= 400014
+.if defined(WITHOUT_IPV6) || ${OSVERSION} <= 400014
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
index cbf13d38ba21..fd7a9ae2158c 100644
--- a/mail/dovecot-devel/distinfo
+++ b/mail/dovecot-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.rc2.tar.gz) = e27a248b2ee224e4618aa2f020150041
-SHA256 (dovecot-1.0.rc2.tar.gz) = 594b38c099a4576e22d8a33673fd1461332c09a1e2c715792f6c2ff656b1bf6e
-SIZE (dovecot-1.0.rc2.tar.gz) = 1257435
+MD5 (dovecot-1.0.rc7.tar.gz) = 665ec0f09fe4f0a8f3f9efd7b9a02297
+SHA256 (dovecot-1.0.rc7.tar.gz) = 4d877b52678d1ef81c3f176479d566e25c0c4a65d3f61093f39866d1f63c7696
+SIZE (dovecot-1.0.rc7.tar.gz) = 1273427
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index 591d5617c709..4b658c61e2c6 100644
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ b/mail/dovecot-devel/files/patch-dovecot-example.conf
@@ -1,9 +1,9 @@
---- dovecot-example.conf.orig	Tue Jul  4 23:44:02 2006
-+++ dovecot-example.conf	Tue Jul  4 23:47:52 2006
+--- dovecot-example.conf.orig	Fri Aug 18 21:19:13 2006
++++ dovecot-example.conf	Fri Aug 18 21:23:26 2006
 @@ -9,7 +9,7 @@
- # Default values are shown after each value, it's not required to uncomment
- # any of the lines. Exception to this are paths, they're just examples
- # with real defaults being based on configure options. The paths listed here
+ # Default values are shown for each setting, it's not required to uncomment
+ # any of the lines. Exception to this are paths, they're just examples with
+ # the real defaults being based on configure options. The paths listed here
 -# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 +# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
  # --with-ssldir=/etc/ssl
@@ -25,7 +25,7 @@
  
  # Should each login be processed in it's own process (yes), or should one
  # login process be allowed to process multiple connections (no)? Yes is more
-@@ -193,6 +195,7 @@
+@@ -192,6 +194,7 @@
  #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
  #default_mail_env = 
@@ -111,7 +111,7 @@
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -576,6 +583,7 @@
+@@ -577,6 +584,7 @@
    # installations.
    #
    #pop3_uidl_format = 
@@ -119,7 +119,7 @@
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -590,7 +598,7 @@
+@@ -591,7 +599,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -128,7 +128,7 @@
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -601,6 +609,7 @@
+@@ -602,6 +610,7 @@
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
    #pop3_client_workarounds = 
@@ -136,7 +136,7 @@
  }
  
  ##
-@@ -618,10 +627,11 @@
+@@ -619,10 +628,11 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -149,7 +149,7 @@
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -632,7 +642,7 @@
+@@ -633,7 +643,7 @@
  ##
  
  # Executable location
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 6d7747f4f456..f023cd7e2e0d 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dovecot
-DISTVERSION=	1.0.rc2
+DISTVERSION=	1.0.rc7
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/
 
@@ -22,6 +22,10 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-shadow --localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+USE_LDCONFIG=	${PREFIX}/lib/dovecot \
+		${PREFIX}/lib/dovecot/imap \
+		${PREFIX}/lib/dovecot/pop3 \
+		${PREFIX}/lib/dovecot/lda
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	USE-WIKI-INSTEAD \
@@ -47,7 +51,7 @@ OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
 ## kqueue(2) support
 #
 .if !defined(WITHOUT_KQUEUE)
-CONFIGURE_ARGS+=	--with-ioloop=kqueue --with-notify=kqueue
+CONFIGURE_ARGS+=	--with-ioloop=kqueue
 .endif
 
 ## SASL2 support
@@ -105,7 +109,7 @@ CONFIGURE_ARGS+=	--with-sqlite
 
 ## IPv6 support
 #
-.if defined(WITHOUT_IPV6) || $(OSVERSION) <= 400014
+.if defined(WITHOUT_IPV6) || ${OSVERSION} <= 400014
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index cbf13d38ba21..fd7a9ae2158c 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.rc2.tar.gz) = e27a248b2ee224e4618aa2f020150041
-SHA256 (dovecot-1.0.rc2.tar.gz) = 594b38c099a4576e22d8a33673fd1461332c09a1e2c715792f6c2ff656b1bf6e
-SIZE (dovecot-1.0.rc2.tar.gz) = 1257435
+MD5 (dovecot-1.0.rc7.tar.gz) = 665ec0f09fe4f0a8f3f9efd7b9a02297
+SHA256 (dovecot-1.0.rc7.tar.gz) = 4d877b52678d1ef81c3f176479d566e25c0c4a65d3f61093f39866d1f63c7696
+SIZE (dovecot-1.0.rc7.tar.gz) = 1273427
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 591d5617c709..4b658c61e2c6 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,9 +1,9 @@
---- dovecot-example.conf.orig	Tue Jul  4 23:44:02 2006
-+++ dovecot-example.conf	Tue Jul  4 23:47:52 2006
+--- dovecot-example.conf.orig	Fri Aug 18 21:19:13 2006
++++ dovecot-example.conf	Fri Aug 18 21:23:26 2006
 @@ -9,7 +9,7 @@
- # Default values are shown after each value, it's not required to uncomment
- # any of the lines. Exception to this are paths, they're just examples
- # with real defaults being based on configure options. The paths listed here
+ # Default values are shown for each setting, it's not required to uncomment
+ # any of the lines. Exception to this are paths, they're just examples with
+ # the real defaults being based on configure options. The paths listed here
 -# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 +# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
  # --with-ssldir=/etc/ssl
@@ -25,7 +25,7 @@
  
  # Should each login be processed in it's own process (yes), or should one
  # login process be allowed to process multiple connections (no)? Yes is more
-@@ -193,6 +195,7 @@
+@@ -192,6 +194,7 @@
  #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
  #default_mail_env = 
@@ -111,7 +111,7 @@
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -576,6 +583,7 @@
+@@ -577,6 +584,7 @@
    # installations.
    #
    #pop3_uidl_format = 
@@ -119,7 +119,7 @@
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -590,7 +598,7 @@
+@@ -591,7 +599,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -128,7 +128,7 @@
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -601,6 +609,7 @@
+@@ -602,6 +610,7 @@
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
    #pop3_client_workarounds = 
@@ -136,7 +136,7 @@
  }
  
  ##
-@@ -618,10 +627,11 @@
+@@ -619,10 +628,11 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -149,7 +149,7 @@
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -632,7 +642,7 @@
+@@ -633,7 +643,7 @@
  ##
  
  # Executable location