- Update to version 0.99.10.2

PR:		59332
Submitted by:	Ports Fury

8 files changed, 72 insertions, 72 deletions

diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index 1b55562e88f4..24521d844aae 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	0.99.10
+PORTVERSION=	0.99.10.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://dovecot.procontrol.fi/
 
@@ -17,12 +17,13 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--without-shadow --enable-ipv6 \
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--without-shadow --enable-ipv6 \
 		--localstatedir=/var --with-ssl=openssl \
 		--with-ssldir=/var/dovecot/ssl --with-pop3d \
 		--with-pam
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-	LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
@@ -141,7 +142,7 @@ post-install:
 	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dovecot.sh.sample \
 		${PREFIX}/etc/rc.d/dovecot.sh.sample
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/dovecot
+	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} \
 		${WRKSRC}/doc/auth.txt \
 		${WRKSRC}/doc/design.txt \
@@ -155,7 +156,7 @@ post-install:
 		${WRKSRC}/doc/dovecot-openssl.cnf \
 		${WRKSRC}/doc/mkcert.sh \
 		${FILESDIR}/README.FreeBSD \
-			${PREFIX}/share/doc/dovecot
+			${DOCSDIR}
 .endif
 	@${CP} ${PKGMESSAGE} ${WRKDIR}/pkg-message
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
index 7f1429c69dcb..3ee73979a64e 100644
--- a/mail/dovecot-devel/distinfo
+++ b/mail/dovecot-devel/distinfo
@@ -1 +1 @@
-MD5 (dovecot-0.99.10.tar.gz) = 26d8452366a28418cc8a114781a721b6
+MD5 (dovecot-0.99.10.2.tar.gz) = d7a8783faea2654dcbb3770be9e4922d
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index 013d4fa98447..53f436bc8ec3 100644
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ b/mail/dovecot-devel/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	Thu Jun 26 16:11:06 2003
-+++ dovecot-example.conf	Sat Jul 12 01:48:09 2003
+--- dovecot-example.conf.orig	Sun Nov  9 00:21:22 2003
++++ dovecot-example.conf	Sun Nov 16 16:14:35 2003
 @@ -7,11 +7,11 @@
  # --with-ssldir=/etc/ssl
  
@@ -113,9 +113,9 @@
 -#valid_chroot_dirs = 
 +valid_chroot_dirs = /var/mail
  
- # Default MAIL environment to use when it's not set. By leaving this empty
- # dovecot tries to do some automatic detection as described in
-@@ -183,7 +183,7 @@
+ # Default chroot directory for mail processes. This can be overridden by
+ # giving /./ in user's home directory (eg. /home/./user chroots into /home).
+@@ -187,7 +187,7 @@
  #   mbox:~/mail/:INBOX=/var/mail/%u
  #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
@@ -124,7 +124,7 @@
  
  # Space-separated list of fields to cache for all mails. Currently these
  # fields are allowed followed by a list of commands they speed up:
-@@ -228,7 +228,7 @@
+@@ -232,7 +232,7 @@
  #     arrives in half a hour, Dovecot closes the connection. This is still
  #     fine, except Outlook doesn't connect back so you don't see if new mail
  #     arrives.
@@ -133,7 +133,7 @@
  
  # Dovecot can notify client of new mail in selected mailbox soon after it's
  # received. This setting specifies the minimum interval in seconds between
-@@ -253,7 +253,7 @@
+@@ -257,7 +257,7 @@
  # Save mails with CR+LF instead of plain LF. This makes sending those mails
  # take less CPU, especially with sendfile() syscall with Linux and FreeBSD.
  # But it also creates a bit more disk I/O which may just make it slower.
@@ -142,7 +142,7 @@
  
  # Use mmap() instead of read() to read mail files. read() seems to be a bit
  # faster with my Linux/x86 and it's better with NFS, so that's the default.
-@@ -265,7 +265,7 @@
+@@ -269,7 +269,7 @@
  # know any MUA which would modify mail files directly. IMAP protocol also
  # requires that the mails don't change, so it would be problematic in any case.
  # If you care about performance, enable it.
@@ -151,7 +151,7 @@
  
  # Check if mails' content has been changed by external programs. This slows
  # down things as extra stat() needs to be called for each file. If changes are
-@@ -284,7 +284,7 @@
+@@ -288,7 +288,7 @@
  # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
  # and flock. Some operating systems don't allow using both of them
  # simultaneously, eg. BSDs. If dotlock is used, it's always created first.
@@ -160,7 +160,7 @@
  
  # Should we create dotlock file even when we want only a read-lock? Setting
  # this to yes hurts the performance when the mailbox is accessed simultaneously
