diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 0702bebf665..11d4e82cd96 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2009/08/10 06:34:56 kili Exp $ +# $OpenBSD: Makefile,v 1.42 2009/10/13 09:57:41 jasper Exp $ SHARED_ONLY= Yes @@ -6,13 +6,12 @@ COMMENT= GNOME web browser based on mozilla # PLIST regen is needed for at least the following ports when # the epiphany extensions directory changes: -# (i.e. ${LOCALBASE}/lib/epiphany/2.24/extensions) +# (i.e. ${LOCALBASE}/lib/epiphany/2.28/extensions) # www/epiphany-extensions # x11/gnome/seahorse-plugins GNOME_PROJECT= epiphany -GNOME_VERSION= 2.24.3 -PKGNAME= ${DISTNAME}p11 +GNOME_VERSION= 2.28.0 M= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} SUBST_VARS= M @@ -29,62 +28,47 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -BUILD_DEPENDS= ${RUN_DEPENDS} \ - :xulrunner-devel->=1.8.1:devel/xulrunner/1.8,-devel +WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c +WANTLIB += cairo dbus-1 dbus-glib-1 enchant expat fontconfig freetype +WANTLIB += gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 +WANTLIB += glib-2.0 glitz gmodule-2.0 gnome-keyring gnutls gobject-2.0 +WANTLIB += gthread-2.0 gtk-x11-2.0 icudata icui18n icuuc jpeg +WANTLIB += m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += pcre pixman-1 plc4 plds4 png proxy pthread pthread-stubs +WANTLIB += smime3 softokn3 soup-2.4 sqlite3 ssl3 startup-notification-1 +WANTLIB += stdc++ tasn1 xcb xcb-atom xcb-aux xcb-event xml2 z + +BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= :gnome-icon-theme-*:x11/gnome/icon-theme \ :gnome-themes-*:x11/gnome/themes \ :iso-codes-*:devel/iso-codes \ ::x11/gnome/py-gnome -LIB_DEPENDS= ${MODPY_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/1.8 \ - xml2.>=6.12::textproc/libxml \ - xslt.>=1::textproc/libxslt \ +LIB_DEPENDS= xslt.>=1::textproc/libxslt \ execinfo::devel/libexecinfo \ - canberra,canberra-gtk::audio/libcanberra \ - notify.>=2::devel/libnotify + notify.>=2::devel/libnotify \ + webkit-1.0::www/webkit \ + soup-gnome-2.4.>=1::devel/libsoup,-gnome -MODULES= devel/gettext \ - lang/python \ - x11/gnome \ - devel/gconf2 +MODULES= devel/gconf2 \ + devel/gettext \ + x11/gnome -WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ - Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ - Xrender art_lgpl_2 atk-1.0 bonobo-2 \ - bonobo-activation bonoboui-2 c cairo crypto dbus-1 \ - dbus-glib-1 expat fontconfig freebl3 freetype \ - gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \ - glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \ - gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 \ - gthread-2.0 gtk-x11-2.0 ltdl m nspr4 nss3 nssckbi ogg \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ - plc4 plds4 png popt pthread smime3 softokn3 ssl \ - ssl3 startup-notification-1 stdc++ util vorbis \ - vorbisfile z avahi-client avahi-common avahi-glib \ - pthread-stubs xcb - -USE_X11= Yes -LIBTOOL_FLAGS= --tag=disable-static -DESKTOP_FILES= Yes -MODGNOME_HELP_FILES= Yes -MODGCONF2_SCHEMAS_DIR= epiphany +USE_X11= Yes +LIBTOOL_FLAGS= --tag=disable-static +DESKTOP_FILES= Yes +MODGNOME_HELP_FILES= Yes +MODGCONF2_SCHEMAS_DIR= epiphany CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --disable-static \ - --with-engine=mozilla \ - --with-gecko=xulrunner \ - --enable-python \ --disable-scrollkeeper \ --disable-gtk-doc \ --disable-zeroconf -# xulrunner needs to be compiled with spell-check support (enchant) -CONFIGURE_ARGS+= --disable-spell-checker -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/nss -I${LOCALBASE}/include -I${LOCALBASE}/xulrunner/include/pipnss/ -I${X11BASE}/include" \ - LDFLAGS="-Wl,-rpath-link,${LOCALBASE}/lib/ -Wl,-rpath-link,${X11BASE}/lib/ -L${LOCALBASE}/lib -lfreebl3 -lnss3 -lnssckbi -lsmime3 -lsoftokn3 -lssl3 -pthread -lexecinfo -L${LOCALBASE}/xulrunner" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ HOME=/tmp .include diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 171b268a2e1..4c8db524a9a 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,5 +1,5 @@ -MD5 (epiphany-2.24.3.tar.bz2) = r1FhTHt4+LjGjp7OPY9Njw== -RMD160 (epiphany-2.24.3.tar.bz2) = 0n1RHPnxy2tduUscghcpwd/Fmws= -SHA1 (epiphany-2.24.3.tar.bz2) = lF15NSc880H3xURbMSAu0lfPyaY= -SHA256 (epiphany-2.24.3.tar.bz2) = zG/3swkRv4DY1y1tt8x+y/UbL1u2Z5a3naM/j2gEAqw= -SIZE (epiphany-2.24.3.tar.bz2) = 5722991 +MD5 (epiphany-2.28.0.tar.bz2) = uIrBFo/CcYksq/c7dJysFg== +RMD160 (epiphany-2.28.0.tar.bz2) = z4l8aC4hBTWttV/IPT1dr+M/9Aw= +SHA1 (epiphany-2.28.0.tar.bz2) = cxTvIil3UhmbCFASdpTX+IroOk0= +SHA256 (epiphany-2.28.0.tar.bz2) = I+A3nEHDeCITOPsyfXR/PkKyuYzfFRLJ33y+q0XzEeo= +SIZE (epiphany-2.28.0.tar.bz2) = 5690293 diff --git a/www/epiphany/patches/patch-embed_mozilla_Makefile_in b/www/epiphany/patches/patch-embed_mozilla_Makefile_in deleted file mode 100644 index 97bfbced740..00000000000 --- a/www/epiphany/patches/patch-embed_mozilla_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-embed_mozilla_Makefile_in,v 1.3 2009/03/16 10:44:44 ajacoutot Exp $ ---- embed/mozilla/Makefile.in.orig Mon Mar 16 11:19:37 2009 -+++ embed/mozilla/Makefile.in Mon Mar 16 11:20:02 2009 -@@ -513,7 +513,7 @@ libephymozillaembed_la_CPPFLAGS = -I$(top_srcdir)/lib - -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ - -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ - -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ -- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ -+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla-plugins\" \ - -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" -DALLOW_PRIVATE_API \ - $(AM_CPPFLAGS) $(am__append_7) - libephymozillaembed_la_CXXFLAGS = \ diff --git a/www/epiphany/pkg/PLIST b/www/epiphany/pkg/PLIST index d9c60f349a5..938f6860de2 100644 --- a/www/epiphany/pkg/PLIST +++ b/www/epiphany/pkg/PLIST @@ -1,20 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.13 2009/06/07 06:44:42 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.14 2009/10/13 09:57:41 jasper Exp $ @bin 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-base-embed.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-container.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 @@ -24,7 +20,6 @@ include/epiphany/${M}/epiphany/ephy-embed-utils.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-item.h include/epiphany/${M}/epiphany/ephy-history.h include/epiphany/${M}/epiphany/ephy-lib-type-builtins.h include/epiphany/${M}/epiphany/ephy-link.h @@ -32,20 +27,15 @@ 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-type-builtins.h -include/epiphany/${M}/epiphany/ephy-version.h +include/epiphany/${M}/epiphany/ephy-web-view.h include/epiphany/${M}/epiphany/ephy-window.h -lib/epiphany/ -lib/epiphany/${M}/ -lib/epiphany/${M}/plugins/ -lib/epiphany/${M}/plugins/libdesktopfileplugin.la -lib/epiphany/${M}/plugins/libdesktopfileplugin.so +include/epiphany/${M}/epiphany/epiphany.h lib/pkgconfig/epiphany-${M}.pc @man man/man1/epiphany.1 share/aclocal/epiphany.m4 @@ -55,14 +45,7 @@ share/dbus-1/services/org.gnome.Epiphany.service 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/global/ -share/epiphany/chrome/global/about.xhtml -share/epiphany/default-prefs.js +share/epiphany/default-bookmarks.rdf share/epiphany/ephy-xml2ini.xsl share/epiphany/epiphany-bookmark-editor-ui.xml share/epiphany/epiphany-bookmarks-html.xsl @@ -73,11 +56,11 @@ share/epiphany/epiphany-toolbar.xml share/epiphany/epiphany-ui.xml share/epiphany/epiphany.xhtml share/epiphany/glade/ -share/epiphany/glade/certificate-dialogs.glade -share/epiphany/glade/epiphany.glade -share/epiphany/glade/form-signing-dialog.glade -share/epiphany/glade/prefs-dialog.glade -share/epiphany/glade/print.glade +share/epiphany/glade/certificate-dialogs.ui +share/epiphany/glade/epiphany.ui +share/epiphany/glade/form-signing-dialog.ui +share/epiphany/glade/prefs-dialog.ui +share/epiphany/glade/print.ui share/epiphany/icons/ share/epiphany/icons/hicolor/ share/epiphany/icons/hicolor/16x16/ @@ -268,17 +251,21 @@ share/gnome/help/epiphany/uk/figures/ephy-screenshot.png share/gtk-doc/html/epiphany/ share/gtk-doc/html/epiphany/EphyCommandManager.html share/gtk-doc/html/epiphany/EphyEmbed.html +share/gtk-doc/html/epiphany/EphyLocationEntry.html share/gtk-doc/html/epiphany/EphyNodeDb.html +share/gtk-doc/html/epiphany/EphySearchEntry.html +share/gtk-doc/html/epiphany/EphySpinner.html share/gtk-doc/html/epiphany/EphyWindow.html +share/gtk-doc/html/epiphany/EphyZoomControl.html share/gtk-doc/html/epiphany/ch01.html share/gtk-doc/html/epiphany/ch02.html +share/gtk-doc/html/epiphany/ch03.html share/gtk-doc/html/epiphany/epiphany-EphyEmbedFactory.html share/gtk-doc/html/epiphany/epiphany-EphyEmbedPersist.html share/gtk-doc/html/epiphany/epiphany-EphyEmbedSingle.html share/gtk-doc/html/epiphany/epiphany-EphyExtensionsManager.html share/gtk-doc/html/epiphany/epiphany-EphyGlade.html share/gtk-doc/html/epiphany/epiphany-EphyPermissionManager.html -share/gtk-doc/html/epiphany/epiphany-ephy-cookie-manager.html share/gtk-doc/html/epiphany/epiphany-ephy-password-manager.html share/gtk-doc/html/epiphany/epiphany-ephy-session.html share/gtk-doc/html/epiphany/epiphany-ephy-shell.html @@ -313,8 +300,10 @@ share/locale/be@latin/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 +share/locale/br/LC_MESSAGES/epiphany.mo share/locale/bs/LC_MESSAGES/epiphany.mo share/locale/ca/LC_MESSAGES/epiphany.mo +share/locale/ca@valencia/LC_MESSAGES/epiphany.mo share/locale/cs/LC_MESSAGES/epiphany.mo share/locale/cy/LC_MESSAGES/epiphany.mo share/locale/da/LC_MESSAGES/epiphany.mo @@ -336,7 +325,9 @@ share/locale/he/LC_MESSAGES/epiphany.mo share/locale/hi/LC_MESSAGES/epiphany.mo share/locale/hr/LC_MESSAGES/epiphany.mo share/locale/hu/LC_MESSAGES/epiphany.mo +share/locale/hy/LC_MESSAGES/epiphany.mo share/locale/id/LC_MESSAGES/epiphany.mo +share/locale/ig/LC_MESSAGES/epiphany.mo share/locale/is/LC_MESSAGES/epiphany.mo share/locale/it/LC_MESSAGES/epiphany.mo share/locale/ja/LC_MESSAGES/epiphany.mo @@ -347,6 +338,7 @@ share/locale/ku/LC_MESSAGES/epiphany.mo share/locale/li/LC_MESSAGES/epiphany.mo share/locale/lt/LC_MESSAGES/epiphany.mo share/locale/lv/LC_MESSAGES/epiphany.mo +share/locale/mai/LC_MESSAGES/epiphany.mo share/locale/mg/LC_MESSAGES/epiphany.mo share/locale/mi/LC_MESSAGES/epiphany.mo share/locale/mk/LC_MESSAGES/epiphany.mo @@ -362,6 +354,7 @@ 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 @@ -380,8 +373,11 @@ share/locale/th/LC_MESSAGES/epiphany.mo share/locale/tk/LC_MESSAGES/epiphany.mo share/locale/tr/LC_MESSAGES/epiphany.mo share/locale/uk/LC_MESSAGES/epiphany.mo +share/locale/uz/LC_MESSAGES/epiphany.mo +share/locale/uz@cyrillic/LC_MESSAGES/epiphany.mo share/locale/vi/LC_MESSAGES/epiphany.mo share/locale/wa/LC_MESSAGES/epiphany.mo +share/locale/yo/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo share/locale/zh_HK/LC_MESSAGES/epiphany.mo share/locale/zh_TW/LC_MESSAGES/epiphany.mo @@ -404,12 +400,9 @@ share/omf/epiphany/epiphany-oc.omf share/omf/epiphany/epiphany-ru.omf share/omf/epiphany/epiphany-sv.omf share/omf/epiphany/epiphany-uk.omf -share/pygtk/2.0/defs/epiphany.defs @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null ${SCHEMAS_INSTDIR}/ -${SCHEMAS_INSTDIR}/epiphany-fonts.schemas ${SCHEMAS_INSTDIR}/epiphany-lockdown.schemas -${SCHEMAS_INSTDIR}/epiphany-pango.schemas ${SCHEMAS_INSTDIR}/epiphany.schemas @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null @exec %D/bin/update-desktop-database