From 950e3d9719d414f92806c5259ebbca23cb2f3ba2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 14 Apr 2013 17:45:22 +0200
Subject: [PATCH] qt: fix build/install.

---
 srcpkgs/qt/template | 100 ++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 583dbbb6bb..1b28938849 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -20,6 +20,7 @@ makedepends="pkg-config libpng-devel>=1.5.10 MesaLib-devel libXrender-devel
 
 do_configure() {
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
+	export LD="$CXX"
 
 	sed -i "s|-O2|${XBPS_CXXFLAGS}|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${XBPS_LDFLAGS}|g" mkspecs/common/g++.conf
@@ -36,6 +37,8 @@ do_configure() {
 }
 
 do_build() {
+	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
+	export LD="$CXX"
 	make ${makejobs}
 }
 
@@ -68,6 +71,53 @@ do_install() {
 	vinstall LGPL_EXCEPTION.txt 644 usr/share/licenses/qt
 }
 
+qt-designer_package() {
+	depends="hicolor-icon-theme"
+	short_desc="Qt GUI designer"
+	pkg_install() {
+		vmove usr/bin/designer
+		vmove "usr/lib/libQtDesigner.so*"
+		vmove "usr/lib/libQtDesignerComponents.so*"
+		vmove usr/lib/qt/plugins/designer
+		vmove "usr/share/icons/hicolor/128x128/apps/designer.*"
+		vmove "usr/share/applications/designer.*"
+		vmove "usr/share/qt/translations/designer*"
+	}
+}
+
+qt-devel-tools_package() {
+	depends="hicolor-icon-theme"
+	short_desc="Qt development tools"
+	pkg_install() {
+		for f in assistant* lconvert linguist pixeltool qcollectiongenerator \
+			qdbusviewer qhelp* xmlpatterns* qdbus qttrace* qdoc3 qmlviewer; do
+			vmove usr/bin/${f}
+		done
+		vmove usr/share/icons/hicolor
+		for f in linguist assistant; do
+			vmove usr/share/applications/${f}.desktop
+			[ ! -f ${DESTDIR}/usr/share/pixmaps/${f}.png ] && continue
+			vmove usr/share/pixmaps/${f}.png
+		done
+		vmove usr/share/qt/phrasebooks
+	}
+}
+
+qt-devel_package() {
+	depends="qt-qmake libX11-devel icu-devel"
+	short_desc="Qt development files"
+	pkg_install() {
+		for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
+			rcc uic uic3; do
+			vmove usr/bin/${f}
+		done
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.prl"
+		vmove usr/lib/pkgconfig
+	}
+}
+
 qt-plugin-pgsql_package() {
 	short_desc="Qt PostgreSQL plugin"
 	pkg_install() {
@@ -92,7 +142,7 @@ qt-plugin-sqlite_package() {
 qt-qmake_package() {
 	short_desc="Qt qmake Makefile generator tool"
 	pkg_install() {
-		vmove usr/bin/qemu
+		vmove usr/bin/qmake
 		vmove usr/share/qt/mkspecs
 	}
 }
@@ -108,54 +158,6 @@ qt-qtconfig_package() {
 	}
 }
 
-qt-designer_package() {
-	depends="hicolor-icon-theme"
-	short_desc="Qt GUI designer"
-	pkg_install() {
-		vmove usr/bin/designer
-		vmove "usr/lib/libQtDesigner.so*"
-		vmove "usr/lib/libQtDesignerComponents.so*"
-		vmove usr/lib/qt/plugins/designer
-		vmove "usr/share/icons/hicolor/128x128/apps/designer.*"
-		vmove "usr/share/applications/designer.*"
-		vmove "usr/share/qt/translations/designer*"
-	}
-}
-
-qt-devel_package() {
-	depends="qt-qmake libX11-devel icu-devel"
-	short_desc="Qt development files"
-	pkg_install() {
-		for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
-			rcc uic uic3; do
-			vmove usr/bin/${f}
-		done
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.prl"
-		vmove usr/lib/pkgconfig
-	}
-}
-
-qt-devel-tools_package() {
-	depends="hicolor-icon-theme"
-	short_desc="Qt development tools"
-	pkg_install() {
-		for f in assistant* lconvert linguist pixeltool qcollectiongenerator \
-			qdbusviewer qhelp* xmlpatterns* qdbus qttrace* qdoc3 qmlviewer; do
-			vmove usr/bin/${f}
-		done
-		vmove usr/share/icons/hicolor
-		for f in linguist assistant; do
-			vmove usr/share/applications/${f}.desktop
-			[ ! -f ${DESTDIR}/usr/share/pixmaps/${f}.png ] && continue
-			vmove usr/share/pixmaps/${f}.png
-		done
-		vmove usr/share/qt/translations
-		vmove usr/share/qt/phrasebooks
-	}
-}
-
 qt_package() {
 	pkg_install() {
 		vmove usr