From 19ff9aa27dc97dfa81d1bbe5922650ef257f4119 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 3 Nov 2011 17:46:10 +0100
Subject: [PATCH] qt: bumprev for new MesaLib subpkgs.

---
 srcpkgs/qt/qt-demos.template    |  5 ++++-
 srcpkgs/qt/qt-designer.template |  4 +++-
 srcpkgs/qt/template             | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template
index 894a1a4a65a..e5d1ea2ee1f 100644
--- a/srcpkgs/qt/qt-demos.template
+++ b/srcpkgs/qt/qt-demos.template
@@ -5,12 +5,15 @@ long_desc="${long_desc}
 
  This package contains Qt 4 examples and demos."
 
+revision=1
+
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run MesaLib
+Add_dependency run libGL
+Add_dependency run libGLU
 Add_dependency run hicolor-icon-theme
 Add_dependency run qt-docs
 Add_dependency run qt
diff --git a/srcpkgs/qt/qt-designer.template b/srcpkgs/qt/qt-designer.template
index 1c3ecd097d5..0e1b00385d5 100644
--- a/srcpkgs/qt/qt-designer.template
+++ b/srcpkgs/qt/qt-designer.template
@@ -6,12 +6,14 @@ long_desc="${long_desc}
  Qt Designer is a tool for designing and building graphical user
  interfaces (GUIs) from Qt components."
 
+revision=1
+
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run MesaLib
+Add_dependency run libGL
 Add_dependency run hicolor-icon-theme
 Add_dependency run qt-plugin-gstreamer
 Add_dependency run gst-plugins-good
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 93bc39146b0..2b465367b2a 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,6 +1,7 @@
 # Template file for 'qt'
 pkgname=qt
 version=4.7.4
+revision=1
 _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 homepage="http://qt.nokia.com/"
@@ -22,7 +23,8 @@ Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
 Add_dependency run freetype
-Add_dependency run MesaLib
+Add_dependency run libOpenVG
+Add_dependency run libGL
 Add_dependency run libXrender
 Add_dependency run fontconfig
 Add_dependency run libXext
@@ -51,6 +53,7 @@ Add_dependency build libstdc++-devel
 Add_dependency build libXi-devel
 Add_dependency build libXv-devel
 Add_dependency build libXinerama-devel
+Add_dependency build libXrandr-devel
 Add_dependency build zlib-devel
 Add_dependency build dbus-devel
 Add_dependency build glib-devel
@@ -67,10 +70,7 @@ Add_dependency build libmysqlclient-devel
 Add_dependency build postgresql-libs-devel
 Add_dependency build pulseaudio-devel
 
-do_build()
-{
-	# Use cmp(1) from diffutils.
-	export PATH="/usr/bin:$PATH"
+do_configure() {
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
 
 	sed -i "s|-O2|${XBPS_CXXFLAGS}|" mkspecs/common/g++.conf
@@ -95,15 +95,15 @@ do_build()
 		-no-sql-odbc -no-sql-sqlite2 \
 		-no-cups -dbus-linked -no-nas-sound -iconv -shared \
 		-release -fast -no-sql-tds -no-gtkstyle
+}
 
+do_build() {
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	local hicolordir=${DESTDIR}/usr/share/icons/hicolor
 
-	cd ${wrksrc}
 	make INSTALL_ROOT=${DESTDIR} install
 
 	# install missing icons and desktop files
@@ -112,13 +112,13 @@ do_install()
 		install -D -m644 ${icon} \
 			${hicolordir}/${size}x${size}/apps/linguist.png
 	done
-	install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+	install -Dm644 src/gui/dialogs/images/qtlogo-64.png \
 		${hicolordir}/64x64/apps/qtlogo.png
-	install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+	install -Dm644 src/gui/dialogs/images/qtlogo-64.png \
 		${DESTDIR}/usr/share/pixmaps/qtlogo.png
-	install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+	install -Dm644 tools/assistant/tools/assistant/images/assistant.png \
 		${hicolordir}/32x32/apps/assistant.png
-	install -D -m644 tools/designer/src/designer/images/designer.png \
+	install -Dm644 tools/designer/src/designer/images/designer.png \
 		${hicolordir}/128x128/apps/designer.png
 	install -d ${DESTDIR}/usr/share/applications
 	install -m644 ${FILESDIR}/*.desktop \