MFkde-freebsd Repository

- Add a warning about the nvidia-opengl problems
- Don't build examples and tutorials
- Don't install useless header files that clobber jdk and netscape header
files
- Bump PORTREVISION

Submitted by: 	Lauri Watts <lauri@kde.org>
		Michael Nottebrock <michaelnottebrock@gmx.net>

6 files changed, 60 insertions, 21 deletions

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 3340b4bd78e5..ad99041c4f74 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -8,12 +8,12 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/	\
 		ftp://ftp.silug.org/pub/qt/		\
 		ftp://ftp.bero.org/pub/qt/		\
 		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
-
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
 		-docdir ${DOCSDIR} -plugindir ${PREFIX}/lib/plugins
 
 .if defined(DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=	-debug
 .endif
 
 .if !defined(WITHOUT_OPENGL)
@@ -68,6 +68,17 @@ ALL_TARGET=	sub-tools
 CFLAGS+=	-O0
 .endif
 
+.if !defined(WITHOUT_OPENGL)
+# Display WITH_OPENGL advisory.
+pre-everything::
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
+	@${ECHO_MSG} '===> the NVidia drivers provided by the x11/nvidia port'
+	@${ECHO_MSG} '===> If you use these drivers, we recommend you press'
+	@${ECHO_MSG} '===> Ctrl-C now and set WITHOUT_OPENGL'
+	@${ECHO_MSG} '===> **************************************************'
+.endif
+
 .if ${XFREE86_VERSION} < 4
 BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 .endif # ${XFREE86_VERSION} < 4
@@ -78,6 +89,13 @@ BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
 
 post-patch:
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
+	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
+	@cd ${WRKSRC}/include; \
+		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
+	@cd ${WRKSRC}/extensions/nsplugin/src; \
+		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
+		npunix.c npwin.cpp
 	@${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 20be8e28e214..602fcaf6d869 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -14,11 +14,6 @@ bin/qmake
 bin/qtconfig
 bin/qvfb
 bin/uic
-include/jri.h
-include/jri_md.h
-include/jritypes.h
-include/npapi.h
-include/npupp.h
 include/private/qapplication_p.h
 include/private/qcolor_p.h
 include/private/qcom_p.h
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 3340b4bd78e5..ad99041c4f74 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -8,12 +8,12 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/	\
 		ftp://ftp.silug.org/pub/qt/		\
 		ftp://ftp.bero.org/pub/qt/		\
 		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
-
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
 		-docdir ${DOCSDIR} -plugindir ${PREFIX}/lib/plugins
 
 .if defined(DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=	-debug
 .endif
 
 .if !defined(WITHOUT_OPENGL)
@@ -68,6 +68,17 @@ ALL_TARGET=	sub-tools
 CFLAGS+=	-O0
 .endif
 
+.if !defined(WITHOUT_OPENGL)
+# Display WITH_OPENGL advisory.
+pre-everything::
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
+	@${ECHO_MSG} '===> the NVidia drivers provided by the x11/nvidia port'
+	@${ECHO_MSG} '===> If you use these drivers, we recommend you press'
+	@${ECHO_MSG} '===> Ctrl-C now and set WITHOUT_OPENGL'
+	@${ECHO_MSG} '===> **************************************************'
+.endif
+
 .if ${XFREE86_VERSION} < 4
 BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 .endif # ${XFREE86_VERSION} < 4
@@ -78,6 +89,13 @@ BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
 
 post-patch:
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
+	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
+	@cd ${WRKSRC}/include; \
+		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
+	@cd ${WRKSRC}/extensions/nsplugin/src; \
+		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
+		npunix.c npwin.cpp
 	@${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 20be8e28e214..602fcaf6d869 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -14,11 +14,6 @@ bin/qmake
 bin/qtconfig
 bin/qvfb
 bin/uic
-include/jri.h
-include/jri_md.h
-include/jritypes.h
-include/npapi.h
-include/npupp.h
 include/private/qapplication_p.h
 include/private/qcolor_p.h
 include/private/qcom_p.h
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 3340b4bd78e5..ad99041c4f74 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,12 +8,12 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/	\
 		ftp://ftp.silug.org/pub/qt/		\
 		ftp://ftp.bero.org/pub/qt/		\
 		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
-
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
 		-docdir ${DOCSDIR} -plugindir ${PREFIX}/lib/plugins
 
 .if defined(DEBUG)
-CONFIGURE_ARGS+= -debug
+CONFIGURE_ARGS+=	-debug
 .endif
 
 .if !defined(WITHOUT_OPENGL)
@@ -68,6 +68,17 @@ ALL_TARGET=	sub-tools
 CFLAGS+=	-O0
 .endif
 
+.if !defined(WITHOUT_OPENGL)
+# Display WITH_OPENGL advisory.
+pre-everything::
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
+	@${ECHO_MSG} '===> the NVidia drivers provided by the x11/nvidia port'
+	@${ECHO_MSG} '===> If you use these drivers, we recommend you press'
+	@${ECHO_MSG} '===> Ctrl-C now and set WITHOUT_OPENGL'
+	@${ECHO_MSG} '===> **************************************************'
+.endif
+
 .if ${XFREE86_VERSION} < 4
 BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 .endif # ${XFREE86_VERSION} < 4
@@ -78,6 +89,13 @@ BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
 
 post-patch:
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
+	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
+	@cd ${WRKSRC}/include; \
+		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
+	@cd ${WRKSRC}/extensions/nsplugin/src; \
+		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
+		npunix.c npwin.cpp
 	@${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 20be8e28e214..602fcaf6d869 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -14,11 +14,6 @@ bin/qmake
 bin/qtconfig
 bin/qvfb
 bin/uic
-include/jri.h
-include/jri_md.h
-include/jritypes.h
-include/npapi.h
-include/npupp.h
 include/private/qapplication_p.h
 include/private/qcolor_p.h
 include/private/qcom_p.h