[pkgsrc/trunk]: pkgsrc/www adapt to GECKO_PROVIDER -> options change.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45b275546d0a
branches:  trunk
changeset: 497216:45b275546d0a
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Fri Jul 22 14:12:22 2005 +0000

description:
adapt to GECKO_PROVIDER -> options change.

diffstat:

 www/epiphany-extensions/Makefile |  15 +++++++--------
 www/epiphany/buildlink3.mk       |   9 +++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diffs (60 lines):

diff -r ccaab2c3e668 -r 45b275546d0a www/epiphany-extensions/Makefile
--- a/www/epiphany-extensions/Makefile  Fri Jul 22 12:56:57 2005 +0000
+++ b/www/epiphany-extensions/Makefile  Fri Jul 22 14:12:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/22 14:12:22 dillo Exp $
 #
 
 DISTNAME=      epiphany-extensions-1.6.4
@@ -20,9 +20,12 @@
 CONFIGURE_ARGS+=       --enable-compile-warnings=no
 CONFIGURE_ARGS+=       --with-extensions=all
 
-.include "../../mk/bsd.prefs.mk"
+# this should use the same gecko option as epiphany
+PKG_OPTIONS_VAR=       PKG_OPTIONS.epiphany
+.include "../../www/mozilla/gecko-options.mk"
+.include "../../mk/bsd.options.mk"
 
-.if ${GECKO_PROVIDER} == "firefox"
+.if !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
@@ -43,10 +46,6 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/opensp/buildlink3.mk"
 .include "../../www/epiphany/buildlink3.mk"
-.if ${GECKO_PROVIDER} == "firefox"
-.include "../../www/firefox/buildlink3.mk"
-.else
-.include "../../www/mozilla-gtk2/buildlink3.mk"
-.endif
+.include "../../www/mozilla/gecko-depends.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ccaab2c3e668 -r 45b275546d0a www/epiphany/buildlink3.mk
--- a/www/epiphany/buildlink3.mk        Fri Jul 22 12:56:57 2005 +0000
+++ b/www/epiphany/buildlink3.mk        Fri Jul 22 14:12:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/07/13 09:55:27 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/07/22 14:12:22 dillo Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
@@ -26,12 +26,9 @@
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.if ${GECKO_PROVIDER} == "firefox"
-.include "../../www/firefox/buildlink3.mk"
-.else
-.include "../../www/mozilla-gtk2/buildlink3.mk"
-.endif
 .include "../../x11/gtk2/buildlink3.mk"
+# XXX: should pull in ../../www/mozilla/gecko-depends.mk
+#      this is already pulled in directly by the only user, epiphany-extensions
 .endif # EPIPHANY_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}