Fix conflict with mozilla-headers. Bump PORTREVISION for package change.

PR:		37881
Reported by:	Chris Knight <chris@aims.com.au>
Submitted by:	Alan Eldridge <alane@geeksrus.net>

8 files changed, 28 insertions, 28 deletions

diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 43d4747e814c..aa1950e0bbb0 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
                 ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -76,10 +76,15 @@ pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
-# Remove unneeded dirs (speedup).
+# Remove unneeded dirs (speedup) and fake netscape files.
 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
 
 # Work around qmake generated dependencies
 pre-install:
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index cd9b67fa2314..cc94264f7a5b 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -9,11 +9,6 @@ bin/qm2ts
 bin/qmake
 bin/qtconfig
 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/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 43d4747e814c..aa1950e0bbb0 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
                 ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -76,10 +76,15 @@ pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
-# Remove unneeded dirs (speedup).
+# Remove unneeded dirs (speedup) and fake netscape files.
 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
 
 # Work around qmake generated dependencies
 pre-install:
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index cd9b67fa2314..cc94264f7a5b 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -9,11 +9,6 @@ bin/qm2ts
 bin/qmake
 bin/qtconfig
 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 43d4747e814c..aa1950e0bbb0 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
                 ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -76,10 +76,15 @@ pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
-# Remove unneeded dirs (speedup).
+# Remove unneeded dirs (speedup) and fake netscape files.
 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
 
 # Work around qmake generated dependencies
 pre-install:
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index cd9b67fa2314..cc94264f7a5b 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -9,11 +9,6 @@ bin/qm2ts
 bin/qmake
 bin/qtconfig
 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 43d4747e814c..aa1950e0bbb0 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
                 ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -76,10 +76,15 @@ pre-everything:
 	@${ECHO_MSG} '===> **************************************************'
 .endif
 
-# Remove unneeded dirs (speedup).
+# Remove unneeded dirs (speedup) and fake netscape files.
 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
 
 # Work around qmake generated dependencies
 pre-install:
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index cd9b67fa2314..cc94264f7a5b 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -9,11 +9,6 @@ bin/qm2ts
 bin/qmake
 bin/qtconfig
 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