diff options
| author | dillo <dillo> | 2005-07-22 14:12:22 +0000 |
|---|---|---|
| committer | dillo <dillo> | 2005-07-22 14:12:22 +0000 |
| commit | 3be04c45cbd4f16e1995ebc0ee27c856963c685e (patch) | |
| tree | bd376e34300dd9745379a8741724f05d3e43f830 /www | |
| parent | 08cb4bd5446718725e278fff8a49faf0e17b924d (diff) | |
| download | pkgsrc-3be04c45cbd4f16e1995ebc0ee27c856963c685e.tar.gz | |
adapt to GECKO_PROVIDER -> options change.
Diffstat (limited to 'www')
| -rw-r--r-- | www/epiphany-extensions/Makefile | 15 | ||||
| -rw-r--r-- | www/epiphany/buildlink3.mk | 9 |
2 files changed, 10 insertions, 14 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 409bdcdd39b..121acd27990 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -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 @@ USE_PKGLOCALEDIR= YES 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 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .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 --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk index 1d6ff221ed8..cefb550d51f 100644 --- a/www/epiphany/buildlink3.mk +++ b/www/epiphany/buildlink3.mk @@ -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 @@ BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany .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/+$//} |