12 files changed, 32 insertions, 56 deletions

diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 6b5b741b57fa..82afe81c0bad 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
 CATEGORIES?=	x11-toolkits
-MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
-                ftp://ftp.chg.ru/pub/X11/qt/source/
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
+		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -46,7 +46,7 @@ CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-docdir ${QT_PREFIX}/share/doc/qt \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=-debug
 .endif
 .if defined(WITH_OPENGL)
 USE_MESA=	yes
@@ -78,7 +78,7 @@ BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
-	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.' 
+	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
diff --git a/x11-toolkits/qt30/pkg-descr b/x11-toolkits/qt30/pkg-descr
index 78327aaabb1c..6715a948ad81 100644
--- a/x11-toolkits/qt30/pkg-descr
+++ b/x11-toolkits/qt30/pkg-descr
@@ -1,5 +1,5 @@
 Qt is a toolkit for building a GUI for X in C++. The main
-documentation is in share/doc/qt2 and is also available on
+documentation is in share/doc/qt and is also available on
 the web.
 
 WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 3bf34042537b..713dec9735a4 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -377,25 +377,19 @@ include/qxt.h
 lib/libeditor.prl
 lib/libeditor.so
 lib/libeditor.so.1
+lib/libeditor.so.1.0
 lib/libeditor.so.1.0.0
-@exec rm -f %D/lib/libeditor.so.1.0 || true
-@exec ln -s libeditor.so.1.0.0 %D/lib/libeditor.so.1.0 || true
-@unexec rm -f %D/lib/libeditor.so.1.0 || true
 lib/libqnp.prl
 lib/libqt-mt.prl
 lib/libqt-mt.so
 lib/libqt-mt.so.3
+lib/libqt-mt.so.3.0
 lib/libqt-mt.so.3.0.5
-@exec rm -f %D/lib/libqt-mt.so.3.0 || true
-@exec ln -s libqt-mt.so.3.0.0 %D/lib/libqt-mt.so.3.0 || true
-@unexec rm -f  %D/lib/libqt-mt.so.3.0 || true
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
+lib/libqui.so.1.0
 lib/libqui.so.1.0.0
-@exec rm -f %D/lib/libqui.so.1.0 || true
-@exec ln -s libqui.so.1.0.0 %D/lib/libqui.so.1.0 || true
-@unexec rm -f  %D/lib/libqui.so.1.0 || true
 lib/libqxt.prl
 mkspecs/aix-64/qmake.conf
 mkspecs/aix-64/qplatformdefs.h
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 6b5b741b57fa..82afe81c0bad 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
 CATEGORIES?=	x11-toolkits
-MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
-                ftp://ftp.chg.ru/pub/X11/qt/source/
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
+		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -46,7 +46,7 @@ CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-docdir ${QT_PREFIX}/share/doc/qt \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=-debug
 .endif
 .if defined(WITH_OPENGL)
 USE_MESA=	yes
@@ -78,7 +78,7 @@ BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
-	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.' 
+	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
diff --git a/x11-toolkits/qt31/pkg-descr b/x11-toolkits/qt31/pkg-descr
index 78327aaabb1c..6715a948ad81 100644
--- a/x11-toolkits/qt31/pkg-descr
+++ b/x11-toolkits/qt31/pkg-descr
@@ -1,5 +1,5 @@
 Qt is a toolkit for building a GUI for X in C++. The main
-documentation is in share/doc/qt2 and is also available on
+documentation is in share/doc/qt and is also available on
 the web.
 
 WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 3bf34042537b..713dec9735a4 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -377,25 +377,19 @@ include/qxt.h
 lib/libeditor.prl
 lib/libeditor.so
 lib/libeditor.so.1
+lib/libeditor.so.1.0
 lib/libeditor.so.1.0.0
-@exec rm -f %D/lib/libeditor.so.1.0 || true
-@exec ln -s libeditor.so.1.0.0 %D/lib/libeditor.so.1.0 || true
-@unexec rm -f %D/lib/libeditor.so.1.0 || true
 lib/libqnp.prl
 lib/libqt-mt.prl
 lib/libqt-mt.so
 lib/libqt-mt.so.3
+lib/libqt-mt.so.3.0
 lib/libqt-mt.so.3.0.5
-@exec rm -f %D/lib/libqt-mt.so.3.0 || true
-@exec ln -s libqt-mt.so.3.0.0 %D/lib/libqt-mt.so.3.0 || true
-@unexec rm -f  %D/lib/libqt-mt.so.3.0 || true
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
+lib/libqui.so.1.0
 lib/libqui.so.1.0.0
-@exec rm -f %D/lib/libqui.so.1.0 || true
-@exec ln -s libqui.so.1.0.0 %D/lib/libqui.so.1.0 || true
-@unexec rm -f  %D/lib/libqui.so.1.0 || true
 lib/libqxt.prl
 mkspecs/aix-64/qmake.conf
 mkspecs/aix-64/qplatformdefs.h
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 6b5b741b57fa..82afe81c0bad 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
 CATEGORIES?=	x11-toolkits
-MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
-                ftp://ftp.chg.ru/pub/X11/qt/source/
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
+		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -46,7 +46,7 @@ CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-docdir ${QT_PREFIX}/share/doc/qt \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=-debug
 .endif
 .if defined(WITH_OPENGL)
 USE_MESA=	yes
@@ -78,7 +78,7 @@ BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
-	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.' 
+	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
diff --git a/x11-toolkits/qt32/pkg-descr b/x11-toolkits/qt32/pkg-descr
index 78327aaabb1c..6715a948ad81 100644
--- a/x11-toolkits/qt32/pkg-descr
+++ b/x11-toolkits/qt32/pkg-descr
@@ -1,5 +1,5 @@
 Qt is a toolkit for building a GUI for X in C++. The main
-documentation is in share/doc/qt2 and is also available on
+documentation is in share/doc/qt and is also available on
 the web.
 
 WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 3bf34042537b..713dec9735a4 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -377,25 +377,19 @@ include/qxt.h
 lib/libeditor.prl
 lib/libeditor.so
 lib/libeditor.so.1
+lib/libeditor.so.1.0
 lib/libeditor.so.1.0.0
-@exec rm -f %D/lib/libeditor.so.1.0 || true
-@exec ln -s libeditor.so.1.0.0 %D/lib/libeditor.so.1.0 || true
-@unexec rm -f %D/lib/libeditor.so.1.0 || true
 lib/libqnp.prl
 lib/libqt-mt.prl
 lib/libqt-mt.so
 lib/libqt-mt.so.3
+lib/libqt-mt.so.3.0
 lib/libqt-mt.so.3.0.5
-@exec rm -f %D/lib/libqt-mt.so.3.0 || true
-@exec ln -s libqt-mt.so.3.0.0 %D/lib/libqt-mt.so.3.0 || true
-@unexec rm -f  %D/lib/libqt-mt.so.3.0 || true
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
+lib/libqui.so.1.0
 lib/libqui.so.1.0.0
-@exec rm -f %D/lib/libqui.so.1.0 || true
-@exec ln -s libqui.so.1.0.0 %D/lib/libqui.so.1.0 || true
-@unexec rm -f  %D/lib/libqui.so.1.0 || true
 lib/libqxt.prl
 mkspecs/aix-64/qmake.conf
 mkspecs/aix-64/qplatformdefs.h
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 6b5b741b57fa..82afe81c0bad 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
 CATEGORIES?=	x11-toolkits
-MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
-                ftp://ftp.chg.ru/pub/X11/qt/source/
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
+		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -46,7 +46,7 @@ CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-docdir ${QT_PREFIX}/share/doc/qt \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=-debug
 .endif
 .if defined(WITH_OPENGL)
 USE_MESA=	yes
@@ -78,7 +78,7 @@ BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
-	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.' 
+	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
diff --git a/x11-toolkits/qt33/pkg-descr b/x11-toolkits/qt33/pkg-descr
index 78327aaabb1c..6715a948ad81 100644
--- a/x11-toolkits/qt33/pkg-descr
+++ b/x11-toolkits/qt33/pkg-descr
@@ -1,5 +1,5 @@
 Qt is a toolkit for building a GUI for X in C++. The main
-documentation is in share/doc/qt2 and is also available on
+documentation is in share/doc/qt and is also available on
 the web.
 
 WWW: http://doc.trolltech.com/
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 3bf34042537b..713dec9735a4 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -377,25 +377,19 @@ include/qxt.h
 lib/libeditor.prl
 lib/libeditor.so
 lib/libeditor.so.1
+lib/libeditor.so.1.0
 lib/libeditor.so.1.0.0
-@exec rm -f %D/lib/libeditor.so.1.0 || true
-@exec ln -s libeditor.so.1.0.0 %D/lib/libeditor.so.1.0 || true
-@unexec rm -f %D/lib/libeditor.so.1.0 || true
 lib/libqnp.prl
 lib/libqt-mt.prl
 lib/libqt-mt.so
 lib/libqt-mt.so.3
+lib/libqt-mt.so.3.0
 lib/libqt-mt.so.3.0.5
-@exec rm -f %D/lib/libqt-mt.so.3.0 || true
-@exec ln -s libqt-mt.so.3.0.0 %D/lib/libqt-mt.so.3.0 || true
-@unexec rm -f  %D/lib/libqt-mt.so.3.0 || true
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
+lib/libqui.so.1.0
 lib/libqui.so.1.0.0
-@exec rm -f %D/lib/libqui.so.1.0 || true
-@exec ln -s libqui.so.1.0.0 %D/lib/libqui.so.1.0 || true
-@unexec rm -f  %D/lib/libqui.so.1.0 || true
 lib/libqxt.prl
 mkspecs/aix-64/qmake.conf
 mkspecs/aix-64/qplatformdefs.h