Undo my previous commit to install pkgconfig (.pc) files, we should to

use CONFLICTS, because they are installing the same files...

6 files changed, 9 insertions, 33 deletions

diff --git a/www/firefox-gtk2/Makefile b/www/firefox-gtk2/Makefile
index 40043f97d50..c7610dc8856 100644
--- a/www/firefox-gtk2/Makefile
+++ b/www/firefox-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/06/18 22:40:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/06/19 17:37:37 xtraeme Exp $
 
 MOZILLA=	firefox-gtk2
 MOZILLA_BIN=	firefox-bin
 MOZ_VER=	0.8
-PKGREVISION=	4
+PKGREVISION=	3
 EXTRACT_SUFX=	.tar.bz2
 
 DISTNAME=	firefox-source-${MOZ_VER}
diff --git a/www/firefox-gtk2/PLIST b/www/firefox-gtk2/PLIST
index d3ac9fb99ee..99cf5ffbe32 100644
--- a/www/firefox-gtk2/PLIST
+++ b/www/firefox-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/06/18 22:40:04 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/19 17:37:37 xtraeme Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -105,14 +105,6 @@ lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
 @comment end DSO
-@comment begin PKGCONFIG
-lib/pkgconfig/mozilla-gtkmozembed.pc
-lib/pkgconfig/mozilla-js.pc
-lib/pkgconfig/mozilla-nspr.pc
-lib/pkgconfig/mozilla-nss.pc
-lib/pkgconfig/mozilla-plugin.pc
-lib/pkgconfig/mozilla-xpcom.pc
-@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/bloaturls.txt
 lib/${MOZILLA}/chrome/US.jar
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f9155bd41a0..ff99c1e7044 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2004/06/18 22:40:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/06/19 17:37:37 xtraeme Exp $
 
 MOZILLA=	firefox
 MOZILLA_BIN=	firefox-bin
 MOZCONFDIR=	.mozilla
 MOZ_VER=	0.8
-PKGREVISION=	4
+PKGREVISION=	3
 EXTRACT_SUFX=	.tar.bz2
 DISTNAME=	${MOZILLA}-source-${MOZ_VER}
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 3d261dc6991..05d8aacb9ce 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/06/18 22:40:04 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/19 17:37:37 xtraeme Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -105,14 +105,6 @@ lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
 @comment end DSO
-@comment begin PKGCONFIG
-lib/pkgconfig/mozilla-gtkmozembed.pc
-lib/pkgconfig/mozilla-js.pc
-lib/pkgconfig/mozilla-nspr.pc
-lib/pkgconfig/mozilla-nss.pc
-lib/pkgconfig/mozilla-plugin.pc
-lib/pkgconfig/mozilla-xpcom.pc
-@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/bloaturls.txt
 lib/${MOZILLA}/chrome/US.jar
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 01f82f53da9..d580d4ff421 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.132 2004/06/18 22:40:05 xtraeme Exp $
+# $NetBSD: Makefile,v 1.133 2004/06/19 17:37:37 xtraeme Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.6
-PKGREVISION=	3
+PKGREVISION=	2
 EXTRACT_SUFX=	.tar.bz2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/mozilla/PLIST b/www/mozilla/PLIST
index 89682934b9b..9aab8baabc4 100644
--- a/www/mozilla/PLIST
+++ b/www/mozilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/06/18 22:40:05 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/06/19 17:37:37 xtraeme Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -124,14 +124,6 @@ lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
 @comment end DSO
-@comment begin PKGCONFIG
-lib/pkgconfig/mozilla-gtkmozembed.pc
-lib/pkgconfig/mozilla-js.pc
-lib/pkgconfig/mozilla-nspr.pc
-lib/pkgconfig/mozilla-nss.pc
-lib/pkgconfig/mozilla-plugin.pc
-lib/pkgconfig/mozilla-xpcom.pc
-@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/LICENSE
 lib/${MOZILLA}/README.txt