From 1b9ec1582fbf2b219f611d52fca8410e3cd06973 Mon Sep 17 00:00:00 2001
From: makc <makc@FreeBSD.org>
Date: Thu, 2 Dec 2010 19:47:17 +0000
Subject: KDE FreeBSD team is glad to present Qt 4.7.1 in ports.

Along with Qt4 the following ports are updated:

PyQt4 ports to 4.8.1
devel/py-sip to 4.11.2
devel/qscintilla2 to 2.4.5
PyKDE3 to 3.16.7
PyQt3 tp 3.18.2-snapshot-20091119

New ports added:
devel/qt4-declarative
devel/py-qt4-declarative
x11/qt4-graphicssystems-opengl

This release has been contributed by:
Thomas Abthorpe (tabthorpe)
Max Brazhnikov (makc)
Dima Panov (fluffy)
Alberto Villa (avilla)

We'd like to thank Martin Wilke (miwi) for exp-run.
---
 x11-toolkits/qt4-gui/Makefile  |  8 ++++----
 x11-toolkits/qt4-gui/pkg-plist | 12 +++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'x11-toolkits/qt4-gui')

diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 65a9220d15f1..97d71a838e19 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gui
-PORTVERSION=	${QT4_VERSION}
+DISTVERSION=	${QT4_VERSION}
 CATEGORIES?=	x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
@@ -18,12 +18,11 @@ LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-MAKE_JOBS_SAFE=	yes
-
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
+MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
@@ -51,7 +50,8 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-CONFIGURE_ARGS+=	-I../../include/Qt -I../../include
+CONFIGURE_ARGS+=	-I../../include/QtCore -I../../include/QtGui \
+			-I../../include/Qt -I../../include
 
 EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist
index a2bac7ea6233..4fe9846c7a97 100644
--- a/x11-toolkits/qt4-gui/pkg-plist
+++ b/x11-toolkits/qt4-gui/pkg-plist
@@ -207,6 +207,7 @@ include/qt4/Qt/qsplitter.h
 include/qt4/Qt/qstackedlayout.h
 include/qt4/Qt/qstackedwidget.h
 include/qt4/Qt/qstandarditemmodel.h
+include/qt4/Qt/qstatictext.h
 include/qt4/Qt/qstatusbar.h
 include/qt4/Qt/qstringlistmodel.h
 include/qt4/Qt/qstyle.h
@@ -571,8 +572,15 @@ include/qt4/QtGui/QResizeEvent
 include/qt4/QtGui/QRgb
 include/qt4/QtGui/QRubberBand
 include/qt4/QtGui/QS60MainAppUi
+include/qt4/QtGui/QS60MainAppUiBase
 include/qt4/QtGui/QS60MainApplication
+include/qt4/QtGui/QS60MainApplicationBase
 include/qt4/QtGui/QS60MainDocument
+include/qt4/QtGui/QS60MainDocumentBase
+include/qt4/QtGui/QS60StubAknAppUi
+include/qt4/QtGui/QS60StubAknAppUiBase
+include/qt4/QtGui/QS60StubMAknTouchPaneObserver
+include/qt4/QtGui/QS60StubMEikStatusPaneObserver
 include/qt4/QtGui/QS60Style
 include/qt4/QtGui/QScreen
 include/qt4/QtGui/QScreenCursor
@@ -600,6 +608,7 @@ include/qt4/QtGui/QStackedWidget
 include/qt4/QtGui/QStandardItem
 include/qt4/QtGui/QStandardItemEditorCreator
 include/qt4/QtGui/QStandardItemModel
+include/qt4/QtGui/QStaticText
 include/qt4/QtGui/QStatusBar
 include/qt4/QtGui/QStatusTipEvent
 include/qt4/QtGui/QStringListModel
@@ -662,8 +671,8 @@ include/qt4/QtGui/QTableWidget
 include/qt4/QtGui/QTableWidgetItem
 include/qt4/QtGui/QTableWidgetSelectionRange
 include/qt4/QtGui/QTabletEvent
-include/qt4/QtGui/QTapGesture
 include/qt4/QtGui/QTapAndHoldGesture
+include/qt4/QtGui/QTapGesture
 include/qt4/QtGui/QTextBlock
 include/qt4/QtGui/QTextBlockFormat
 include/qt4/QtGui/QTextBlockGroup
@@ -995,6 +1004,7 @@ include/qt4/QtGui/qsplitter.h
 include/qt4/QtGui/qstackedlayout.h
 include/qt4/QtGui/qstackedwidget.h
 include/qt4/QtGui/qstandarditemmodel.h
+include/qt4/QtGui/qstatictext.h
 include/qt4/QtGui/qstatusbar.h
 include/qt4/QtGui/qstringlistmodel.h
 include/qt4/QtGui/qstyle.h
-- 
cgit