This is a multipart MIME message.

--==_Exmh_10128846418200
Content-Type: text/plain; charset=us-ascii


Since I've switched to firefox2 I also want to use its
libraries for the packages which need a gecko implementation
(eg epiphany, galeon, devhelp). Otherwise I would have
to install firefox1 only for that purpose.
That requires the pkgconfig files to be installed, which
makes that firefox1 and firefox2 can't be used simultaneously
anymore. This is something I can live with.
So it makes most sense to drop the "2" suffix completely.
Comments?

best regards
Matthias



--==_Exmh_10128846418200
Content-Type: text/plain ; name="ff2.txt"; charset=us-ascii
Content-Description: ff2.txt
Content-Disposition: attachment; filename="ff2.txt"

Index: www/epiphany/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/epiphany/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- www/epiphany/options.mk	24 Sep 2006 16:28:20 -0000	1.1
+++ www/epiphany/options.mk	15 Nov 2006 14:42:37 -0000
@@ -5,7 +5,14 @@
 .include "../../www/seamonkey/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mfirefox)
+.if !empty(PKG_OPTIONS:Mfirefox2)
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/find
+CFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/find
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/necko
+CFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/necko
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/pref
+CFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/pref
+.elif !empty(PKG_OPTIONS:Mfirefox)
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
 CFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/necko
Index: www/epiphany-extensions/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/epiphany-extensions/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- www/epiphany-extensions/options.mk	24 Sep 2006 16:28:49 -0000	1.1
+++ www/epiphany-extensions/options.mk	15 Nov 2006 14:42:37 -0000
@@ -6,7 +6,11 @@
 .include "../../www/seamonkey/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mfirefox)
+.if !empty(PKG_OPTIONS:Mfirefox2)
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/dom
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/pref
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox2}/include/firefox/webbrwsr
+.elif !empty(PKG_OPTIONS:Mfirefox)
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/dom
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/webbrwsr
Index: www/firefox2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox2/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- www/firefox2/Makefile	24 Oct 2006 22:20:11 -0000	1.1.1.1
+++ www/firefox2/Makefile	15 Nov 2006 14:42:37 -0000
@@ -1,6 +1,8 @@
 # $NetBSD: Makefile,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $
 
-MOZILLA=		firefox2
+PKGREVISION=		1
+
+MOZILLA=		firefox
 EXTRACT_SUFX=		.tar.bz2
 COMMENT=		Lightweight gecko-based web browser
 
Index: www/firefox2/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox2/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- www/firefox2/PLIST	24 Oct 2006 22:20:11 -0000	1.1.1.1
+++ www/firefox2/PLIST	15 Nov 2006 14:42:38 -0000
@@ -94,6 +94,14 @@
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 lib/${MOZILLA}/plugins/libunixprintplugin.${SO_SUFFIX}
 @comment end DSO
+@comment begin PKGCONFIG
+lib/pkgconfig/firefox-gtkmozembed.pc
+lib/pkgconfig/firefox-js.pc
+lib/pkgconfig/firefox-nspr.pc
+lib/pkgconfig/firefox-nss.pc
+lib/pkgconfig/firefox-plugin.pc
+lib/pkgconfig/firefox-xpcom.pc
+@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/LICENSE
 lib/${MOZILLA}/README.txt
Index: www/firefox2/buildlink3.mk
===================================================================
RCS file: www/firefox2/buildlink3.mk
diff -N www/firefox2/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/firefox2/buildlink3.mk	15 Nov 2006 14:42:38 -0000
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:12 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+FIREFOX2_BUILDLINK3_MK:=	${FIREFOX2_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=		firefox2
+.endif
+
+BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nfirefox2}
+BUILDLINK_PACKAGES+=		firefox2
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox2
+
+.if !empty(FIREFOX2_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.firefox2+=	firefox>=2.0nb1
+BUILDLINK_ABI_DEPENDS.firefox2+=	firefox>=2.0
+BUILDLINK_PKGSRCDIR.firefox2?=	../../www/firefox2
+.endif	# FIREFOX2_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
Index: www/galeon/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/galeon/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- www/galeon/options.mk	24 Sep 2006 16:30:09 -0000	1.1
+++ www/galeon/options.mk	15 Nov 2006 14:42:38 -0000
@@ -5,7 +5,7 @@
 .include "../../www/seamonkey/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mfirefox)
+.if !empty(PKG_OPTIONS:Mfirefox) || !empty(PKG_OPTIONS:Mfirefox2)
 CONFIGURE_ARGS+=	--with-mozilla=firefox
 .else
 BUILDLINK_RPATHDIRS.seamonkey+=	lib/seamonkey
Index: www/seamonkey/gecko-depends.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/gecko-depends.mk,v
retrieving revision 1.1
diff -u -r1.1 gecko-depends.mk
--- www/seamonkey/gecko-depends.mk	24 Sep 2006 16:21:33 -0000	1.1
+++ www/seamonkey/gecko-depends.mk	15 Nov 2006 14:42:38 -0000
@@ -1,6 +1,8 @@
 # $NetBSD: gecko-depends.mk,v 1.1 2006/09/24 16:21:33 salo Exp $
 
-.if !empty(PKG_OPTIONS:Mfirefox)
+.if !empty(PKG_OPTIONS:Mfirefox2)
+.include "../../www/firefox2/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mfirefox)
 # needs .pc files
 BUILDLINK_API_DEPENDS.firefox+=		firefox>=1.5nb2
 .include "../../www/firefox/buildlink3.mk"
Index: www/seamonkey/gecko-options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/gecko-options.mk,v
retrieving revision 1.1
diff -u -r1.1 gecko-options.mk
--- www/seamonkey/gecko-options.mk	24 Sep 2006 16:21:33 -0000	1.1
+++ www/seamonkey/gecko-options.mk	15 Nov 2006 14:42:38 -0000
@@ -1,5 +1,5 @@
 # $NetBSD: gecko-options.mk,v 1.1 2006/09/24 16:21:33 salo Exp $
 
 PKG_OPTIONS_REQUIRED_GROUPS+=	gecko
-PKG_OPTIONS_GROUP.gecko=	firefox seamonkey
+PKG_OPTIONS_GROUP.gecko=	firefox firefox2 seamonkey
 PKG_SUGGESTED_OPTIONS+=		firefox

--==_Exmh_10128846418200--