ipsec_tools will not compile after IPSEC_NAT_T patch

[Lyle Scott III]

I applied the IPSEC_NAT_T patch from
http://vanhu.free.fr/FreeBSD/patch-natt-freebsd6-2007-05-31.diff to FreeBSD
6.2-release-p9
yesterday to include IPSEC_NAT_T support.
i did a  make buildworld buildkernel && make installworld installkernel &&
shutdown -r now

Now when i recompile /usr/ports/security/ipsec-tools it passes the test for
checking if the nat_t patch is installed but the port fails in make.  I did
some research and noticed the same function it errors at is in the patch.

Did i mess something up or what?  I'm not sure where to go from here.
Should i just delete /usr/src/* and extract a new src and start over?

cc -DHAVE_CONFIG_H -I. -I../.. -I./../libipsec
-I./../../src/racoon/missing -D_GNU_SOURCE
-DSYSCONFDIR=\"/usr/local/etc/racoon\"  -DADMINPORTDIR=\"/var/db/racoon\"
-pipe -g  -Wall -Werror -Wno-unused -MT isakmp.o -MD -MP -MF
.deps/isakmp.Tpo -c -o isakmp.o isakmp.c
isakmp.c: In function `isakmp_open':
isakmp.c:1750: error: `UDP_ENCAP_ESPINUDP' undeclared (first use in this
function)
isakmp.c:1750: error: (Each undeclared identifier is reported only once
isakmp.c:1750: error: for each function it appears in.)
isakmp.c:1753: error: `UDP_ENCAP_ESPINUDP_NON_IKE' undeclared (first use in
this function)
isakmp.c:1757: error: `UDP_ENCAP' undeclared (first use in this function)
*** Error code 1

Stop in /usr/ports/security/ipsec-tools/work/ipsec-tools-0.7/src/racoon.
*** Error code 1

Stop in /usr/ports/security/ipsec-tools/work/ipsec-tools-0.7/src.
*** Error code 1

Stop in /usr/ports/security/ipsec-tools/work/ipsec-tools-0.7.
*** Error code 1

Stop in /usr/ports/security/ipsec-tools/work/ipsec-tools-0.7.
*** Error code 1

Stop in /usr/ports/security/ipsec-tools.
*** Error code 1



-- 
Lyle Scott, III
http://www.lylescott.ws