5 files changed, 69 insertions, 110 deletions

diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index e8f016d1d19d..f12215ffc1a2 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qvfb
-PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTVERSION=	${QT4_VERSION}
+PORTREVISION=0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,27 +18,13 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt virtual framebuffer utility
 
-BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
-		qmake-qt4:${PORTSDIR}/devel/qmake4 \
-		rcc:${PORTSDIR}/devel/qt4-rcc \
-		uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS=	QtCore:${PORTSDIR}/devel/qt4-corelib \
-		QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
-		QtOpenGL:${PORTSDIR}/x11/qt4-opengl
-
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake moc rcc uic corelib gui opengl
+QT_NONSTANDARD=	yes
+QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	-fast -no-exceptions \
-		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX}  \
-		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-		-confirm-license
-
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -54,7 +40,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 	--exclude '${DISTNAME}/src/tools/uic' --exclude '${DISTNAME}/src/tools/uic3' \
 	--exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \
 	--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
-	--exclude '${DISTNAME}/tools/qtconfig' 
+	--exclude '${DISTNAME}/tools/qtconfig'
 WRKSRC=		${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../
 
diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/qt4-qvfb/distinfo
+++ b/devel/qt4-qvfb/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/qt4-qvfb/files/patch-qvfbshmem.cpp b/devel/qt4-qvfb/files/patch-qvfbshmem.cpp
deleted file mode 100644
index aaa4c8a6dd57..000000000000
--- a/devel/qt4-qvfb/files/patch-qvfbshmem.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- qvfbshmem.cpp.orig	Sun Jan 14 15:50:33 2007
-+++ qvfbshmem.cpp	Sun Jan 14 15:50:46 2007
-@@ -39,7 +39,7 @@
- #include <sys/stat.h>
- #include <sys/sem.h>
- #include <sys/mman.h>
--#include <asm/page.h>
-+#include <machine/param.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <math.h>
diff --git a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp b/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
deleted file mode 100644
index 364c289a41f5..000000000000
--- a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- qwssignalhandler.cpp.orig	Thu Mar 22 16:17:51 2007
-+++ qwssignalhandler.cpp	Thu Mar 22 16:18:10 2007
-@@ -27,13 +27,6 @@
- #include <sys/ipc.h>
- #include <sys/sem.h>
- 
--union semun {
--    int val;
--    struct semid_ds *buf;
--    unsigned short *array;
--    struct seminfo  *__buf;
--};
--
- class QWSSignalHandlerPrivate
- {
- public:
diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist
index 9da8e06f6cf8..ae5639ce4ec3 100644
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@@ -1,61 +1,61 @@
 bin/qvfb-qt4
 bin/qvfb-qt4.debug
-share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png
-share/qvfb/ClamshellPhone.skin/defaultbuttons.conf
-share/qvfb/DualScreenPhone.skin/DualScreen-pressed.png
-share/qvfb/DualScreenPhone.skin/DualScreen.png
-share/qvfb/DualScreenPhone.skin/DualScreenPhone.skin
-share/qvfb/DualScreenPhone.skin/defaultbuttons.conf
-share/qvfb/PDAPhone.skin/PDAPhone.skin
-share/qvfb/PDAPhone.skin/defaultbuttons.conf
-share/qvfb/PDAPhone.skin/finger.png
-share/qvfb/PDAPhone.skin/pda_down.png
-share/qvfb/PDAPhone.skin/pda_up.png
-share/qvfb/PortableMedia.skin/PortableMedia.skin
-share/qvfb/PortableMedia.skin/defaultbuttons.conf
-share/qvfb/PortableMedia.skin/portablemedia-pressed.png
-share/qvfb/PortableMedia.skin/portablemedia.png
-share/qvfb/PortableMedia.skin/portablemedia.xcf
-share/qvfb/SmartPhone.skin/SmartPhone-pressed.png
-share/qvfb/SmartPhone.skin/SmartPhone.png
-share/qvfb/SmartPhone.skin/SmartPhone.skin
-share/qvfb/SmartPhone.skin/defaultbuttons.conf
-share/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png
-share/qvfb/SmartPhone2.skin/SmartPhone2.png
-share/qvfb/SmartPhone2.skin/SmartPhone2.skin
-share/qvfb/SmartPhone2.skin/defaultbuttons.conf
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
-share/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin
-share/qvfb/TouchscreenPhone.skin/defaultbuttons.conf
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin
-share/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
-share/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf
-share/qvfb/pda.qrc
-share/qvfb/pda.skin
-share/qvfb/pda_down.png
-share/qvfb/pda_up.png
-@dirrm share/qvfb/Trolltech-Touchscreen.skin
-@dirrm share/qvfb/Trolltech-Keypad.skin
-@dirrm share/qvfb/TouchscreenPhone.skin
-@dirrm share/qvfb/SmartPhoneWithButtons.skin
-@dirrm share/qvfb/SmartPhone2.skin
-@dirrm share/qvfb/SmartPhone.skin
-@dirrm share/qvfb/PortableMedia.skin
-@dirrm share/qvfb/PDAPhone.skin
-@dirrm share/qvfb/DualScreenPhone.skin
-@dirrm share/qvfb/ClamshellPhone.skin
-@dirrm share/qvfb
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone.skin
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
+%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5.png
+%%DATADIR%%/ClamshellPhone.skin/defaultbuttons.conf
+%%DATADIR%%/DualScreenPhone.skin/DualScreen-pressed.png
+%%DATADIR%%/DualScreenPhone.skin/DualScreen.png
+%%DATADIR%%/DualScreenPhone.skin/DualScreenPhone.skin
+%%DATADIR%%/DualScreenPhone.skin/defaultbuttons.conf
+%%DATADIR%%/PDAPhone.skin/PDAPhone.skin
+%%DATADIR%%/PDAPhone.skin/defaultbuttons.conf
+%%DATADIR%%/PDAPhone.skin/finger.png
+%%DATADIR%%/PDAPhone.skin/pda_down.png
+%%DATADIR%%/PDAPhone.skin/pda_up.png
+%%DATADIR%%/PortableMedia.skin/PortableMedia.skin
+%%DATADIR%%/PortableMedia.skin/defaultbuttons.conf
+%%DATADIR%%/PortableMedia.skin/portablemedia-pressed.png
+%%DATADIR%%/PortableMedia.skin/portablemedia.png
+%%DATADIR%%/PortableMedia.skin/portablemedia.xcf
+%%DATADIR%%/SmartPhone.skin/SmartPhone-pressed.png
+%%DATADIR%%/SmartPhone.skin/SmartPhone.png
+%%DATADIR%%/SmartPhone.skin/SmartPhone.skin
+%%DATADIR%%/SmartPhone.skin/defaultbuttons.conf
+%%DATADIR%%/SmartPhone2.skin/SmartPhone2-pressed.png
+%%DATADIR%%/SmartPhone2.skin/SmartPhone2.png
+%%DATADIR%%/SmartPhone2.skin/SmartPhone2.skin
+%%DATADIR%%/SmartPhone2.skin/defaultbuttons.conf
+%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
+%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
+%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
+%%DATADIR%%/SmartPhoneWithButtons.skin/defaultbuttons.conf
+%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
+%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.png
+%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.skin
+%%DATADIR%%/TouchscreenPhone.skin/defaultbuttons.conf
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.png
+%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.skin
+%%DATADIR%%/Trolltech-Keypad.skin/defaultbuttons.conf
+%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
+%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
+%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
+%%DATADIR%%/Trolltech-Touchscreen.skin/defaultbuttons.conf
+%%DATADIR%%/pda.qrc
+%%DATADIR%%/pda.skin
+%%DATADIR%%/pda_down.png
+%%DATADIR%%/pda_up.png
+@dirrm %%DATADIR%%/Trolltech-Touchscreen.skin
+@dirrm %%DATADIR%%/Trolltech-Keypad.skin
+@dirrm %%DATADIR%%/TouchscreenPhone.skin
+@dirrm %%DATADIR%%/SmartPhoneWithButtons.skin
+@dirrm %%DATADIR%%/SmartPhone2.skin
+@dirrm %%DATADIR%%/SmartPhone.skin
+@dirrm %%DATADIR%%/PortableMedia.skin
+@dirrm %%DATADIR%%/PDAPhone.skin
+@dirrm %%DATADIR%%/DualScreenPhone.skin
+@dirrm %%DATADIR%%/ClamshellPhone.skin
+@dirrm %%DATADIR%%