1. Removed unused refs to sleep.

2. Removed upgrade message. It's been there too long.
3. Removed opengl message. BROKEN is still there.
4. Changed a comment to be accurate about some bogus nutscrape headers.

12 files changed, 4 insertions, 160 deletions

diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 4f1f6a77b807..fc59407d17f2 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -55,7 +55,6 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -74,12 +73,6 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-SLEEP=${TRUE}
-.else
-SLEEP=/bin/sleep
-.endif
-
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
 	@${ECHO}
@@ -90,7 +83,7 @@ pre-fetch:
 	@${FALSE}
 .endif
 
-# Remove unneeded dirs (speedup) and fake netscape files.
+# Remove unneeded dirs (speedup) and netscape files (build barfs).
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
@@ -125,11 +118,4 @@ pre-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
 
-.if exists(${PKGMESSAGE})
-# Display another GL advisory. This one goes in the package, too.
-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
deleted file mode 100644
index 3eecf4a1a2bb..000000000000
--- a/x11-toolkits/qt30/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-===> *****************************************************************
-===> 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 to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
-
diff --git a/x11-toolkits/qt30/pkg-message-upgrade b/x11-toolkits/qt30/pkg-message-upgrade
deleted file mode 100644
index 773f32273226..000000000000
--- a/x11-toolkits/qt30/pkg-message-upgrade
+++ /dev/null
@@ -1,9 +0,0 @@
-
-===> *****************************************************************
-===> WARNING!!!
-===> If you are upgrading to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 4f1f6a77b807..fc59407d17f2 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -55,7 +55,6 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -74,12 +73,6 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-SLEEP=${TRUE}
-.else
-SLEEP=/bin/sleep
-.endif
-
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
 	@${ECHO}
@@ -90,7 +83,7 @@ pre-fetch:
 	@${FALSE}
 .endif
 
-# Remove unneeded dirs (speedup) and fake netscape files.
+# Remove unneeded dirs (speedup) and netscape files (build barfs).
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
@@ -125,11 +118,4 @@ pre-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
 
-.if exists(${PKGMESSAGE})
-# Display another GL advisory. This one goes in the package, too.
-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
deleted file mode 100644
index 3eecf4a1a2bb..000000000000
--- a/x11-toolkits/qt31/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-===> *****************************************************************
-===> 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 to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
-
diff --git a/x11-toolkits/qt31/pkg-message-upgrade b/x11-toolkits/qt31/pkg-message-upgrade
deleted file mode 100644
index 773f32273226..000000000000
--- a/x11-toolkits/qt31/pkg-message-upgrade
+++ /dev/null
@@ -1,9 +0,0 @@
-
-===> *****************************************************************
-===> WARNING!!!
-===> If you are upgrading to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 4f1f6a77b807..fc59407d17f2 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -55,7 +55,6 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -74,12 +73,6 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-SLEEP=${TRUE}
-.else
-SLEEP=/bin/sleep
-.endif
-
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
 	@${ECHO}
@@ -90,7 +83,7 @@ pre-fetch:
 	@${FALSE}
 .endif
 
-# Remove unneeded dirs (speedup) and fake netscape files.
+# Remove unneeded dirs (speedup) and netscape files (build barfs).
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
@@ -125,11 +118,4 @@ pre-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
 
-.if exists(${PKGMESSAGE})
-# Display another GL advisory. This one goes in the package, too.
-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
deleted file mode 100644
index 3eecf4a1a2bb..000000000000
--- a/x11-toolkits/qt32/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-===> *****************************************************************
-===> 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 to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
-
diff --git a/x11-toolkits/qt32/pkg-message-upgrade b/x11-toolkits/qt32/pkg-message-upgrade
deleted file mode 100644
index 773f32273226..000000000000
--- a/x11-toolkits/qt32/pkg-message-upgrade
+++ /dev/null
@@ -1,9 +0,0 @@
-
-===> *****************************************************************
-===> WARNING!!!
-===> If you are upgrading to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 4f1f6a77b807..fc59407d17f2 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -55,7 +55,6 @@ PLIST_SUB+=	OPENGL=""
 PKGNAMESUFFIX=	-opengl
 BROKEN=	"Using WITH_OPENGL causes DRI to fail in mysterious ways"
 .else
-PKGMESSAGE=	pkg-message-upgrade
 PLIST_SUB+=	OPENGL="@comment "
 CONFIGURE_ARGS+=-disable-opengl
 .endif
@@ -74,12 +73,6 @@ CFLAGS+=	-O0
 BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
 .endif
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-SLEEP=${TRUE}
-.else
-SLEEP=/bin/sleep
-.endif
-
 pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
 	@${ECHO}
@@ -90,7 +83,7 @@ pre-fetch:
 	@${FALSE}
 .endif
 
-# Remove unneeded dirs (speedup) and fake netscape files.
+# Remove unneeded dirs (speedup) and netscape files (build barfs).
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
@@ -125,11 +118,4 @@ pre-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
 
-.if exists(${PKGMESSAGE})
-# Display another GL advisory. This one goes in the package, too.
-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
deleted file mode 100644
index 3eecf4a1a2bb..000000000000
--- a/x11-toolkits/qt33/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-===> *****************************************************************
-===> 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 to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************
-
diff --git a/x11-toolkits/qt33/pkg-message-upgrade b/x11-toolkits/qt33/pkg-message-upgrade
deleted file mode 100644
index 773f32273226..000000000000
--- a/x11-toolkits/qt33/pkg-message-upgrade
+++ /dev/null
@@ -1,9 +0,0 @@
-
-===> *****************************************************************
-===> WARNING!!!
-===> If you are upgrading to 3.0.5 from Qt version 3.0 - 3.0.4, you
-===> must rebuild/reinstall kdelibs after installing the new Qt version, 
-===> or attempts to build kdebase will fail. We recommended to
-===> rebuild all kde packages, starting with kdelibs, after such an
-===> upgrade. This is a one time procedure only.
-===> *****************************************************************