From ba00ae25e6e04022f6fc5374dab07f8ffde4e786 Mon Sep 17 00:00:00 2001 From: salo Date: Sun, 24 Sep 2006 16:28:20 +0000 Subject: Switch to "seamonkey" backend from "mozilla" as an alternative to "firefox", split option part to a separate file. The "seamonkey" backend is not (yet) supported by the package, add BROKEN. --- www/epiphany-extensions/Makefile | 19 +++---------------- www/epiphany-extensions/options.mk | 15 +++++++++++++++ www/epiphany/Makefile | 27 +++------------------------ www/epiphany/buildlink3.mk | 4 ++-- www/epiphany/options.mk | 17 +++++++++++++++++ 5 files changed, 40 insertions(+), 42 deletions(-) create mode 100644 www/epiphany-extensions/options.mk create mode 100644 www/epiphany/options.mk diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 039ea40602a..6b20950d1f4 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/09/16 12:20:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2006/09/24 16:28:49 salo Exp $ # DISTNAME= epiphany-extensions-2.14.1.1 @@ -21,20 +21,7 @@ USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --enable-compile-warnings=no CONFIGURE_ARGS+= --with-extensions=all -# 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 !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 -.else -CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/dom -CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref -CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webbrwsr -.endif +.include "options.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 @@ -47,6 +34,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 .include "../../textproc/opensp/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../www/epiphany/buildlink3.mk" -.include "../../www/mozilla/gecko-depends.mk" +.include "../../www/seamonkey/gecko-depends.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/epiphany-extensions/options.mk b/www/epiphany-extensions/options.mk new file mode 100644 index 00000000000..e2e781aac36 --- /dev/null +++ b/www/epiphany-extensions/options.mk @@ -0,0 +1,15 @@ +# $NetBSD: options.mk,v 1.1 2006/09/24 16:28:49 salo Exp $ + +# this should use the same gecko option as epiphany +PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany + +.include "../../www/seamonkey/gecko-options.mk" +.include "../../mk/bsd.options.mk" + +.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 +.else +BROKEN= seamonkey backend is currently not supported +.endif diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 2b9c8b810c1..9ecc0c6e4a4 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2006/09/16 12:20:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.66 2006/09/24 16:28:20 salo Exp $ # DISTNAME= epiphany-2.16.0 @@ -22,28 +22,7 @@ PKGCONFIG_OVERRIDE= data/epiphany-2.16.pc CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc -PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany -.include "../../www/mozilla/gecko-options.mk" -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mfirefox) -# Require a version that has the .pc files in it. -BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5nb2 - -CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/find -CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/find -CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/necko -CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/necko -CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/pref -CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/pref -.else -CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/find -CFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/find -CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/necko -CFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/necko -CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref -CFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref -.endif +.include "options.mk" GCONF2_SCHEMAS= epiphany.schemas GCONF2_SCHEMAS+= epiphany-fonts.schemas @@ -80,5 +59,5 @@ BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12 .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../www/mozilla/gecko-depends.mk" +.include "../../www/seamonkey/gecko-depends.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk index f2020e47699..2eab6e065f9 100644 --- a/www/epiphany/buildlink3.mk +++ b/www/epiphany/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2006/09/16 12:20:33 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2006/09/24 16:28:20 salo Exp $ # # This Makefile fragment is included by packages that use epiphany. # @@ -29,7 +29,7 @@ BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -# XXX: should pull in ../../www/mozilla/gecko-depends.mk +# XXX: should pull in ../../www/seamonkey/gecko-depends.mk # this is already pulled in directly by the only user, epiphany-extensions .endif # EPIPHANY_BUILDLINK3_MK diff --git a/www/epiphany/options.mk b/www/epiphany/options.mk new file mode 100644 index 00000000000..a5d69ac8b0a --- /dev/null +++ b/www/epiphany/options.mk @@ -0,0 +1,17 @@ +# $NetBSD: options.mk,v 1.1 2006/09/24 16:28:20 salo Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany + +.include "../../www/seamonkey/gecko-options.mk" +.include "../../mk/bsd.options.mk" + +.if !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 +CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/necko +CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/pref +CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/pref +.else +BROKEN= seamonkey backend is currently not supported +.endif -- cgit v1.2.3