[pkgsrc/trunk]: pkgsrc/www Switch to "seamonkey" backend from "mozilla" as an...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/307f135742b6
branches:  trunk
changeset: 518947:307f135742b6
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Sep 24 16:28:20 2006 +0000

description:
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.

diffstat:

 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(-)

diffs (143 lines):

diff -r 49d11dbf61d8 -r 307f135742b6 www/epiphany-extensions/Makefile
--- a/www/epiphany-extensions/Makefile  Sun Sep 24 16:26:54 2006 +0000
+++ b/www/epiphany-extensions/Makefile  Sun Sep 24 16:28:20 2006 +0000
@@ -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 @@
 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 @@
 .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 -r 49d11dbf61d8 -r 307f135742b6 www/epiphany-extensions/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/epiphany-extensions/options.mk        Sun Sep 24 16:28:20 2006 +0000
@@ -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 -r 49d11dbf61d8 -r 307f135742b6 www/epiphany/Makefile
--- a/www/epiphany/Makefile     Sun Sep 24 16:26:54 2006 +0000
+++ b/www/epiphany/Makefile     Sun Sep 24 16:28:20 2006 +0000
@@ -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 @@
 
 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 @@
 .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 -r 49d11dbf61d8 -r 307f135742b6 www/epiphany/buildlink3.mk
--- a/www/epiphany/buildlink3.mk        Sun Sep 24 16:26:54 2006 +0000
+++ b/www/epiphany/buildlink3.mk        Sun Sep 24 16:28:20 2006 +0000
@@ -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 @@
 .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 -r 49d11dbf61d8 -r 307f135742b6 www/epiphany/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/epiphany/options.mk   Sun Sep 24 16:28:20 2006 +0000
@@ -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