Portupgrade of qt4-corelib broken

[Troy]

Trying to portupgrade qt4-corelib-4.6.3_1 and received the following 
compile error

# -*-mode: makefile-*-
# New ports collection makefile for:   qt40
# Date created:            Wed Jun 29 11:49:42 CEST 2005
# Whom:              lofi at freebsd.org
#
# $FreeBSD: ports/devel/qt4-corelib/Makefile,v 1.24 2010/12/02 19:47:07 
makc Exp $
#


qfsfileengine_unix.o io/qfsfileengine_unix.cpp
g++ -c -O2 -pipe -fno-strict-aliasing -D_REENTRANT 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -O2 
-fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -fPIC 
-DQT_SHARED -DQT_BUILD_CORE_LIB -DQT_NO_USING_NAMESPACE 
-DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT3_SUPPORT 
-DQT_MOC_COMPAT -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION 
-DHB_EXPORT=Q_CORE_EXPORT -DGNU_LIBICONV -DQT_NO_DEBUG 
-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE 
-I/usr/local/share/qt4/mkspecs/freebsd-g++ -I. -I../../include 
-I../../include/QtCore -I.rcc/release-shared -Iglobal 
-I../3rdparty/harfbuzz/src -I../3rdparty/md5 -I../3rdparty/md4 
-I.moc/release-shared -I/usr/local/include -o 
.obj/release-shared/qfsfileengine_iterator_unix.o 
io/qfsfileengine_iterator_unix.cpp
io/qfsfileengine_iterator_unix.cpp:61: error: ISO C++ forbids 
declaration of 'QT_DIR' with no type
io/qfsfileengine_iterator_unix.cpp:61: error: expected ';' before '*' token
io/qfsfileengine_iterator_unix.cpp:62: error: ISO C++ forbids 
declaration of 'QT_DIRENT' with no type
io/qfsfileengine_iterator_unix.cpp:62: error: expected ';' before '*' token
io/qfsfileengine_iterator_unix.cpp:67: error: ISO C++ forbids 
declaration of 'QT_DIRENT' with no type
io/qfsfileengine_iterator_unix.cpp:67: error: expected ';' before '*' token
io/qfsfileengine_iterator_unix.cpp: In constructor 
'QFSFileEngineIteratorPlatformSpecificData::QFSFileEngineIteratorPlatformSpecificData()':
io/qfsfileengine_iterator_unix.cpp:55: error: class 
'QFSFileEngineIteratorPlatformSpecificData' does not have any field 
named 'dir'
io/qfsfileengine_iterator_unix.cpp:55: error: class 
'QFSFileEngineIteratorPlatformSpecificData' does not have any field 
named 'dirEntry'
io/qfsfileengine_iterator_unix.cpp:57: error: class 
'QFSFileEngineIteratorPlatformSpecificData' does not have any field 
named 'mt_file'
io/qfsfileengine_iterator_unix.cpp: In member function 'void 
QFSFileEngineIterator::advance()':
io/qfsfileengine_iterator_unix.cpp:73: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dirEntry'
io/qfsfileengine_iterator_unix.cpp:73: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dirEntry'
io/qfsfileengine_iterator_unix.cpp:75: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:79: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:79: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp:79: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dirEntry'
io/qfsfileengine_iterator_unix.cpp:79: error: 'QT_READDIR_R' was not 
declared in this scope
io/qfsfileengine_iterator_unix.cpp:85: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dirEntry'
io/qfsfileengine_iterator_unix.cpp:86: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:86: error: 'QT_CLOSEDIR' was not 
declared in this scope
io/qfsfileengine_iterator_unix.cpp:87: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:90: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp:91: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp: In member function 'void 
QFSFileEngineIterator::deletePlatformSpecifics()':
io/qfsfileengine_iterator_unix.cpp:103: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:104: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:104: error: 'QT_CLOSEDIR' was not 
declared in this scope
io/qfsfileengine_iterator_unix.cpp:106: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp:107: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp: In member function 'virtual bool 
QFSFileEngineIterator::hasNext() const':
io/qfsfileengine_iterator_unix.cpp:116: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:118: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'dir'
io/qfsfileengine_iterator_unix.cpp:118: error: 'QT_OPENDIR' was not 
declared in this scope
io/qfsfileengine_iterator_unix.cpp:125: error: 'QT_DIRENT' was not 
declared in this scope
io/qfsfileengine_iterator_unix.cpp:127: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp:128: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp:129: error: 'class 
QFSFileEngineIteratorPlatformSpecificData' has no member named 'mt_file'
io/qfsfileengine_iterator_unix.cpp:129: error: expected 
primary-expression before ')' token
io/qfsfileengine_iterator_unix.cpp:129: error: expected `;' before 'new'
*** Error code 1
1 error
*** Error code 1

Stop in /usr/ports/devel/qt4-corelib.
** Command failed [exit code 1]: /usr/bin/script -qa 
/tmp/portupgrade20101228-23742-veskp9-0 env UPGRADE_TOOL=portupgrade 
UPGRADE_PORT=qt4-corelib-4.6.3_1 UPGRADE_PORT_VER=4.6.3_1 make
** Fix the problem and try again.
** Listing the failed packages (-:ignored / *:skipped / !:failed)
         ! devel/qt4-corelib (qt4-corelib-4.6.3_1)       (bad C++ code)