Thilo Pfennig [Fri, May 02, 2008 at 03:41:21PM +0200] wrote:
>Anybody working on an upgrade to epiphany 2.20.3 already now? Cant see
>any update in ports and shouldnt be that problematic. I volunteer to test.
>Thilo
>
Here's an update to 2.22.1.1.
Regards,
Bernd
Makefile | 30 ++++------
distinfo | 10 +--
pkg/PLIST | 156 ++++++++++++++++++++++++++++++++++------------------
3 files changed, 123 insertions(+), 73 deletions(-)
Index: Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/www/epiphany/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 23 Jan 2008 16:38:00 -0000 1.20
+++ Makefile 2 May 2008 14:49:28 -0000
@@ -3,10 +3,9 @@
SHARED_ONLY= Yes
COMMENT= extremely lightweight and simple web browser for gnome
-M= 2.18
-V= 2.18.2
-DISTNAME= epiphany-${V}
-PKGNAME= ${DISTNAME}p2
+GNOME_PROJECT= epiphany
+GNOME_VERSION= 2.22.1.1
+V= 2.22
CATEGORIES= www
HOMEPAGE= http://www.gnome.org/projects/epiphany/
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/$M/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${GNOME_PROJECT}/${V}/}
BUILD_DEPENDS= :xulrunner-devel->=1.8.1:devel/xulrunner,-devel
BUILD_DEPENDS+= ${RUN_DEPENDS}
@@ -25,16 +24,15 @@ RUN_DEPENDS= :gnome-doc-utils->=0.3.2:x1
:gnome-icon-theme-*:x11/gnome/icon-theme \
:gnome-themes-*:x11/gnome/themes \
:iso-codes-*:devel/iso-codes \
- :scrollkeeper-*:textproc/scrollkeeper \
- :yelp-*:x11/gnome/yelp \
- :desktop-file-utils-*:devel/desktop-file-utils
+ :scrollkeeper-*:textproc/scrollkeeper
LIB_DEPENDS= gnome-desktop-2::x11/gnome/desktop \
gnomeui-2.>=1400::x11/gnome/libgnomeui \
xulrunner/gtkembedmoz,xulrunner/mozjs,xulrunner/xpcom,xulrunner/xul:xulrunner->=1.8.1:devel/xulrunner
\
xml2.>=6.12::textproc/libxml \
- xslt.>=1::textproc/libxslt
+ xslt.>=1::textproc/libxslt \
+ notify::devel/libnotify
-MODULES= devel/gettext
+MODULES= devel/gettext x11/gnome
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcursor Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 \
@@ -46,11 +44,14 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM
m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 plc4 \
plds4 png popt pthread ssl startup-notification-1 util z \
freebl3 nss3 nssckbi smime3 softokn3 ssl3 \
- Xcomposite Xdamage gailutil pcre
+ Xcomposite Xdamage gailutil pcre gio-2.0 stdc++
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
+DESKTOP_FILES= Yes
+MODGNOME_DEVHELP_FILES=Yes
+MODGNOME_HELP_FILES=Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--with-gecko=xulrunner \
@@ -60,11 +61,8 @@ CONFIGURE_ARGS+=--with-gecko=xulrunner \
--disable-scrollkeeper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/nss -I${LOCALBASE}/include" \
LDFLAGS="-Wl,-rpath-link,${LOCALBASE}/lib/
-Wl,-rpath-link,${X11BASE}/lib/ -L${LOCALBASE}/lib -lfreebl3 -lnss3 -lnssckbi
-lsmime3 -lsoftokn3 -lssl3 -pthread -L${LOCALBASE}/xulrunner" \
- HOME=/tmp
+ HOME=${WRKSRC}
-SUBST_VARS+= M
-
-post-configure:
- rm -fr /tmp/.mozilla
+SUBST_VARS+= V
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/OpenBSD/cvs/ports/www/epiphany/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 4 Jun 2007 18:35:36 -0000 1.5
+++ distinfo 2 May 2008 14:21:55 -0000
@@ -1,5 +1,5 @@
-MD5 (epiphany-2.18.2.tar.gz) = LxmFcs20gGmPrcA56IZ4Eg==
-RMD160 (epiphany-2.18.2.tar.gz) = g5f+7E+3v66J/c/bHs8vmktTVKY=
-SHA1 (epiphany-2.18.2.tar.gz) = 7FQpZP9fPaswKlnd3doHBA1W1iw=
-SHA256 (epiphany-2.18.2.tar.gz) = IhZIOz+tuvkRxyEX8igsz95uLr/PNpIlZ4Bt2FEfwLs=
-SIZE (epiphany-2.18.2.tar.gz) = 6410954
+MD5 (epiphany-2.22.1.1.tar.bz2) = JLuMQwphZbnEOi7QRSzGpQ==
+RMD160 (epiphany-2.22.1.1.tar.bz2) = pZz5CuaX8y8t6EPZwKmTZz9HY9k=
+SHA1 (epiphany-2.22.1.1.tar.bz2) = Rz/jOU4alpXgFv/EYInULUtdYSg=
+SHA256 (epiphany-2.22.1.1.tar.bz2) =
RhAFiRExUOgjOtpKJt4DDwokA3jBA0BlWdVv5ANDOGY=
+SIZE (epiphany-2.22.1.1.tar.bz2) = 5184989
Index: pkg/PLIST
===================================================================
RCS file: /home/OpenBSD/cvs/ports/www/epiphany/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 19 Dec 2007 07:31:15 -0000 1.8
+++ pkg/PLIST 2 May 2008 14:45:06 -0000
@@ -1,49 +1,53 @@
@comment $OpenBSD: PLIST,v 1.8 2007/12/19 07:31:15 ajacoutot Exp $
bin/epiphany
include/epiphany/
-include/epiphany/${M}/
-include/epiphany/${M}/epiphany/
-include/epiphany/${M}/epiphany/ephy-adblock-manager.h
-include/epiphany/${M}/epiphany/ephy-adblock.h
-include/epiphany/${M}/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/${M}/epiphany/ephy-bookmarks.h
-include/epiphany/${M}/epiphany/ephy-command-manager.h
-include/epiphany/${M}/epiphany/ephy-cookie-manager.h
-include/epiphany/${M}/epiphany/ephy-dbus.h
-include/epiphany/${M}/epiphany/ephy-dialog.h
-include/epiphany/${M}/epiphany/ephy-embed-event.h
-include/epiphany/${M}/epiphany/ephy-embed-factory.h
-include/epiphany/${M}/epiphany/ephy-embed-persist.h
-include/epiphany/${M}/epiphany/ephy-embed-prefs.h
-include/epiphany/${M}/epiphany/ephy-embed-shell.h
-include/epiphany/${M}/epiphany/ephy-embed-single.h
-include/epiphany/${M}/epiphany/ephy-embed-type-builtins.h
-include/epiphany/${M}/epiphany/ephy-embed.h
-include/epiphany/${M}/epiphany/ephy-extension.h
-include/epiphany/${M}/epiphany/ephy-extensions-manager.h
-include/epiphany/${M}/epiphany/ephy-history.h
-include/epiphany/${M}/epiphany/ephy-lib-type-builtins.h
-include/epiphany/${M}/epiphany/ephy-link.h
-include/epiphany/${M}/epiphany/ephy-loader.h
-include/epiphany/${M}/epiphany/ephy-node-db.h
-include/epiphany/${M}/epiphany/ephy-node.h
-include/epiphany/${M}/epiphany/ephy-notebook.h
-include/epiphany/${M}/epiphany/ephy-password-manager.h
-include/epiphany/${M}/epiphany/ephy-permission-manager.h
-include/epiphany/${M}/epiphany/ephy-session.h
-include/epiphany/${M}/epiphany/ephy-shell.h
-include/epiphany/${M}/epiphany/ephy-state.h
-include/epiphany/${M}/epiphany/ephy-statusbar.h
-include/epiphany/${M}/epiphany/ephy-tab.h
-include/epiphany/${M}/epiphany/ephy-type-builtins.h
-include/epiphany/${M}/epiphany/ephy-window.h
+include/epiphany/${V}/
+include/epiphany/${V}/epiphany/
+include/epiphany/${V}/epiphany/ephy-adblock-manager.h
+include/epiphany/${V}/epiphany/ephy-adblock.h
+include/epiphany/${V}/epiphany/ephy-base-embed.h
+include/epiphany/${V}/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/${V}/epiphany/ephy-bookmarks.h
+include/epiphany/${V}/epiphany/ephy-command-manager.h
+include/epiphany/${V}/epiphany/ephy-cookie-manager.h
+include/epiphany/${V}/epiphany/ephy-dbus.h
+include/epiphany/${V}/epiphany/ephy-dialog.h
+include/epiphany/${V}/epiphany/ephy-embed-container.h
+include/epiphany/${V}/epiphany/ephy-embed-event.h
+include/epiphany/${V}/epiphany/ephy-embed-factory.h
+include/epiphany/${V}/epiphany/ephy-embed-persist.h
+include/epiphany/${V}/epiphany/ephy-embed-prefs.h
+include/epiphany/${V}/epiphany/ephy-embed-shell.h
+include/epiphany/${V}/epiphany/ephy-embed-single.h
+include/epiphany/${V}/epiphany/ephy-embed-type-builtins.h
+include/epiphany/${V}/epiphany/ephy-embed-utils.h
+include/epiphany/${V}/epiphany/ephy-embed.h
+include/epiphany/${V}/epiphany/ephy-extension.h
+include/epiphany/${V}/epiphany/ephy-extensions-manager.h
+include/epiphany/${V}/epiphany/ephy-history-item.h
+include/epiphany/${V}/epiphany/ephy-history.h
+include/epiphany/${V}/epiphany/ephy-lib-type-builtins.h
+include/epiphany/${V}/epiphany/ephy-link.h
+include/epiphany/${V}/epiphany/ephy-loader.h
+include/epiphany/${V}/epiphany/ephy-node-db.h
+include/epiphany/${V}/epiphany/ephy-node.h
+include/epiphany/${V}/epiphany/ephy-notebook.h
+include/epiphany/${V}/epiphany/ephy-password-manager.h
+include/epiphany/${V}/epiphany/ephy-permission-manager.h
+include/epiphany/${V}/epiphany/ephy-session.h
+include/epiphany/${V}/epiphany/ephy-shell.h
+include/epiphany/${V}/epiphany/ephy-state.h
+include/epiphany/${V}/epiphany/ephy-statusbar.h
+include/epiphany/${V}/epiphany/ephy-type-builtins.h
+include/epiphany/${V}/epiphany/ephy-version.h
+include/epiphany/${V}/epiphany/ephy-window.h
lib/epiphany/
-lib/epiphany/${M}/
-lib/epiphany/${M}/plugins/
-lib/epiphany/${M}/plugins/libdesktopfileplugin.a
-lib/epiphany/${M}/plugins/libdesktopfileplugin.la
-lib/epiphany/${M}/plugins/libdesktopfileplugin.so
-lib/pkgconfig/epiphany-${M}.pc
+lib/epiphany/${V}/
+lib/epiphany/${V}/plugins/
+lib/epiphany/${V}/plugins/libdesktopfileplugin.a
+lib/epiphany/${V}/plugins/libdesktopfileplugin.la
+lib/epiphany/${V}/plugins/libdesktopfileplugin.so
+lib/pkgconfig/epiphany-${V}.pc
@man man/man1/epiphany.1
share/aclocal/epiphany.m4
share/applications/bme.desktop
@@ -53,10 +57,10 @@ share/epiphany/
share/epiphany/about.ini
share/epiphany/art/
share/epiphany/chrome/
+share/epiphany/chrome/app-chrome.manifest
share/epiphany/chrome/branding/
share/epiphany/chrome/branding/brand.dtd
share/epiphany/chrome/branding/brand.properties
-share/epiphany/chrome/epiphany.manifest
share/epiphany/chrome/global/
share/epiphany/chrome/global/about.xhtml
share/epiphany/default-prefs.js
@@ -80,42 +84,55 @@ share/epiphany/icons/hicolor/
share/epiphany/icons/hicolor/16x16/
share/epiphany/icons/hicolor/16x16/actions/
share/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
-share/epiphany/icons/hicolor/16x16/actions/download.png
share/epiphany/icons/hicolor/16x16/actions/history-view.png
share/epiphany/icons/hicolor/16x16/actions/location-entry.png
+share/epiphany/icons/hicolor/16x16/places/
+share/epiphany/icons/hicolor/16x16/places/bookmark-web.png
share/epiphany/icons/hicolor/16x16/status/
+share/epiphany/icons/hicolor/16x16/status/lock-broken.png
+share/epiphany/icons/hicolor/16x16/status/lock-insecure.png
+share/epiphany/icons/hicolor/16x16/status/lock-secure-checked.png
+share/epiphany/icons/hicolor/16x16/status/lock-secure.png
share/epiphany/icons/hicolor/16x16/status/popup-hidden.png
share/epiphany/icons/hicolor/22x22/
share/epiphany/icons/hicolor/22x22/actions/
share/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
-share/epiphany/icons/hicolor/22x22/actions/download.png
share/epiphany/icons/hicolor/22x22/actions/history-view.png
share/epiphany/icons/hicolor/22x22/actions/location-entry.png
+share/epiphany/icons/hicolor/22x22/places/
+share/epiphany/icons/hicolor/22x22/places/bookmark-web.png
share/epiphany/icons/hicolor/22x22/status/
share/epiphany/icons/hicolor/22x22/status/popup-hidden.png
share/epiphany/icons/hicolor/24x24/
share/epiphany/icons/hicolor/24x24/actions/
share/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
-share/epiphany/icons/hicolor/24x24/actions/download.png
share/epiphany/icons/hicolor/24x24/actions/history-view.png
share/epiphany/icons/hicolor/24x24/actions/location-entry.png
+share/epiphany/icons/hicolor/24x24/places/
+share/epiphany/icons/hicolor/24x24/places/bookmark-web.png
share/epiphany/icons/hicolor/24x24/status/
+share/epiphany/icons/hicolor/24x24/status/lock-broken.png
+share/epiphany/icons/hicolor/24x24/status/lock-insecure.png
+share/epiphany/icons/hicolor/24x24/status/lock-secure-checked.png
+share/epiphany/icons/hicolor/24x24/status/lock-secure.png
share/epiphany/icons/hicolor/24x24/status/popup-hidden.png
share/epiphany/icons/hicolor/32x32/
share/epiphany/icons/hicolor/32x32/actions/
share/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/epiphany/icons/hicolor/32x32/actions/download.png
share/epiphany/icons/hicolor/32x32/actions/history-view.png
share/epiphany/icons/hicolor/32x32/actions/location-entry.png
+share/epiphany/icons/hicolor/32x32/actions/location-entry.svg
share/epiphany/icons/hicolor/32x32/status/
share/epiphany/icons/hicolor/32x32/status/popup-hidden.png
+share/epiphany/icons/hicolor/48x48/
+share/epiphany/icons/hicolor/48x48/status/
+share/epiphany/icons/hicolor/48x48/status/lock-broken.png
+share/epiphany/icons/hicolor/48x48/status/lock-insecure.png
+share/epiphany/icons/hicolor/48x48/status/lock-secure-checked.png
+share/epiphany/icons/hicolor/48x48/status/lock-secure.png
share/epiphany/icons/hicolor/scalable/
share/epiphany/icons/hicolor/scalable/actions/
share/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/epiphany/icons/hicolor/scalable/actions/download.svg
share/epiphany/icons/hicolor/scalable/actions/history-view.svg
share/epiphany/icons/hicolor/scalable/actions/location-entry.svg
share/epiphany/icons/hicolor/scalable/status/
@@ -137,6 +154,20 @@ share/gnome/help/epiphany/bg/figures/eph
share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
+share/gnome/help/epiphany/ca/
+share/gnome/help/epiphany/ca/epiphany.xml
+share/gnome/help/epiphany/ca/figures/
+share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
+share/gnome/help/epiphany/de/
+share/gnome/help/epiphany/de/epiphany.xml
+share/gnome/help/epiphany/de/figures/
+share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/de/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/de/figures/ephy-screenshot.png
share/gnome/help/epiphany/el/
share/gnome/help/epiphany/el/epiphany.xml
share/gnome/help/epiphany/el/figures/
@@ -200,6 +231,13 @@ share/gnome/help/epiphany/nl/figures/eph
share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
+share/gnome/help/epiphany/oc/
+share/gnome/help/epiphany/oc/epiphany.xml
+share/gnome/help/epiphany/oc/figures/
+share/gnome/help/epiphany/oc/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-screenshot.png
share/gnome/help/epiphany/ru/
share/gnome/help/epiphany/ru/epiphany.xml
share/gnome/help/epiphany/ru/figures/
@@ -225,7 +263,6 @@ share/gtk-doc/html/epiphany/
share/gtk-doc/html/epiphany/EphyCommandManager.html
share/gtk-doc/html/epiphany/EphyEmbed.html
share/gtk-doc/html/epiphany/EphyNodeDb.html
-share/gtk-doc/html/epiphany/EphyTab.html
share/gtk-doc/html/epiphany/EphyWindow.html
share/gtk-doc/html/epiphany/ch01.html
share/gtk-doc/html/epiphany/ch02.html
@@ -248,11 +285,21 @@ share/gtk-doc/html/epiphany/left.png
share/gtk-doc/html/epiphany/right.png
share/gtk-doc/html/epiphany/style.css
share/gtk-doc/html/epiphany/up.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/hicolor/16x16/apps/gnome-web-browser.png
+share/icons/hicolor/22x22/apps/gnome-web-browser.png
+share/icons/hicolor/24x24/apps/gnome-web-browser.png
+share/icons/hicolor/32x32/apps/gnome-web-browser.png
share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
+share/icons/hicolor/scalable/apps/gnome-web-browser.svg
share/locale/am/LC_MESSAGES/epiphany.mo
share/locale/ar/LC_MESSAGES/epiphany.mo
+share/locale/as/LC_MESSAGES/epiphany.mo
share/locale/az/LC_MESSAGES/epiphany.mo
share/locale/be/LC_MESSAGES/epiphany.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/epiphany.mo
share/locale/bg/LC_MESSAGES/epiphany.mo
share/locale/bn/LC_MESSAGES/epiphany.mo
share/locale/bn_IN/LC_MESSAGES/epiphany.mo
@@ -284,6 +331,7 @@ share/locale/is/LC_MESSAGES/epiphany.mo
share/locale/it/LC_MESSAGES/epiphany.mo
share/locale/ja/LC_MESSAGES/epiphany.mo
share/locale/ka/LC_MESSAGES/epiphany.mo
+share/locale/kn/LC_MESSAGES/epiphany.mo
share/locale/ko/LC_MESSAGES/epiphany.mo
share/locale/ku/LC_MESSAGES/epiphany.mo
share/locale/li/LC_MESSAGES/epiphany.mo
@@ -309,6 +357,7 @@ share/locale/pt_BR/LC_MESSAGES/epiphany.
share/locale/ro/LC_MESSAGES/epiphany.mo
share/locale/ru/LC_MESSAGES/epiphany.mo
share/locale/rw/LC_MESSAGES/epiphany.mo
+share/locale/si/LC_MESSAGES/epiphany.mo
share/locale/sk/LC_MESSAGES/epiphany.mo
share/locale/sl/LC_MESSAGES/epiphany.mo
share/locale/sq/LC_MESSAGES/epiphany.mo
@@ -329,6 +378,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.
share/omf/epiphany/
share/omf/epiphany/epiphany-C.omf
share/omf/epiphany/epiphany-bg.omf
+share/omf/epiphany/epiphany-ca.omf
+share/omf/epiphany/epiphany-de.omf
share/omf/epiphany/epiphany-el.omf
share/omf/epiphany/epiphany-en_GB.omf
share/omf/epiphany/epiphany-es.omf
@@ -338,6 +389,7 @@ share/omf/epiphany/epiphany-fr.omf
share/omf/epiphany/epiphany-it.omf
share/omf/epiphany/epiphany-ja.omf
share/omf/epiphany/epiphany-nl.omf
+share/omf/epiphany/epiphany-oc.omf
share/omf/epiphany/epiphany-ru.omf
share/omf/epiphany/epiphany-sv.omf
share/omf/epiphany/epiphany-uk.omf
