Andreas V. Meier:

package/x11/qt/disable-tutorial-examples.patch

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/qt/disable-tutorial-examples.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.orig	Wed Apr  3 16:47:45 2002
-+++ ./Makefile	Wed Apr  3 16:48:28 2002
-@@ -10,7 +10,7 @@
- install: FORCE
- 	@$(MAKE) qt.install
- 
--all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
-+all: symlinks src-qmake src-moc sub-src sub-tools
- 	@echo
- 	@echo "The Qt library is now built in ./lib"
- 	@echo "The Qt examples are built in the directories in ./examples"

package/x11/qt/preconfig.in

@@ -0,0 +1,5 @@
+if pkgcheck qt X; then
+	 pkgfork qt qt33
+	 pkgfork qt qt40
+	 pkgremove qt
+fi

package/x11/qt/qmake-broken-symlink.patch

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/qt/qmake-broken-symlink.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- qt-x11-free-3.3.3/qmake/Makefile.unix.orig	2004-08-30 23:37:28.000000000 +0200
-+++ qt-x11-free-3.3.3/qmake/Makefile.unix	2004-08-30 23:38:49.000000000 +0200
-@@ -42,7 +42,7 @@
- qmake: $(OBJS) $(QOBJS)
- 	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
- 	rm -f @BUILD_PATH@/bin/$@
--	ln -s ../qmake/$@ @BUILD_PATH@/bin/$@
-+	cp -a ../qmake/$@ @BUILD_PATH@/bin/$@
- 
- install: qmake
- 	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@

package/x11/qt/qt.conf

@@ -21,9 +21,14 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 if [ $prefix_auto = 1 ] ; then
-	prefix="opt/qt33"
+	prefix="opt/$xpkg"
 	set_confopt
 fi
+if [ $xpkg == 'qt40' ] ; then
+	 splitdesc_debug() { desc_I="Qt debug libraries"; }
+	 splitreg 10 debug $prefix/lib/.+_debug
+	 splitreg 41 dev $prefix/examples/
+fi
 
 qt_pass() {
 	QTDIR=$PWD
@@ -33,22 +38,31 @@ qt_pass() {
 
 	# Qt only supports some selected options ...
 	confopt="$1 -prefix $root/$prefix -bindir $bindir -libdir $libdir \
-		 -docdir $docdir -sysconfdir $sysconfdir \
-		 -thread -qt-gif -xft -xrender -no-g++-exceptions -no-stl"
-
-	pkginstalled zlib && var_append confopt " " "-system-zlib"
+		 -docdir $docdir -sysconfdir $sysconfdir"
 
-	pkginstalled libpng && var_append confopt " " "-system-libpng"
-	pkginstalled libmng && var_append confopt " " "-system-libmng"
-	pkginstalled libjpeg && var_append confopt " " "-system-libjpeg"
-
-	CXXFLAGS="$CXXFLAGS -I/usr/X11/include"
+	# config options used by all qt versions
+	var_append confopt " " "-qt-gif"
 	pkginstalled nas && var_append confopt " " "-system-nas-sound"
-
 	pkginstalled mysql && var_append confopt " " "-plugin-sql-mysql \
 		-I$pkg_mysql_prefix/include/mysql -L$pkg_mysql_prefix/lib"
 	# pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
-	#	-I$pkg_postgresql_prefix/include" # maybe more
+	# -I$pkg_postgresql_prefix/include" # maybe more
+
+	if [ $xpkg == qt33 ]; then 
+		 var_append CXXFLAGS " " "-I/usr/X11/include"
+		 pkginstalled libmng && var_append confopt " " "-system-libmng"
+		 var_append confopt " " "-thread"
+		 var_append confopt " " "-xft"
+		 var_append confopt " " "-no-stl"
+		 var_append confopt " " "-xrender"
+		 var_append confopt " " "-no-g++-exceptions"
+		 pkginstalled zlib && var_append confopt " " "-system-zlib"
+		 pkginstalled libpng && var_append confopt " " "-system-libpng"
+		 pkginstalled libjpeg && var_append confopt " " "-system-libjpeg"
+	elif [ $xpkg == qt40 ]; then
+		 pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
+		  -I$pkg_postgresql_prefix/include -L$pkg_postgresql_prefix/lib"
+ 	fi
 
 	# an optimization crashes g++ during the Makefile generator build :-(
 	echo "yes" | ( CXX_WRAPPER_BYPASS=1 ; ./configure $confopt )
@@ -65,18 +79,29 @@ qt_pass() {
 	[ -f libqt-mt.a ] && ln -svf libqt-mt.a libqt.a
 	)
 	
-        echo "Copy some documentation ..."
-	# to be done in another package: examples extensions tutorial tools ...
-	cp -a ch* tutorial $docdir/
+    echo "Copy some documentation ..."
+	if [ $xpkg == qt33 ] ; then
+		 cp -a ch* tutorial $docdir/
+ 	elif [ $xpkg == qt40 ] ; 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 qt33 here
+	if [ $xpkg == qt33 ]; then
 	cat > $root/etc/profile.d/qt33 <<-EOT
-QT33DIR=/$prefix
-QTDIR=/$prefix
+QT33DIR=$root/opt/qt33
+QTDIR=$QT33DIR
 export QT33DIR QTDIR
 EOT
+	elif [ $xpkg == qt40 ]; then
+	cat > $root/etc/profile.d/qt40 <<-EOT
+QT40DIR=$root/opt/qt40
+export QT40DIR
+EOT
+	 fi
 }
 
 qt_main() {

package/x11/qt/qt.desc

@@ -37,8 +37,15 @@
 
 [L] GPL
 [S] Stable
-[V] 3.3.5
+[V] 0000
 [P] X -?---5---9 126.700
 
+#if xpkg == qt33
+[V] 3.3.5
 [D] 3780543228 qt-x11-free-3.3.5.tar.bz2 ftp://ftp.trolltech.com/qt/source/
+#endif
 
+#if xpkg == qt40
+[V] 4.0.1
+[D] 3708254967 qt-x11-opensource-src-4.0.1.tar.gz ftp://ftp.trolltech.com/qt/source/
+#endif