12 files changed, 116 insertions, 48 deletions

diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 82afe81c0bad..2aee19e54e48 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
+PORTREVISION?=  1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -33,7 +34,6 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-shared -qt-gif -system-zlib \
@@ -54,7 +54,7 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=${NONEXISTENT}
+PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -73,14 +73,10 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(WITH_OPENGL)
-# Display WITH_OPENGL advisory.
+SLEEP=/bin/sleep
 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} '===> **************************************************'
-.endif
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
@@ -110,8 +106,9 @@ pre-install:
 
 .if exists(${PKGMESSAGE})
 # Display another GL advisory. This one goes in the package, too.
-post-install:
-	@cat ${PKGMESSAGE}
+post-install::
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt30/pkg-message b/x11-toolkits/qt30/pkg-message
index b89693fcc8e5..3d0ea55c3c6b 100644
--- a/x11-toolkits/qt30/pkg-message
+++ b/x11-toolkits/qt30/pkg-message
@@ -1,4 +1,15 @@
 ===> *****************************************************************
-===> This version of QT has been built with OpenGL graphics support.
+===> WARNING!!!
+===> This version of QT will be/has been built with OpenGL graphics 
+===> support.
 ===> It may not function correctly with versions of XFree86 < 4.2.0.
 ===> *****************************************************************
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt30/pkg-message-upgrade b/x11-toolkits/qt30/pkg-message-upgrade
new file mode 100644
index 000000000000..88d9ca6070cf
--- /dev/null
+++ b/x11-toolkits/qt30/pkg-message-upgrade
@@ -0,0 +1,9 @@
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 82afe81c0bad..2aee19e54e48 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
+PORTREVISION?=  1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -33,7 +34,6 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-shared -qt-gif -system-zlib \
@@ -54,7 +54,7 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=${NONEXISTENT}
+PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -73,14 +73,10 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(WITH_OPENGL)
-# Display WITH_OPENGL advisory.
+SLEEP=/bin/sleep
 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} '===> **************************************************'
-.endif
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
@@ -110,8 +106,9 @@ pre-install:
 
 .if exists(${PKGMESSAGE})
 # Display another GL advisory. This one goes in the package, too.
-post-install:
-	@cat ${PKGMESSAGE}
+post-install::
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt31/pkg-message b/x11-toolkits/qt31/pkg-message
index b89693fcc8e5..3d0ea55c3c6b 100644
--- a/x11-toolkits/qt31/pkg-message
+++ b/x11-toolkits/qt31/pkg-message
@@ -1,4 +1,15 @@
 ===> *****************************************************************
-===> This version of QT has been built with OpenGL graphics support.
+===> WARNING!!!
+===> This version of QT will be/has been built with OpenGL graphics 
+===> support.
 ===> It may not function correctly with versions of XFree86 < 4.2.0.
 ===> *****************************************************************
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt31/pkg-message-upgrade b/x11-toolkits/qt31/pkg-message-upgrade
new file mode 100644
index 000000000000..88d9ca6070cf
--- /dev/null
+++ b/x11-toolkits/qt31/pkg-message-upgrade
@@ -0,0 +1,9 @@
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 82afe81c0bad..2aee19e54e48 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
+PORTREVISION?=  1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -33,7 +34,6 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-shared -qt-gif -system-zlib \
@@ -54,7 +54,7 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=${NONEXISTENT}
+PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -73,14 +73,10 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(WITH_OPENGL)
-# Display WITH_OPENGL advisory.
+SLEEP=/bin/sleep
 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} '===> **************************************************'
-.endif
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
@@ -110,8 +106,9 @@ pre-install:
 
 .if exists(${PKGMESSAGE})
 # Display another GL advisory. This one goes in the package, too.
-post-install:
-	@cat ${PKGMESSAGE}
+post-install::
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt32/pkg-message b/x11-toolkits/qt32/pkg-message
index b89693fcc8e5..3d0ea55c3c6b 100644
--- a/x11-toolkits/qt32/pkg-message
+++ b/x11-toolkits/qt32/pkg-message
@@ -1,4 +1,15 @@
 ===> *****************************************************************
-===> This version of QT has been built with OpenGL graphics support.
+===> WARNING!!!
+===> This version of QT will be/has been built with OpenGL graphics 
+===> support.
 ===> It may not function correctly with versions of XFree86 < 4.2.0.
 ===> *****************************************************************
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt32/pkg-message-upgrade b/x11-toolkits/qt32/pkg-message-upgrade
new file mode 100644
index 000000000000..88d9ca6070cf
--- /dev/null
+++ b/x11-toolkits/qt32/pkg-message-upgrade
@@ -0,0 +1,9 @@
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 82afe81c0bad..2aee19e54e48 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
+PORTREVISION?=  1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -33,7 +34,6 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
 		-shared -qt-gif -system-zlib \
@@ -54,7 +54,7 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=${NONEXISTENT}
+PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -73,14 +73,10 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(WITH_OPENGL)
-# Display WITH_OPENGL advisory.
+SLEEP=/bin/sleep
 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} '===> **************************************************'
-.endif
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
@@ -110,8 +106,9 @@ pre-install:
 
 .if exists(${PKGMESSAGE})
 # Display another GL advisory. This one goes in the package, too.
-post-install:
-	@cat ${PKGMESSAGE}
+post-install::
+	@${CAT} ${PKGMESSAGE}
+	@${SLEEP} 10
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt33/pkg-message b/x11-toolkits/qt33/pkg-message
index b89693fcc8e5..3d0ea55c3c6b 100644
--- a/x11-toolkits/qt33/pkg-message
+++ b/x11-toolkits/qt33/pkg-message
@@ -1,4 +1,15 @@
 ===> *****************************************************************
-===> This version of QT has been built with OpenGL graphics support.
+===> WARNING!!!
+===> This version of QT will be/has been built with OpenGL graphics 
+===> support.
 ===> It may not function correctly with versions of XFree86 < 4.2.0.
 ===> *****************************************************************
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+
diff --git a/x11-toolkits/qt33/pkg-message-upgrade b/x11-toolkits/qt33/pkg-message-upgrade
new file mode 100644
index 000000000000..88d9ca6070cf
--- /dev/null
+++ b/x11-toolkits/qt33/pkg-message-upgrade
@@ -0,0 +1,9 @@
+
+===> *****************************************************************
+===> WARNING!!!
+===> If you are upgrading from Qt version 3.0 - 3.0.4, you MUST
+===> rebuild and reinstall kdelibs after installing the new Qt version, 
+===> at the least, and all of KDE (starting with kdelibs, then kdebase) 
+===> to be sure of correct function.
+===> *****************************************************************
+