-@@ -314,7 +314,7 @@
+@@ -318,7 +318,7 @@
  ##
  
  # Executable location
@@ -169,7 +169,7 @@
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -322,14 +322,14 @@
+@@ -326,14 +326,14 @@
  
  # Support for dynamically loadable modules.
  #imap_use_modules = no
@@ -186,7 +186,7 @@
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -337,7 +337,7 @@
+@@ -341,7 +341,7 @@
  
  # Support for dynamically loadable modules.
  #pop3_use_modules = no
@@ -195,20 +195,19 @@
  
  ##
  ## Authentication processes
-@@ -386,10 +386,10 @@
+@@ -391,9 +391,9 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
--auth_passdb = pam
+-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
 +auth_passdb = passwd
  
- # Executable location
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
 +auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -418,7 +418,7 @@
+@@ -422,7 +422,7 @@
  
  # More verbose logging. Useful for figuring out why authentication isn't
  # working.
diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist
index 4af41f132065..20c170eca2dc 100644
--- a/mail/dovecot-devel/pkg-plist
+++ b/mail/dovecot-devel/pkg-plist
@@ -6,17 +6,17 @@ libexec/dovecot/pop3
 libexec/dovecot/pop3-login
 libexec/dovecot/dovecot-auth
 sbin/dovecot
-%%PORTDOCS%%share/doc/dovecot/auth.txt
-%%PORTDOCS%%share/doc/dovecot/design.txt
-%%PORTDOCS%%share/doc/dovecot/nfs.txt
-%%PORTDOCS%%share/doc/dovecot/index.txt
-%%PORTDOCS%%share/doc/dovecot/multiaccess.txt
-%%PORTDOCS%%share/doc/dovecot/configuration.txt
-%%PORTDOCS%%share/doc/dovecot/mail-storages.txt
-%%PORTDOCS%%share/doc/dovecot/dovecot-ldap.conf
-%%PORTDOCS%%share/doc/dovecot/dovecot-pgsql.conf
-%%PORTDOCS%%share/doc/dovecot/dovecot-openssl.cnf
-%%PORTDOCS%%share/doc/dovecot/mkcert.sh
-%%PORTDOCS%%share/doc/dovecot/README.FreeBSD
-%%PORTDOCS%%@dirrm share/doc/dovecot
+%%PORTDOCS%%%%DOCSDIR%%/auth.txt
+%%PORTDOCS%%%%DOCSDIR%%/design.txt
+%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
+%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
+%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
+%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/dovecot
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 1b55562e88f4..24521d844aae 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	0.99.10
+PORTVERSION=	0.99.10.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://dovecot.procontrol.fi/
 
@@ -17,12 +17,13 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--without-shadow --enable-ipv6 \
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--without-shadow --enable-ipv6 \
 		--localstatedir=/var --with-ssl=openssl \
 		--with-ssldir=/var/dovecot/ssl --with-pop3d \
 		--with-pam
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-	LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
@@ -141,7 +142,7 @@ post-install:
 	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dovecot.sh.sample \
 		${PREFIX}/etc/rc.d/dovecot.sh.sample
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/dovecot
+	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} \
 		${WRKSRC}/doc/auth.txt \
 		${WRKSRC}/doc/design.txt \
@@ -155,7 +156,7 @@ post-install:
 		${WRKSRC}/doc/dovecot-openssl.cnf \
 		${WRKSRC}/doc/mkcert.sh \
 		${FILESDIR}/README.FreeBSD \
-			${PREFIX}/share/doc/dovecot
+			${DOCSDIR}
 .endif
 	@${CP} ${PKGMESSAGE} ${WRKDIR}/pkg-message
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 7f1429c69dcb..3ee73979a64e 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1 +1 @@
-MD5 (dovecot-0.99.10.tar.gz) = 26d8452366a28418cc8a114781a721b6
+MD5 (dovecot-0.99.10.2.tar.gz) = d7a8783faea2654dcbb3770be9e4922d
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 013d4fa98447..53f436bc8ec3 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	Thu Jun 26 16:11:06 2003
-+++ dovecot-example.conf	Sat Jul 12 01:48:09 2003
+--- dovecot-example.conf.orig	Sun Nov  9 00:21:22 2003
++++ dovecot-example.conf	Sun Nov 16 16:14:35 2003
 @@ -7,11 +7,11 @@
  # --with-ssldir=/etc/ssl
  
@@ -113,9 +113,9 @@
 -#valid_chroot_dirs = 
 +valid_chroot_dirs = /var/mail
  
