[Dovecot] RC11 Build Failure on FreeBSD 6.1

[Brad]

On Sat, Nov 04, 2006 at 04:15:07PM -0800, Tim Wilde wrote:
> I just ran into a build failure on Dovecot 1.0RC11 on FreeBSD 6.1.
> Identical command sequence for the build worked fine for RC10.  uname -a:
> 
> FreeBSD thor.krellis.org 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #0: Fri
> Sep  1 01:47:32 EDT 2006
> root at jail7.jvds.com:/usr/obj/usr/src/sys/JAIL7  i386
> 
> Configured with a straight ./configure, no options, no problems reported
> during configure, but make failed with:
> 
> if gcc -DHAVE_CONFIG_H -I. -I. -I../..      -std=gnu99 -g -O2 -Wall -W
> -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith
> -Wchar-subscripts -Wformat=2 -Wbad-function-cast -MT mountpoint.o -MD
> -MP -MF ".deps/mountpoint.Tpo" -c -o mountpoint.o mountpoint.c;  then mv
> -f ".deps/mountpoint.Tpo" ".deps/mountpoint.Po"; else rm -f
> ".deps/mountpoint.Tpo"; exit 1; fi
> mountpoint.c:11:30: #if with no expression
> mountpoint.c:40: warning: unused parameter 'path'
> mountpoint.c:40: warning: unused parameter 'pool'
> *** Error code 1
> 
> Stop in /usr/home/tim/build/dovecot-1.0.rc11/src/lib.
> *** Error code 1
> 
> Stop in /usr/home/tim/build/dovecot-1.0.rc11/src.
> *** Error code 1
> 
> Stop in /usr/home/tim/build/dovecot-1.0.rc11.
> *** Error code 1
> 
> Stop in /usr/home/tim/build/dovecot-1.0.rc11.
> 
> Full output of everything I did after untarring (I apologize in advance
> for any bad wrapping, I can attach as text/plain if necessary for
> diagnosis):

I saw the same thing with OpenBSD -current.

Here is the fix..

--- src/lib/mountpoint.c.orig   Sat Nov  4 23:43:29 2006
+++ src/lib/mountpoint.c        Sat Nov  4 23:43:42 2006
@@ -8,7 +8,7 @@
 #ifdef HAVE_STATVFS_MNTFROMNAME
 #  include <sys/statvfs.h> /* NetBSD 3.0+, FreeBSD 5.0+ */
 #  define STATVFS_STR "statvfs"
-#elif HAVE_STATFS_MNTFROMNAME
+#elif defined(HAVE_STATFS_MNTFROMNAME)
 #  include <sys/param.h> /* Older BSDs */
 #  include <sys/mount.h>
 #  define statvfs statfs