From 6d46264c861366f69f3aca0e587be718c3ef7098 Mon Sep 17 00:00:00 2001 From: jmcneill Date: Fri, 12 Dec 2008 01:27:24 +0000 Subject: add webkit option, fix plist, bump pkgrevision --- www/epiphany/Makefile | 14 ++------------ www/epiphany/PLIST | 23 +++++++---------------- www/epiphany/options.mk | 31 +++++++++++++++++++++++++++---- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 47f47041e98..1804fee99f3 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.89 2008/12/02 12:30:13 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2008/12/12 01:27:24 jmcneill Exp $ # DISTNAME= epiphany-2.24.2.1 +PKGREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.24/} EXTRACT_SUFX= .tar.bz2 @@ -23,16 +24,6 @@ PKGCONFIG_OVERRIDE= data/epiphany-2.24.pc .include "options.mk" -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 - -# XXX the configure check doesn't work -CONFIGURE_ENV+= ac_cv_header_nsIBadCertListener_h=yes - GCONF_SCHEMAS= epiphany.schemas GCONF_SCHEMAS+= epiphany-fonts.schemas GCONF_SCHEMAS+= epiphany-lockdown.schemas @@ -61,7 +52,6 @@ BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.4 BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12 .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.include "../../www/firefox/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0 .include "../../x11/gtk2/buildlink3.mk" diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST index 2c640f14402..6cd88dc2486 100644 --- a/www/epiphany/PLIST +++ b/www/epiphany/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2008/12/02 12:30:13 wiz Exp $ +@comment $NetBSD: PLIST,v 1.32 2008/12/12 01:27:24 jmcneill Exp $ bin/epiphany include/epiphany/2.24/epiphany/ephy-adblock-manager.h include/epiphany/2.24/epiphany/ephy-adblock.h @@ -38,9 +38,9 @@ include/epiphany/2.24/epiphany/ephy-statusbar.h include/epiphany/2.24/epiphany/ephy-type-builtins.h include/epiphany/2.24/epiphany/ephy-version.h include/epiphany/2.24/epiphany/ephy-window.h -lib/epiphany/2.24/plugins/libdesktopfileplugin.a -lib/epiphany/2.24/plugins/libdesktopfileplugin.la -lib/epiphany/2.24/plugins/libdesktopfileplugin.so +${PLIST.gecko}lib/epiphany/2.24/plugins/libdesktopfileplugin.a +${PLIST.gecko}lib/epiphany/2.24/plugins/libdesktopfileplugin.la +${PLIST.gecko}lib/epiphany/2.24/plugins/libdesktopfileplugin.so lib/pkgconfig/epiphany-2.24.pc man/man1/epiphany.1 share/aclocal/epiphany.m4 @@ -342,15 +342,6 @@ share/omf/epiphany/epiphany-uk.omf @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor -@dirrm share/icons/LowContrastLargePrint/48x48/apps -@dirrm share/icons/LowContrastLargePrint/48x48 -@dirrm share/icons/LowContrastLargePrint -@dirrm share/icons/HighContrastLargePrintInverse/48x48/apps -@dirrm share/icons/HighContrastLargePrintInverse/48x48 -@dirrm share/icons/HighContrastLargePrintInverse -@dirrm share/icons/HighContrastLargePrint/48x48/apps -@dirrm share/icons/HighContrastLargePrint/48x48 -@dirrm share/icons/HighContrastLargePrint @comment in xdg-dirs: @dirrm share/icons @dirrm share/gtk-doc/html/epiphany @dirrm share/gnome/help/epiphany/uk/figures @@ -423,9 +414,9 @@ share/omf/epiphany/epiphany-uk.omf @dirrm share/epiphany @comment in dbus: @dirrm share/dbus-1/services @comment in xdg-dirs: @dirrm share/applications -@dirrm lib/epiphany/2.24/plugins -@dirrm lib/epiphany/2.24 -@dirrm lib/epiphany +${PLIST.gecko}@dirrm lib/epiphany/2.24/plugins +${PLIST.gecko}@dirrm lib/epiphany/2.24 +${PLIST.gecko}@dirrm lib/epiphany @dirrm include/epiphany/2.24/epiphany @dirrm include/epiphany/2.24 @dirrm include/epiphany diff --git a/www/epiphany/options.mk b/www/epiphany/options.mk index 0712e171b36..f8eb2650d1b 100644 --- a/www/epiphany/options.mk +++ b/www/epiphany/options.mk @@ -1,8 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2008/10/25 11:15:16 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2008/12/12 01:27:24 jmcneill Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany -PKG_SUPPORTED_OPTIONS= enchant # avahi -PKG_SUGGESTED_OPTIONS= enchant +PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany +PKG_SUPPORTED_OPTIONS= enchant # avahi +PKG_OPTIONS_OPTIONAL_GROUPS= engine +PKG_OPTIONS_GROUP.engine= firefox webkit +PKG_SUGGESTED_OPTIONS= enchant firefox +PLIST_VARS= gecko .include "../../mk/bsd.options.mk" @@ -10,3 +13,23 @@ PKG_SUGGESTED_OPTIONS= enchant CONFIGURE_ARGS+= --enable-spell-checker .include "../../textproc/enchant/buildlink3.mk" .endif + +.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 +# XXX the configure check doesn't work +CONFIGURE_ENV+= ac_cv_header_nsIBadCertListener_h=yes +CONFIGURE_ARGS+= --with-engine=mozilla +CONFIGURE_ARGS+= --with-gecko=firefox +PLIST.gecko= yes +.include "../../www/firefox/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mwebkit) +CONFIGURE_ARGS+= --with-engine=webkit +.include "../../www/webkit-gtk/buildlink3.mk" +.endif -- cgit v1.2.3