Squid 2.5.7_8 -> 2.5.7_9 portupgrade fails

[Juha Saarinen]

Trying to update Squid, as portaudit complains about the existing
version, but not having much success despite make clean and refetching
the sources:

===>  Applying distribution patches for squid-2.5.7_9
===>  Applying extra patch /usr/ports/www/squid/files/follow_xff-2.5.patch
1 out of 5 hunks failed--saving rejects to src/structs.h.rej
*** Error code 1

Stop in /usr/ports/www/squid.
** Command failed [exit code 1]: /usr/bin/script -qa
/tmp/portupgrade75466.58 make
** Fix the problem and try again.

less structs.h.rej
***************
*** 606,611 ****
        int request_entities;
        int detect_broken_server_pconns;
        int balance_on_multiple_ip;
      } onoff;
      acl *aclList;
      struct {
--- 606,616 ----
        int request_entities;
        int detect_broken_server_pconns;
        int balance_on_multiple_ip;
+ #if FOLLOW_X_FORWARDED_FOR
+       int acl_uses_indirect_client;
+       int delay_pool_uses_indirect_client;
+       int log_uses_indirect_client;
+ #endif /* FOLLOW_X_FORWARDED_FOR */
      } onoff;
      acl *aclList;
      struct {
structs.h.rej (END)

The follow-x-forwarded-for patch looks like an option according to the
port makefile:

.if defined(WITH_SQUID_FOLLOW_XFF)
EXTRA_PATCHES+=         ${PATCHDIR}/follow_xff-2.5.patch \
                        ${PATCHDIR}/follow_xff-configure.patch
CONFIGURE_ARGS+=        --enable-follow-x-forwarded-for
.endif

I didn't set it, and it should be off by default:

OPTIONS=        ...
                SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
...

Why is the patch being applied nevertheless?

-- 

Juha