Stefan Fiedler:

package/base/dbus/dbus.conf

@@ -20,7 +20,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-pkginstalled qt33 && var_append extraconfopt " " "--enable-qt3"
+pkginstalled qt3 && var_append extraconfopt " " "--enable-qt3"
 # pkginstalled qt40 && var_append extraconfopt " " "--enable-qt"
 var_append extraconfopt " " "--disable-mono"
 

package/blindcoder/licq/licq.conf

@@ -33,7 +33,7 @@ licq_custmain () {
 		eval $MAKE $makeopt ; eval $MAKE $makeopt install
 	fi
 
-	if pkginstalled qt33 ; then
+       if pkginstalled qt3 ; then
 		cd $builddir/licq-$ver/plugins/qt-gui
 		eval ./configure $confopt
 		eval $MAKE $makeopt ; eval $MAKE $makeopt install

package/public/avahi/avahi.conf

@@ -1,7 +1,7 @@
 # none means unsupported here
 var_append extraconfopt " " "--with-distro=none"
 
-if ! pkginstalled qt33 ; then
+if ! pkginstalled qt3 ; then
 	var_append extraconfopt " " "--disable-qt3"
 fi
 if ! pkginstalled qt40 ; then

package/x11/qt/pkgmapper.in

@@ -1,3 +1,3 @@
 case "$pkg" in
-	qt33|qt42) pkg=qt ;;
+       qt3|qt4) pkg=qt ;;
 esac

package/x11/qt/preconfig.in

@@ -1,3 +1,3 @@
-pkgfork qt qt33
-pkgfork qt qt42 unflag CORE
+pkgfork qt qt3
+pkgfork qt qt4 unflag CORE
 pkgremove qt

package/x11/qt/qt.conf

@@ -49,7 +49,7 @@ qt_pass() {
 	# pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
 	# -I$pkg_postgresql_prefix/include" # maybe more
 
-	if [ $xpkg == qt33 ]; then 
+       if [ $xpkg == qt3 ]; then
 		 var_append CXXFLAGS " " "-I/usr/X11/include"
 		 pkginstalled libmng && var_append confopt " " "-system-libmng"
 		 var_append confopt " " "-thread"
@@ -79,7 +79,7 @@ qt_pass() {
 	)
 	
     echo "Copy some documentation ..."
-	if [ $xpkg == qt33 ] ; then
+       if [ $xpkg == qt3 ] ; then
 		 cp -a ch* tutorial $docdir/
  	elif [ $xpkg == qt42 ] ; then
 			cp -a changes-$ver $docdir/
@@ -88,10 +88,10 @@ qt_pass() {
 	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 qt33 here
-	if [ $xpkg == qt33 ]; then
-	cat > $root/etc/profile.d/qt33 <<-EOT
-QT33DIR=$root/opt/qt33
+       # 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

package/x11/qt/qt.desc

@@ -40,15 +40,15 @@
 
 [P] X --?--5---9 157.500
 
-#if xpkg == qt33
+#if xpkg == qt3
 [V] 3.3.8
 [D] 2574457933 qt-x11-free-3.3.8.tar.bz2 ftp://ftp.trolltech.com/qt/source/
 #endif
 
-#if xpkg == qt42
+#if xpkg == qt4
 [V] 4.2.3
 [D] 2234929916 qt-x11-opensource-src-4.2.3.tar.gz ftp://ftp.trolltech.com/qt/source/
 #endif
 
-[CD] <COPY> cp $cachedir/qt33.cache $confdir/$pkg.cache
+[CD] <COPY> cp $cachedir/qt3.cache $confdir/$pkg.cache