graphics/gdal 1.9.0 does not build on CURRENT

[coder.tuxfamily]

I have rewrote the patch.

Maybe with this new patch...
-------------- next part --------------
diff -ruN /usr/ports/graphics/gdal/files/patch-configure gdal/files/patch-configure
--- /usr/ports/graphics/gdal/files/patch-configure	2012-05-19 12:04:43.000000000 +0200
+++ gdal/files/patch-configure	2012-05-22 19:48:35.000000000 +0200
@@ -1,6 +1,24 @@
---- configure.orig	2011-12-23 09:51:45.000000000 +0800
-+++ configure	2011-12-23 15:30:42.540316668 +0800
-@@ -21140,10 +21140,10 @@
+--- configure.orig	2012-01-04 08:03:42.000000000 +0100
++++ configure	2012-05-22 19:47:53.000000000 +0200
+@@ -8908,7 +8908,7 @@
+ LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ 
+ 
+@@ -18694,7 +18694,7 @@
+     rm -f testiconv.*
+     echo '#include <iconv.h>' > testiconv.cpp
+     echo 'int main(int argc, char** argv) { iconv_t cd; return iconv (cd, (const char **) 0, 0, 0, 0); } ' >> testiconv.cpp
+-    if test -z "`${CXX} testiconv.cpp -c 2>&1`" ; then
++    if test -z "`${CXX} ${CPPFLAGS} testiconv.cpp -c 2>&1`" ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ICONV_CPP_CONST=\"const\"" >&5
+ $as_echo "using ICONV_CPP_CONST=\"const\"" >&6; }
+         ICONV_CPP_CONST="const"
+@@ -21232,10 +21232,10 @@
          if { test -x "$ncdump"; }; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking libnetcdf version with $ncdump" >&5
  $as_echo_n "checking libnetcdf version with $ncdump... " >&6; }