From 96aff57328f2c98310528aa93f1fa0ed68a2317b Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Sun, 23 Nov 2008 13:07:41 +0000
Subject: [PATCH] Stefan Fiedler: 	qt: more qt42 to qt4 renaming (I
 missed some in my previous patch); 	rename QT33DIR environment variable to
 QT3DIR and QT42DIR 	to QT4DIR 	UNTESTED

[2008012520285132576] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9348 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/x11/qt/qt.conf | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/package/x11/qt/qt.conf b/package/x11/qt/qt.conf
index cde74441d..858d83978 100644
--- a/package/x11/qt/qt.conf
+++ b/package/x11/qt/qt.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -24,7 +25,7 @@ if [ $prefix_auto = 1 ] ; then
 	prefix="opt/$xpkg"
 	set_confopt
 fi
-if [ $xpkg == 'qt42' ] ; then
+if [ $xpkg == qt4 ] ; then
 	 splitdesc_debug() { desc_I="Qt debug libraries"; }
 	 splitreg 10 debug $prefix/lib/.+_debug
 	 splitreg 41 dev $prefix/examples/
@@ -58,7 +59,7 @@ qt_pass() {
 		 pkginstalled zlib && var_append confopt " " "-system-zlib"
 		 pkginstalled libpng && var_append confopt " " "-system-libpng"
 		 pkginstalled libjpeg && var_append confopt " " "-system-libjpeg"
-	elif [ $xpkg == qt42 ]; then
+	elif [ $xpkg == qt4 ]; then
 		 pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
 		  -I$pkg_postgresql_prefix/include -L$pkg_postgresql_prefix/lib"
  	fi
@@ -79,28 +80,26 @@ qt_pass() {
 	)
 	
     echo "Copy some documentation ..."
-       if [ $xpkg == qt3 ] ; then
-		 cp -a ch* tutorial $docdir/
- 	elif [ $xpkg == qt42 ] ; then
-			cp -a changes-$ver $docdir/
+	if [ $xpkg == qt3 ] ; then
+		cp -a ch* tutorial $docdir/
+	elif [ $xpkg == qt4 ] ; then
+		cp -a changes-$ver $docdir/
 	fi
 	
 	find $docdir -name '*.o' | xargs rm -vf
 	find $docdir -type f -perm +111 -exec strip -v '{}' \;
 	
-       # until kde 4 which will be based on qt4 the standard is qt3 here
-       if [ $xpkg == qt3 ]; then
-       cat > $root/etc/profile.d/qt3 <<-EOT
-QT33DIR=$root/opt/qt3
-QTDIR=\$QT33DIR
-export QT33DIR QTDIR
-EOT
-	elif [ $xpkg == qt42 ]; then
-	cat > $root/etc/profile.d/qt42 <<-EOT
-QT42DIR=$root/opt/qt42
-export QT42DIR
-EOT
-	 fi
+	cat > $root/etc/profile.d/$xpkg <<-EOT
+		QT${xpkg:2:1}DIR=/$prefix
+		export QT${xpkg:2:1}DIR
+	EOT
+	# until kde 4 which will be based on qt4 the standard is qt3 here
+	if [ $xpkg == qt3 ]; then
+		cat >> $root/etc/profile.d/$xpkg <<-EOT
+			QTDIR=\$QT${xpkg:2:1}DIR
+			export QTDIR
+		EOT
+	fi
 }
 
 qt_main() {