cairo 1.8.6 problem

[B Hayward]

Hi,
I've been trying to upgrade from cairo-1.6.4_2,1 to the current version 
(1.8.6_1,1) on a FreeBSD 7.1, Pentium III box and get, repeatedly, this 
error:

  cc -DHAVE_CONFIG_H -I. -I.. -I. -I/usr/local/include/pixman-1 
-I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include 
-I/usr/local/include -I/usr/local/include -D_THREAD_SAFE 
-I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -Wall -Wextra 
-Wsign-compare -Werror-implicit-function-declaration -Wpointer-arith 
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -Wnested-externs -Wpacked -Wswitch-enum 
-Wmissing-format-attribute -Wstrict-aliasing=2 -Winit-self 
-Wunsafe-loop-optimizations -Wdeclaration-after-statement 
-Wold-style-definition -Wno-missing-field-initializers 
-Wno-unused-parameter -Wno-attributes -Wno-long-long -Winline 
-fno-strict-aliasing -fno-common -Wp,-D_FORTIFY_SOURCE=2 -O -pipe 
-march=pentiumpro -MT cairo-png.lo -MD -MP -MF .deps/cairo-png.Tpo -c 
cairo-png.c  -fPIC -DPIC -o .libs/cairo-png.o
cairo-png.c:42:17: error: png.h: No such file or directory
cairo-png.c:46: error: expected ')' before 'png'
cairo-png.c:70: error: expected ')' before 'png'
cairo-png.c:92: error: expected ')' before 'png'
cairo-png.c:109: error: expected ')' before 'png'
cairo-png.c:125: error: expected ')' before 'png_ptr'

According to
http://lists.cairographics.org/archives/cairo-commit/2005-April/003188.html
cairo-png.h was deleted in 2005

"Removed Files:
	cairo-png.h
Log Message:
2005-04-26  Kristian Høgsberg  <krh at redhat.com>
         * src/cairo-png.h: Prototypes moved to cairo.h, this file removed.
--- cairo-png.h DELETED ---"

and cairo.h is certainly present:

514: $ locate cairo.h
/usr/local/include/cairo/cairo.h
/usr/local/include/gtk-2.0/gdk/gdkcairo.h
/usr/local/include/librsvg-2/librsvg/rsvg-cairo.h
/usr/local/include/pango-1.0/pango/pangocairo.h
/usr/local/include/pycairo/pycairo.h
/usr/ports/graphics/cairo/work/cairo-1.8.6/src/cairo.h

so I'm a bit confused as to how to get round this since "make deinstall, 
make reinstall" don't work and pkg_add installs cairo 1.6
Thanks,
B Hayward