--4bRzO86E/ozDv8r1
Content-Type: multipart/mixed; boundary="C7zPtVaVf+AK4Oqc"
Content-Disposition: inline


--C7zPtVaVf+AK4Oqc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello,

Matthias Drochner recently modified www/epiphany in a way that it can
be compiled using www/firefox instead of www/mozilla-gtk2 (nice!).
www/epiphany-extensions, however, still pulls in www/mozilla-gtk2;
I modified www/epiphany/buildlink3.mk and www/epiphany-extensions/Makefile,
then compiled epiphany-extensions against firefox without a problem.

(I attached two small patches, just for completeness)

Regards,
Leonard

--C7zPtVaVf+AK4Oqc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="epiphany-buildlink3.diff"
Content-Transfer-Encoding: quoted-printable

Index: buildlink3.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/www/epiphany/buildlink3.mk,v
retrieving revision 1.6
diff -u -u -r1.6 buildlink3.mk
--- buildlink3.mk	22 Mar 2005 16:26:14 -0000	1.6
+++ buildlink3.mk	8 Jul 2005 12:23:27 -0000
@@ -24,7 +24,11 @@
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.if ${GECKO_PROVIDER} =3D=3D "firefox"
+.include "../../www/firefox/buildlink3.mk"
+.else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # EPIPHANY_BUILDLINK3_MK
=20

--C7zPtVaVf+AK4Oqc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="epiphany-extensions_Makefile.diff"
Content-Transfer-Encoding: quoted-printable

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/www/epiphany-extensions/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile	22 May 2005 20:08:44 -0000	1.12
+++ Makefile	8 Jul 2005 12:22:47 -0000
@@ -20,9 +20,17 @@
 CONFIGURE_ARGS+=3D	--enable-compile-warnings=3Dno
 CONFIGURE_ARGS+=3D	--with-extensions=3Dall
=20
+.include "../../mk/bsd.prefs.mk"
+
+.if ${GECKO_PROVIDER} =3D=3D "firefox"
+CPPFLAGS+=3D		-I${BUILDLINK_PREFIX.firefox}/include/firefox/dom
+CPPFLAGS+=3D		-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
+CPPFLAGS+=3D		-I${BUILDLINK_PREFIX.firefox}/include/firefox/webbrwsr
+.else
 CPPFLAGS+=3D		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/dom
 CPPFLAGS+=3D		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
 CPPFLAGS+=3D		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webb=
rwsr
+.endif
=20
 BUILDLINK_DEPENDS.glib2+=3D	glib2>=3D2.6.0
=20
@@ -35,6 +43,10 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/opensp/buildlink3.mk"
 .include "../../www/epiphany/buildlink3.mk"
+.if ${GECKO_PROVIDER} =3D=3D "firefox"
+.include "../../www/firefox/buildlink3.mk"
+.else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

--C7zPtVaVf+AK4Oqc--

--4bRzO86E/ozDv8r1
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)

iD8DBQFCzo+zeffumNo0U88RAoV8AJ46Xn9R/iC0e1fF8gwE3Y6JXICHKQCfTXPm
Q2KZw2RYgd27PkM4rneCVaM=
=Ax59
-----END PGP SIGNATURE-----

--4bRzO86E/ozDv8r1--