- # Default MAIL environment to use when it's not set. By leaving this empty
- # dovecot tries to do some automatic detection as described in
-@@ -183,7 +183,7 @@
+ # Default chroot directory for mail processes. This can be overridden by
+ # giving /./ in user's home directory (eg. /home/./user chroots into /home).
+@@ -187,7 +187,7 @@
  #   mbox:~/mail/:INBOX=/var/mail/%u
  #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
@@ -124,7 +124,7 @@
  
  # Space-separated list of fields to cache for all mails. Currently these
  # fields are allowed followed by a list of commands they speed up:
-@@ -228,7 +228,7 @@
+@@ -232,7 +232,7 @@
  #     arrives in half a hour, Dovecot closes the connection. This is still
  #     fine, except Outlook doesn't connect back so you don't see if new mail
  #     arrives.
@@ -133,7 +133,7 @@
  
  # Dovecot can notify client of new mail in selected mailbox soon after it's
  # received. This setting specifies the minimum interval in seconds between
-@@ -253,7 +253,7 @@
+@@ -257,7 +257,7 @@
  # Save mails with CR+LF instead of plain LF. This makes sending those mails
  # take less CPU, especially with sendfile() syscall with Linux and FreeBSD.
  # But it also creates a bit more disk I/O which may just make it slower.
@@ -142,7 +142,7 @@
  
  # Use mmap() instead of read() to read mail files. read() seems to be a bit
  # faster with my Linux/x86 and it's better with NFS, so that's the default.
-@@ -265,7 +265,7 @@
+@@ -269,7 +269,7 @@
  # know any MUA which would modify mail files directly. IMAP protocol also
  # requires that the mails don't change, so it would be problematic in any case.
  # If you care about performance, enable it.
@@ -151,7 +151,7 @@
  
  # Check if mails' content has been changed by external programs. This slows
  # down things as extra stat() needs to be called for each file. If changes are
-@@ -284,7 +284,7 @@
+@@ -288,7 +288,7 @@
  # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
  # and flock. Some operating systems don't allow using both of them
  # simultaneously, eg. BSDs. If dotlock is used, it's always created first.
@@ -160,7 +160,7 @@
  
  # Should we create dotlock file even when we want only a read-lock? Setting
  # this to yes hurts the performance when the mailbox is accessed simultaneously
-@@ -314,7 +314,7 @@
+@@ -318,7 +318,7 @@
  ##
  
  # Executable location
@@ -169,7 +169,7 @@
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -322,14 +322,14 @@
+@@ -326,14 +326,14 @@
  
  # Support for dynamically loadable modules.
  #imap_use_modules = no
@@ -186,7 +186,7 @@
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -337,7 +337,7 @@
+@@ -341,7 +341,7 @@
  
  # Support for dynamically loadable modules.
  #pop3_use_modules = no
@@ -195,20 +195,19 @@
  
  ##
  ## Authentication processes
-@@ -386,10 +386,10 @@
+@@ -391,9 +391,9 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
--auth_passdb = pam
+-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
 +auth_passdb = passwd
  
- # Executable location
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
 +auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -418,7 +418,7 @@
+@@ -422,7 +422,7 @@
  
  # More verbose logging. Useful for figuring out why authentication isn't
  # working.
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index 4af41f132065..20c170eca2dc 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -6,17 +6,17 @@ libexec/dovecot/pop3
 libexec/dovecot/pop3-login
 libexec/dovecot/dovecot-auth
 sbin/dovecot
-%%PORTDOCS%%share/doc/dovecot/auth.txt
-%%PORTDOCS%%share/doc/dovecot/design.txt
-%%PORTDOCS%%share/doc/dovecot/nfs.txt
-%%PORTDOCS%%share/doc/dovecot/index.txt
-%%PORTDOCS%%share/doc/dovecot/multiaccess.txt
-%%PORTDOCS%%share/doc/dovecot/configuration.txt
-%%PORTDOCS%%share/doc/dovecot/mail-storages.txt
-%%PORTDOCS%%share/doc/dovecot/dovecot-ldap.conf
-%%PORTDOCS%%share/doc/dovecot/dovecot-pgsql.conf
-%%PORTDOCS%%share/doc/dovecot/dovecot-openssl.cnf
-%%PORTDOCS%%share/doc/dovecot/mkcert.sh
-%%PORTDOCS%%share/doc/dovecot/README.FreeBSD
-%%PORTDOCS%%@dirrm share/doc/dovecot
+%%PORTDOCS%%%%DOCSDIR%%/auth.txt
+%%PORTDOCS%%%%DOCSDIR%%/design.txt
+%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
+%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
+%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
+%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/dovecot