[pkgsrc/trunk]: pkgsrc/www Undo my previous commit to install pkgconfig (.pc)...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/88ed987e92c9
branches:  trunk
changeset: 476681:88ed987e92c9
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jun 19 17:37:37 2004 +0000

description:
Undo my previous commit to install pkgconfig (.pc) files, we should to
use CONFLICTS, because they are installing the same files...

diffstat:

 www/firefox-gtk2/Makefile |   4 ++--
 www/firefox-gtk2/PLIST    |  10 +---------
 www/firefox/Makefile      |   4 ++--
 www/firefox/PLIST         |  10 +---------
 www/mozilla/Makefile      |   4 ++--
 www/mozilla/PLIST         |  10 +---------
 6 files changed, 9 insertions(+), 33 deletions(-)

diffs (118 lines):

diff -r 490a05153d87 -r 88ed987e92c9 www/firefox-gtk2/Makefile
--- a/www/firefox-gtk2/Makefile Sat Jun 19 16:56:41 2004 +0000
+++ b/www/firefox-gtk2/Makefile Sat Jun 19 17:37:37 2004 +0000
@@ -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 -r 490a05153d87 -r 88ed987e92c9 www/firefox-gtk2/PLIST
--- a/www/firefox-gtk2/PLIST    Sat Jun 19 16:56:41 2004 +0000
+++ b/www/firefox-gtk2/PLIST    Sat Jun 19 17:37:37 2004 +0000
@@ -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}/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 -r 490a05153d87 -r 88ed987e92c9 www/firefox/Makefile
--- a/www/firefox/Makefile      Sat Jun 19 16:56:41 2004 +0000
+++ b/www/firefox/Makefile      Sat Jun 19 17:37:37 2004 +0000
@@ -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 -r 490a05153d87 -r 88ed987e92c9 www/firefox/PLIST
--- a/www/firefox/PLIST Sat Jun 19 16:56:41 2004 +0000
+++ b/www/firefox/PLIST Sat Jun 19 17:37:37 2004 +0000
@@ -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}/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 -r 490a05153d87 -r 88ed987e92c9 www/mozilla/Makefile
--- a/www/mozilla/Makefile      Sat Jun 19 16:56:41 2004 +0000
+++ b/www/mozilla/Makefile      Sat Jun 19 17:37:37 2004 +0000
@@ -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 -r 490a05153d87 -r 88ed987e92c9 www/mozilla/PLIST
--- a/www/mozilla/PLIST Sat Jun 19 16:56:41 2004 +0000
+++ b/www/mozilla/PLIST Sat Jun 19 17:37:37 2004 +0000
@@ -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 @@
 ${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