summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/epiphany/Makefile9
-rw-r--r--www/epiphany/PLIST113
-rw-r--r--www/epiphany/distinfo8
-rw-r--r--www/epiphany/options.mk9
4 files changed, 74 insertions, 65 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d842b3a1035..45a92a583b3 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2009/02/06 17:29:42 drochner Exp $
+# $NetBSD: Makefile,v 1.94 2009/03/15 19:15:45 jmcneill Exp $
#
-DISTNAME= epiphany-2.24.3
-PKGREVISION= 1
+DISTNAME= epiphany-2.26.0
CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.24/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.26/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -20,7 +19,7 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
-PKGCONFIG_OVERRIDE= data/epiphany-2.24.pc
+PKGCONFIG_OVERRIDE= data/epiphany-2.26.pc
.include "options.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 6cd88dc2486..bbb06f544a8 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,47 +1,45 @@
-@comment $NetBSD: PLIST,v 1.32 2008/12/12 01:27:24 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.33 2009/03/15 19:15:45 jmcneill Exp $
bin/epiphany
-include/epiphany/2.24/epiphany/ephy-adblock-manager.h
-include/epiphany/2.24/epiphany/ephy-adblock.h
-include/epiphany/2.24/epiphany/ephy-base-embed.h
-include/epiphany/2.24/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/2.24/epiphany/ephy-bookmarks.h
-include/epiphany/2.24/epiphany/ephy-command-manager.h
-include/epiphany/2.24/epiphany/ephy-cookie-manager.h
-include/epiphany/2.24/epiphany/ephy-dbus.h
-include/epiphany/2.24/epiphany/ephy-dialog.h
-include/epiphany/2.24/epiphany/ephy-embed-container.h
-include/epiphany/2.24/epiphany/ephy-embed-event.h
-include/epiphany/2.24/epiphany/ephy-embed-factory.h
-include/epiphany/2.24/epiphany/ephy-embed-persist.h
-include/epiphany/2.24/epiphany/ephy-embed-prefs.h
-include/epiphany/2.24/epiphany/ephy-embed-shell.h
-include/epiphany/2.24/epiphany/ephy-embed-single.h
-include/epiphany/2.24/epiphany/ephy-embed-type-builtins.h
-include/epiphany/2.24/epiphany/ephy-embed-utils.h
-include/epiphany/2.24/epiphany/ephy-embed.h
-include/epiphany/2.24/epiphany/ephy-extension.h
-include/epiphany/2.24/epiphany/ephy-extensions-manager.h
-include/epiphany/2.24/epiphany/ephy-history-item.h
-include/epiphany/2.24/epiphany/ephy-history.h
-include/epiphany/2.24/epiphany/ephy-lib-type-builtins.h
-include/epiphany/2.24/epiphany/ephy-link.h
-include/epiphany/2.24/epiphany/ephy-loader.h
-include/epiphany/2.24/epiphany/ephy-node-db.h
-include/epiphany/2.24/epiphany/ephy-node.h
-include/epiphany/2.24/epiphany/ephy-notebook.h
-include/epiphany/2.24/epiphany/ephy-password-manager.h
-include/epiphany/2.24/epiphany/ephy-permission-manager.h
-include/epiphany/2.24/epiphany/ephy-session.h
-include/epiphany/2.24/epiphany/ephy-shell.h
-include/epiphany/2.24/epiphany/ephy-state.h
-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
-${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
+include/epiphany/2.26/epiphany/ephy-adblock-manager.h
+include/epiphany/2.26/epiphany/ephy-adblock.h
+include/epiphany/2.26/epiphany/ephy-base-embed.h
+include/epiphany/2.26/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/2.26/epiphany/ephy-bookmarks.h
+include/epiphany/2.26/epiphany/ephy-command-manager.h
+include/epiphany/2.26/epiphany/ephy-cookie-manager.h
+include/epiphany/2.26/epiphany/ephy-dbus.h
+include/epiphany/2.26/epiphany/ephy-dialog.h
+include/epiphany/2.26/epiphany/ephy-embed-container.h
+include/epiphany/2.26/epiphany/ephy-embed-event.h
+include/epiphany/2.26/epiphany/ephy-embed-factory.h
+include/epiphany/2.26/epiphany/ephy-embed-persist.h
+include/epiphany/2.26/epiphany/ephy-embed-prefs.h
+include/epiphany/2.26/epiphany/ephy-embed-shell.h
+include/epiphany/2.26/epiphany/ephy-embed-single.h
+include/epiphany/2.26/epiphany/ephy-embed-type-builtins.h
+include/epiphany/2.26/epiphany/ephy-embed-utils.h
+include/epiphany/2.26/epiphany/ephy-embed.h
+include/epiphany/2.26/epiphany/ephy-extension.h
+include/epiphany/2.26/epiphany/ephy-extensions-manager.h
+include/epiphany/2.26/epiphany/ephy-history-item.h
+include/epiphany/2.26/epiphany/ephy-history.h
+include/epiphany/2.26/epiphany/ephy-lib-type-builtins.h
+include/epiphany/2.26/epiphany/ephy-link.h
+include/epiphany/2.26/epiphany/ephy-loader.h
+include/epiphany/2.26/epiphany/ephy-node-db.h
+include/epiphany/2.26/epiphany/ephy-node.h
+include/epiphany/2.26/epiphany/ephy-notebook.h
+include/epiphany/2.26/epiphany/ephy-password-manager.h
+include/epiphany/2.26/epiphany/ephy-permission-manager.h
+include/epiphany/2.26/epiphany/ephy-session.h
+include/epiphany/2.26/epiphany/ephy-shell.h
+include/epiphany/2.26/epiphany/ephy-state.h
+include/epiphany/2.26/epiphany/ephy-statusbar.h
+include/epiphany/2.26/epiphany/ephy-type-builtins.h
+include/epiphany/2.26/epiphany/ephy-version.h
+include/epiphany/2.26/epiphany/ephy-window.h
+lib/epiphany/2.26/plugins/libdesktopfileplugin.la
+lib/pkgconfig/epiphany-2.26.pc
man/man1/epiphany.1
share/aclocal/epiphany.m4
share/applications/bme.desktop
@@ -285,13 +283,13 @@ share/locale/mn/LC_MESSAGES/epiphany.mo
share/locale/mr/LC_MESSAGES/epiphany.mo
share/locale/ms/LC_MESSAGES/epiphany.mo
share/locale/nb/LC_MESSAGES/epiphany.mo
-share/locale/ne/LC_MESSAGES/epiphany.mo
share/locale/nl/LC_MESSAGES/epiphany.mo
share/locale/nn/LC_MESSAGES/epiphany.mo
share/locale/oc/LC_MESSAGES/epiphany.mo
share/locale/or/LC_MESSAGES/epiphany.mo
share/locale/pa/LC_MESSAGES/epiphany.mo
share/locale/pl/LC_MESSAGES/epiphany.mo
+share/locale/ps/LC_MESSAGES/epiphany.mo
share/locale/pt/LC_MESSAGES/epiphany.mo
share/locale/pt_BR/LC_MESSAGES/epiphany.mo
share/locale/ro/LC_MESSAGES/epiphany.mo
@@ -336,12 +334,27 @@ share/omf/epiphany/epiphany-uk.omf
@dirrm share/omf/epiphany
@comment in rarian: @dirrm share/omf
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
@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
@@ -382,6 +395,7 @@ share/omf/epiphany/epiphany-uk.omf
@dirrm share/gnome/help/epiphany/C
@dirrm share/gnome/help/epiphany
@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome
@comment in GConf: @dirrm share/gconf/schemas
@dirrm share/epiphany/icons/hicolor/scalable/status
@dirrm share/epiphany/icons/hicolor/scalable/actions
@@ -413,10 +427,11 @@ share/omf/epiphany/epiphany-uk.omf
@dirrm share/epiphany/art
@dirrm share/epiphany
@comment in dbus: @dirrm share/dbus-1/services
+@comment in dbus: @dirrm share/dbus-1
@comment in xdg-dirs: @dirrm share/applications
-${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 lib/epiphany/2.26/plugins
+@dirrm lib/epiphany/2.26
+@dirrm lib/epiphany
+@dirrm include/epiphany/2.26/epiphany
+@dirrm include/epiphany/2.26
@dirrm include/epiphany
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index f321203af7f..b25f20417c0 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.45 2009/01/18 16:53:30 wiz Exp $
+$NetBSD: distinfo,v 1.46 2009/03/15 19:15:45 jmcneill Exp $
-SHA1 (epiphany-2.24.3.tar.bz2) = 945d7935273cf341f7c5445b31202ed257cfc9a6
-RMD160 (epiphany-2.24.3.tar.bz2) = d27d511cf9f1cb6b5db94b1c821729c1dfc59b0b
-Size (epiphany-2.24.3.tar.bz2) = 5722991 bytes
+SHA1 (epiphany-2.26.0.tar.bz2) = c29e0f1c6a560e15e21cbd7f3bee23c57905796b
+RMD160 (epiphany-2.26.0.tar.bz2) = 1bf800f9d178aa1603358caeffb26c32510c1e61
+Size (epiphany-2.26.0.tar.bz2) = 5626038 bytes
diff --git a/www/epiphany/options.mk b/www/epiphany/options.mk
index f96217955cb..7bcc3ccc999 100644
--- a/www/epiphany/options.mk
+++ b/www/epiphany/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2009/02/06 17:29:42 drochner Exp $
+# $NetBSD: options.mk,v 1.6 2009/03/15 19:15:45 jmcneill Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany
PKG_SUPPORTED_OPTIONS= avahi
# browser crashes with enchant
PKG_OPTIONS_OPTIONAL_GROUPS= engine
-PKG_OPTIONS_GROUP.engine= firefox webkit
+PKG_OPTIONS_GROUP.engine= firefox
PKG_SUGGESTED_OPTIONS= avahi firefox
PLIST_VARS= gecko
@@ -36,8 +36,3 @@ 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