aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
commitf76d32b8e89fed7c0e459c1a7fe7a4b57661b01c (patch)
treead29e6808ff698f84e08dab8e047f0ae72838df9 /www
parent873cae3ab41a109b6f9cf9f4149f101d6d996235 (diff)
downloadports-f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c.tar.gz
ports-f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/Makefile2
-rw-r--r--www/epiphany-extensions/Makefile23
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist107
-rw-r--r--www/epiphany/Makefile67
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c12
-rw-r--r--www/epiphany/files/patch-embed_ephy-embed-utils.c10
-rw-r--r--www/epiphany/files/patch-embed_ephy-web-view.c14
-rw-r--r--www/epiphany/files/patch-src_ephy-window.c35
-rw-r--r--www/epiphany/pkg-plist58
-rw-r--r--www/evolution-webcal/Makefile5
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist6
-rw-r--r--www/galeon/Makefile59
-rw-r--r--www/galeon/distinfo3
-rw-r--r--www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c10
-rw-r--r--www/galeon/files/patch-src_Makefile.in10
-rw-r--r--www/galeon/files/patch-src_galeon-main.c11
-rw-r--r--www/galeon/files/patch-ui_Makefile.in12
-rw-r--r--www/galeon/pkg-descr4
-rw-r--r--www/galeon/pkg-plist244
-rw-r--r--www/gnome-user-share/Makefile11
-rw-r--r--www/gnome-user-share/distinfo6
-rw-r--r--www/gnome-user-share/files/patch-configure61
-rw-r--r--www/gnome-user-share/files/patch-src_user_share.c48
-rw-r--r--www/gnome-user-share/pkg-plist50
-rw-r--r--www/gtkhtml3/Makefile15
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/pkg-plist7
-rw-r--r--www/kazehakase/Makefile29
-rw-r--r--www/kazehakase/distinfo6
-rw-r--r--www/kazehakase/files/patch-src_net_kz-http.c11
-rw-r--r--www/kazehakase/pkg-plist4
-rw-r--r--www/midori/Makefile9
-rw-r--r--www/midori/distinfo6
-rw-r--r--www/midori/pkg-plist47
-rw-r--r--www/p5-Gtk2-WebKit/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile81
-rw-r--r--www/webkit-gtk2/distinfo6
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h11
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp20
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h65
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp11
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h11
-rw-r--r--www/webkit-gtk2/files/patch-GNUmakefile.in13
-rw-r--r--www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h11
-rw-r--r--www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in8
-rw-r--r--www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp8
-rw-r--r--www/webkit-gtk2/files/patch-cairo30
-rw-r--r--www/webkit-gtk2/files/patch-configure20
-rw-r--r--www/webkit-gtk2/pkg-plist233
-rw-r--r--www/webkit-sharp/Makefile2
53 files changed, 939 insertions, 619 deletions
diff --git a/www/Makefile b/www/Makefile
index b05446dcf661..96e380b1a43a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -243,7 +243,6 @@
SUBDIR += g-gcl
SUBDIR += gaeo
SUBDIR += gaeutilities
- SUBDIR += galeon
SUBDIR += gallery
SUBDIR += gallery2
SUBDIR += gallery3
@@ -256,6 +255,7 @@
SUBDIR += geronimo
SUBDIR += getleft
SUBDIR += gforge
+ SUBDIR += gir-repository-webkit
SUBDIR += gist
SUBDIR += glibwww
SUBDIR += glpi
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index e1317f0d785d..cf7e5eba6097 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.114 2009/03/30 21:05:52 marcus Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.122 2009/10/19 02:40:50 kwm Exp $
#
PORTNAME= epiphany-extensions
-PORTVERSION= 2.26.1
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,27 +16,23 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of add-ons for the Epiphany web browser
BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
-LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_GECKO= libxul
USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --with-mozilla=${GECKO}
-
-GCONF_SCHEMAS= smart-bookmarks.schemas
EPHY_EXTENSIONS=all,rss
EPHY_VERSION= ${PORTVERSION:R}
-#PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
-PLIST_SUB= VERSION=2.26 EPHY_VERSION=2.26
+PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
OPTIONS= OPENSP "Enable OpenSP SGML support" off
@@ -49,14 +44,6 @@ CONFIGURE_ARGS+= --enable-opensp=yes
CONFIGURE_ARGS+= --disable-opensp
.endif
-.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-PLIST_SUB+= PYTHON=""
-.else
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}"
pre-everything::
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 329aae0f78d6..411231617165 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.26.1.tar.bz2) = bc3044148e915312654f8c82a575e58e
-SHA256 (gnome2/epiphany-extensions-2.26.1.tar.bz2) = 928b444783332fefb4abccd98827aa3fabd8e7279e2fe0400019dcbab9ea072c
-SIZE (gnome2/epiphany-extensions-2.26.1.tar.bz2) = 1025146
+MD5 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 565d32a8b94fd023f11a82dcef2bf634
+SHA256 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 0f14413316ebbdba392c9df7468d0d08811376ee26c735d7e523fc4eba44572a
+SIZE (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 1389667
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 8864ff24eae5..e44956a16b5b 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -2,22 +2,9 @@ lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyo
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo
-lib/epiphany/%%VERSION%%/extensions/error-viewer.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyo
lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
@@ -28,50 +15,36 @@ lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.la
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.la
-lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so
-lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.la
-lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.so
-lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.la
-lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so
lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la
lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so
lib/epiphany/%%VERSION%%/extensions/librssextension.la
lib/epiphany/%%VERSION%%/extensions/librssextension.so
-lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.la
-lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so
lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la
lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so
-lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.la
-lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.so
+lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.so
+lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.la
lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la
lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so
-lib/epiphany/%%VERSION%%/extensions/page-info.ephy-extension
lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/python-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/rss.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/select-stylesheet.ephy-extension
lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/soup-fly.ephy-extension
lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
%%DATADIR%%/adblock-patterns
%%DATADIR%%/ephy-gestures.xml
%%DATADIR%%/glade/action-properties.glade
%%DATADIR%%/glade/actions-editor.glade
-%%DATADIR%%/glade/adblock.glade
-%%DATADIR%%/glade/error-viewer.glade
-%%DATADIR%%/glade/extensions-manager-ui.glade
-%%DATADIR%%/glade/page-info.glade
+%%DATADIR%%/glade/adblock.ui
+%%DATADIR%%/glade/extensions-manager-ui.ui
%%DATADIR%%/glade/rss-ui.glade
%%DATADIR%%/xml/epiphany-sidebar-ui.xml
-%%DATADIR%%/xml/page-info-context-ui.xml
share/epiphany/icons/hicolor/16x16/status/ad-blocked.png
share/epiphany/icons/hicolor/16x16/status/feed-presence.png
share/epiphany/icons/hicolor/22x22/status/ad-blocked.png
@@ -82,7 +55,6 @@ share/epiphany/icons/hicolor/32x32/status/feed-presence.png
share/epiphany/icons/hicolor/scalable/status/feed-presence.svg
share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png
@@ -102,9 +74,28 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/C/legal.xml
+share/gnome/help/epiphany-extensions/de/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png
@@ -123,9 +114,28 @@ share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source-2.p
share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png
+share/gnome/help/epiphany-extensions/fr/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png
@@ -146,7 +156,6 @@ share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png
@@ -166,7 +175,9 @@ share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/as/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -176,20 +187,26 @@ share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/eu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/gu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/he/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/kn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ml/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/mr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/oc/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/or/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -201,6 +218,8 @@ share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ta/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/te/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/th/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/tr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -210,7 +229,9 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/omf/epiphany-extensions/epiphany-extensions-C.omf
+share/omf/epiphany-extensions/epiphany-extensions-de.omf
share/omf/epiphany-extensions/epiphany-extensions-es.omf
+share/omf/epiphany-extensions/epiphany-extensions-fr.omf
share/omf/epiphany-extensions/epiphany-extensions-oc.omf
share/omf/epiphany-extensions/epiphany-extensions-sv.omf
@dirrm share/omf/epiphany-extensions
@@ -218,8 +239,12 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf
@dirrm share/gnome/help/epiphany-extensions/sv
@dirrm share/gnome/help/epiphany-extensions/oc/figures
@dirrm share/gnome/help/epiphany-extensions/oc
+@dirrm share/gnome/help/epiphany-extensions/fr/figures
+@dirrm share/gnome/help/epiphany-extensions/fr
@dirrm share/gnome/help/epiphany-extensions/es/figures
@dirrm share/gnome/help/epiphany-extensions/es
+@dirrm share/gnome/help/epiphany-extensions/de/figures
+@dirrm share/gnome/help/epiphany-extensions/de
@dirrm share/gnome/help/epiphany-extensions/C/figures
@dirrm share/gnome/help/epiphany-extensions/C
@dirrm share/gnome/help/epiphany-extensions
@@ -245,9 +270,17 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf
@dirrmtry lib/epiphany
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d97d89085e46..87c44e7babfa 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.195 2009/03/30 03:15:21 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.214 2009/10/25 20:22:54 marcus Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.26.3
-PORTREVISION?= 4
+PORTVERSION= 2.28.1
+PORTREVISION?= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,11 +16,15 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT?= An extremely lightweight and simple web browser for GNOME 2
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- notify.1:${PORTSDIR}/devel/libnotify
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+ notify.1:${PORTSDIR}/devel/libnotify \
+ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
+ ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit \
+ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -32,19 +36,20 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GECKO+= libxul
INSTALLS_OMF= yes
+CONFIGURE_ARGS+=--enable-introspection
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
-GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \
- epiphany-fonts.schemas epiphany-pango.schemas
+GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas
PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}"
MAN1= epiphany.1
-OPTIONS= SPELL_CHECKER "Enable spell checking support" off
+OPTIONS= NSS "Import passwords from 2.26 and older on first run" on \
+ SEED "Enable seed support" off \
+ SPELLCHECK "Enable spell checking by default" on
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
@@ -53,40 +58,26 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-CONFIGURE_ARGS+= --with-gecko=${GECKO} \
- --with-engine=mozilla \
- --with-gecko-home=${LOCALBASE}/lib/${GECKO}
-CONFLICTS= epiphany-webkit-[1-9]*
-PLIST_SUB+= GECKO=""
-.if ${GECKO:Mlibxul}!=""
-PLUGIN_SYMLINK= 19
-CONFIGURE_ENV+=gecko_cv_xpcom_program_check="yes"
-PLIST_SUB+= GECKO19=""
-.else
-PLUGIN_SYMLINK= 18
-PLIST_SUB+= GECKO19="@comment "
-.endif
-
NO_WERROR= yes
# allow build with more warnings enabled
.if defined(NO_WERROR)
CONFIGURE_ARGS+= --enable-compile-warnings=no
.endif
-.if ${HAVE_GNOME:Mpygnome2}!=""
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+= pygnome2
-CONFIGURE_ARGS+=--enable-python
-PLIST_SUB+= PYTHON=""
+.if defined(WITH_NSS)
+LIB_DEPENDS+= nss3.1:${PORTSDIR}/security/nss
+CONFIGURE_ARGS+=--enable-nss
.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+= PYTHON="@comment "
+CONFIGURE_ARGS+=--disable-nss
+.endif
+
+.if defined(WITH_SEED)
+LIB_DEPENDS+= seed.0:${PORTSDIR}/devel/seed
+CONFIGURE_ARGS+=--enable-seed
.endif
-.if defined(WITH_SPELL_CHECKER)
-LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant
-CONFIGURE_ARGS+=--enable-spell-checker
+.if defined(WITH_SPELLCHECK)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c
.endif
post-patch:
@@ -95,14 +86,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \
s|-ldl"$$|"|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins/symlinks/gecko${PLUGIN_SYMLINK}"|' \
- ${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
- @${REINPLACE_CMD} -e 's|@with_engine@|mozilla|' \
- ${WRKSRC}/data/epiphany.pc.in
post-install:
- ${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
- ${PREFIX}/etc/gconf/schemas
@-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 40744340fbdd..0ccbf15306c0 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.26.3.tar.bz2) = 16f44012bc376077e1443e049d725847
-SHA256 (gnome2/epiphany-2.26.3.tar.bz2) = bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
-SIZE (gnome2/epiphany-2.26.3.tar.bz2) = 5655997
+MD5 (gnome2/epiphany-2.28.1.tar.bz2) = 7a8b885a4894d2a9e979b8cb8898db1e
+SHA256 (gnome2/epiphany-2.28.1.tar.bz2) = 95ccdd36bc7fdf95c6085da3b76cee6467f3c9a8745541cfb09fdd8d33a1f04d
+SIZE (gnome2/epiphany-2.28.1.tar.bz2) = 5693411
diff --git a/www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c b/www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c
new file mode 100644
index 000000000000..f9fbb6a13b89
--- /dev/null
+++ b/www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c
@@ -0,0 +1,12 @@
+--- embed/ephy-embed-prefs.c.orig 2009-10-25 16:18:24.000000000 -0400
++++ embed/ephy-embed-prefs.c 2009-10-25 16:19:05.000000000 -0400
+@@ -250,6 +250,9 @@ ephy_embed_prefs_init (void)
+ /* Hardcoded settings */
+ g_object_set (settings, "auto-shrink-images", FALSE, NULL);
+
++ /* Enable spell-check by default */
++ g_object_set (settings, "enable-spell-checking", TRUE, NULL);
++
+ /* Connections */
+ connections = g_malloc (sizeof (guint) * G_N_ELEMENTS (webkit_pref_entries));
+
diff --git a/www/epiphany/files/patch-embed_ephy-embed-utils.c b/www/epiphany/files/patch-embed_ephy-embed-utils.c
new file mode 100644
index 000000000000..09de6a98174c
--- /dev/null
+++ b/www/epiphany/files/patch-embed_ephy-embed-utils.c
@@ -0,0 +1,10 @@
+--- embed/ephy-embed-utils.c.orig 2009-10-13 15:28:59.000000000 +0200
++++ embed/ephy-embed-utils.c 2009-10-13 15:29:30.000000000 +0200
+@@ -91,6 +91,7 @@ ephy_embed_utils_address_has_web_scheme
+ g_str_has_prefix (address, "file:") ||
+ g_str_has_prefix (address, "data:") ||
+ g_str_has_prefix (address, "about:") ||
++ g_str_has_prefix (address, "javascript:") ||
+ g_str_has_prefix (address, "gopher:"));
+
+ return has_web_scheme;
diff --git a/www/epiphany/files/patch-embed_ephy-web-view.c b/www/epiphany/files/patch-embed_ephy-web-view.c
new file mode 100644
index 000000000000..beb96fd71c92
--- /dev/null
+++ b/www/epiphany/files/patch-embed_ephy-web-view.c
@@ -0,0 +1,14 @@
+--- embed/ephy-web-view.c.orig 2009-10-13 15:30:12.000000000 +0200
++++ embed/ephy-web-view.c 2009-10-13 15:30:52.000000000 +0200
+@@ -1129,7 +1129,10 @@ ephy_web_view_load_url (EphyWebView *vie
+ else
+ effective_url = ephy_embed_utils_normalize_address (url);
+
+- webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
++ if (g_str_has_prefix (effective_url, "javascript:"))
++ webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view), effective_url);
++ else
++ webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
+
+ if (soup_uri)
+ soup_uri_free (soup_uri);
diff --git a/www/epiphany/files/patch-src_ephy-window.c b/www/epiphany/files/patch-src_ephy-window.c
new file mode 100644
index 000000000000..f8467d96bce8
--- /dev/null
+++ b/www/epiphany/files/patch-src_ephy-window.c
@@ -0,0 +1,35 @@
+From c61c318aabdc980477dccd78549fe9819c3b1fa0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
+Date: Fri, 9 Oct 2009 20:07:20 +0200
+Subject: [PATCH] Pass mailto: URI to gtk_show_uri()
+
+(Part of) Bug #584537
+---
+ src/ephy-window.c | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/ephy-window.c b/src/ephy-window.c
+index 635a779..630ecec 100644
+--- src/ephy-window.c
++++ src/ephy-window.c
+@@ -2548,10 +2548,18 @@ policy_decision_required_cb (WebKitWebView *web_view,
+ WebKitWebNavigationReason reason;
+ gint button;
+ gint state;
++ const char *uri;
+
+ reason = webkit_web_navigation_action_get_reason (action);
+ button = webkit_web_navigation_action_get_button (action);
+ state = webkit_web_navigation_action_get_modifier_state (action);
++ uri = webkit_network_request_get_uri (request);
++
++ if (strncmp (uri, "mailto:", 7) == 0) {
++ webkit_web_policy_decision_ignore (decision);
++ gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
++ return TRUE;
++ }
+
+ /* Open in new tab for middle click or ctrl+click */
+ if (reason == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED &&
+--
+1.6.4.3
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 583f6d49d136..265cf986aa97 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,16 +1,13 @@
bin/epiphany
+include/epiphany/%%EPHY_VERSION%%/epiphany/epiphany.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-base-embed.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-container.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
@@ -20,7 +17,6 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-utils.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history-item.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h
@@ -28,36 +24,39 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-loader.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node-db.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-notebook.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-password-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-session.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-version.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-web-view.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
-%%GECKO%%lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
-%%GECKO%%lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
@comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
-libdata/pkgconfig/epiphany-2.26.pc
+libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
share/aclocal/epiphany.m4
share/applications/bme.desktop
share/applications/epiphany.desktop
share/dbus-1/services/org.gnome.Epiphany.service
+lib/girepository-1.0/Epiphany-2.28.typelib
+share/gir-1.0/Epiphany-2.28.gir
%%DOCSDIR%%/EphyCommandManager.html
%%DOCSDIR%%/EphyEmbed.html
+%%DOCSDIR%%/EphyLocationEntry.html
%%DOCSDIR%%/EphyNodeDb.html
+%%DOCSDIR%%/EphySearchEntry.html
+%%DOCSDIR%%/EphySpinner.html
%%DOCSDIR%%/EphyWindow.html
+%%DOCSDIR%%/EphyZoomControl.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
%%DOCSDIR%%/epiphany-EphyGlade.html
%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
%%DOCSDIR%%/epiphany-ephy-password-manager.html
%%DOCSDIR%%/epiphany-ephy-session.html
%%DOCSDIR%%/epiphany-ephy-shell.html
@@ -71,13 +70,7 @@ share/dbus-1/services/org.gnome.Epiphany.service
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
%%DATADIR%%/about.ini
-%%DATADIR%%/chrome/app-chrome.manifest
-%%DATADIR%%/chrome/branding/brand.dtd
-%%DATADIR%%/chrome/branding/brand.properties
-%%DATADIR%%/chrome/global/about.xhtml
-%%GECKO19%%%%DATADIR%%/chrome/global/netError.dtd
-%%GECKO19%%%%DATADIR%%/components/epiphany.xpt
-%%DATADIR%%/default-prefs.js
+%%DATADIR%%/default-bookmarks.rdf
%%DATADIR%%/ephy-xml2ini.xsl
%%DATADIR%%/epiphany-bookmark-editor-ui.xml
%%DATADIR%%/epiphany-bookmarks-html.xsl
@@ -87,11 +80,11 @@ share/dbus-1/services/org.gnome.Epiphany.service
%%DATADIR%%/epiphany-toolbar.xml
%%DATADIR%%/epiphany-ui.xml
%%DATADIR%%/epiphany.xhtml
-%%DATADIR%%/glade/certificate-dialogs.glade
-%%DATADIR%%/glade/epiphany.glade
-%%DATADIR%%/glade/form-signing-dialog.glade
-%%DATADIR%%/glade/prefs-dialog.glade
-%%DATADIR%%/glade/print.glade
+%%DATADIR%%/glade/certificate-dialogs.ui
+%%DATADIR%%/glade/epiphany.ui
+%%DATADIR%%/glade/form-signing-dialog.ui
+%%DATADIR%%/glade/prefs-dialog.ui
+%%DATADIR%%/glade/print.ui
%%DATADIR%%/icons/hicolor/16x16/actions/bookmark-view.png
%%DATADIR%%/icons/hicolor/16x16/actions/history-view.png
%%DATADIR%%/icons/hicolor/16x16/actions/location-entry.png
@@ -239,8 +232,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
@@ -262,7 +257,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
@@ -282,6 +279,7 @@ 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
@@ -307,8 +305,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
@@ -330,7 +331,6 @@ 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
@dirrm share/omf/epiphany
@dirrmtry share/icons/LowContrastLargePrint/48x48/apps
@dirrmtry share/icons/LowContrastLargePrint/48x48
@@ -395,14 +395,12 @@ share/pygtk/2.0/defs/epiphany.defs
@dirrmtry %%DATADIR%%/icons/hicolor
@dirrmtry %%DATADIR%%/icons
@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/components
-@dirrm %%DATADIR%%/chrome/global
-@dirrm %%DATADIR%%/chrome/branding
-@dirrm %%DATADIR%%/chrome
@dirrm %%DATADIR%%/art
@dirrmtry %%DATADIR%%
-@dirrm %%DOCSDIR%%
+@dirrmtry %%DOCSDIR%%
@dirrmtry share/applications
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0
@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
@dirrmtry lib/epiphany/%%EPHY_VERSION%%
@dirrmtry lib/epiphany
@@ -437,6 +435,8 @@ share/pygtk/2.0/defs/epiphany.defs
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index b04a21358fbd..cc1c39dd1c70 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.61 2009/03/17 17:15:04 kwm Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.64 2009/09/22 11:30:13 avl Exp $
#
PORTNAME= evolution-webcal
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index c57481dbbab9..b58ca34c74b4 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.26.0.tar.bz2) = a36036a94dd043f57a6d84ab9b6c732c
-SHA256 (evolution-webcal-2.26.0.tar.bz2) = d37e47aad820aa6f457bec42ea4b3c6f01fba85f3573204353c001dfed3d4bb6
-SIZE (evolution-webcal-2.26.0.tar.bz2) = 155281
+MD5 (evolution-webcal-2.28.0.tar.bz2) = 7b506d06c56b579977d4ebc56463ff23
+SHA256 (evolution-webcal-2.28.0.tar.bz2) = 0518327536f1e43e14a19f0957e38a7c6cde224a971562a5a2c00cc7438cb7bd
+SIZE (evolution-webcal-2.28.0.tar.bz2) = 158384
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 13c66d80768b..f7662efc2861 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -9,6 +9,7 @@ share/locale/bn/LC_MESSAGES/evolution-webcal.mo
share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo
share/locale/bs/LC_MESSAGES/evolution-webcal.mo
share/locale/ca/LC_MESSAGES/evolution-webcal.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-webcal.mo
share/locale/cs/LC_MESSAGES/evolution-webcal.mo
share/locale/cy/LC_MESSAGES/evolution-webcal.mo
share/locale/da/LC_MESSAGES/evolution-webcal.mo
@@ -39,6 +40,7 @@ share/locale/ku/LC_MESSAGES/evolution-webcal.mo
share/locale/ky/LC_MESSAGES/evolution-webcal.mo
share/locale/lt/LC_MESSAGES/evolution-webcal.mo
share/locale/lv/LC_MESSAGES/evolution-webcal.mo
+share/locale/mai/LC_MESSAGES/evolution-webcal.mo
share/locale/mk/LC_MESSAGES/evolution-webcal.mo
share/locale/ml/LC_MESSAGES/evolution-webcal.mo
share/locale/mr/LC_MESSAGES/evolution-webcal.mo
@@ -95,12 +97,16 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
deleted file mode 100644
index 86d542073ce3..000000000000
--- a/www/galeon/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Ports collection Makefile for: galeon
-# Date created: 1 August 2000
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports-stable/www/galeon/Makefile,v 1.6 2008/11/16 20:00:21 marcus Exp $
-#
-
-PORTNAME= galeon
-PORTVERSION= 2.0.7
-PORTREVISION= 1
-CATEGORIES= www gnome
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202.x/Galeon%20${PORTVERSION}
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
-
-USE_GECKO= firefox mozilla seamonkey xulrunner
-WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//}
-USE_BZIP2= yes
-INSTALLS_OMF= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \
- gnomedesktop
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_GETTEXT= yes
-CONFIGURE_ARGS= --enable-nautilus-view=no \
- --with-mozilla=${GECKO}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-MAN1= galeon.1
-GCONF_SCHEMAS= galeon.schemas
-
-DEPRECATED= requires legacy Gecko; switch to www/epiphany instead
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-
-# Galeon does not build correctly in -CURRENT if -Werror is passed
-# to the compiler.
-NO_WERROR= yes
-
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
-CONFIGURE_ARGS+= --disable-werror
-.endif
-
-post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-lpthread|${PTHREAD_LIBS}|g'
- @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|malloc\.h|stdlib.h|g'
- @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
- ${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
- @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins/symlinks/gecko18|' \
- ${WRKSRC}/mozilla/mozilla-embed-shell.cpp
-
-.include <bsd.port.post.mk>
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
deleted file mode 100644
index b14dc93f2c93..000000000000
--- a/www/galeon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (galeon-2.0.7.tar.bz2) = 2eede1f43e3f6f2ac4ce7d4db99b15b2
-SHA256 (galeon-2.0.7.tar.bz2) = c6fb0c9e7e2a4014ee7c785cec35380985138bd9aa2b33e9cb63de497ea68b3b
-SIZE (galeon-2.0.7.tar.bz2) = 3096337
diff --git a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
deleted file mode 100644
index 0400ebcf4602..000000000000
--- a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- bookmarks/bookmarks-import-druid-konqueror.c.orig Tue Mar 30 16:33:05 2004
-+++ bookmarks/bookmarks-import-druid-konqueror.c Mon May 31 23:35:26 2004
-@@ -20,6 +20,7 @@
- #include "config.h"
- #endif
-
-+#include <sys/types.h>
- #include <glib/gi18n.h>
- #include "bookmarks-import-druid-konqueror.h"
- #include "gul-gobject-misc.h"
diff --git a/www/galeon/files/patch-src_Makefile.in b/www/galeon/files/patch-src_Makefile.in
deleted file mode 100644
index 3c75398d9feb..000000000000
--- a/www/galeon/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig Thu Dec 18 15:12:38 2003
-+++ src/Makefile.in Thu Dec 18 15:13:13 2003
-@@ -206,6 +206,7 @@
- -I$(top_srcdir)/bookmarks \
- $(GALEON_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -DDATADIR=\""$(datadir)"\"
-
-
diff --git a/www/galeon/files/patch-src_galeon-main.c b/www/galeon/files/patch-src_galeon-main.c
deleted file mode 100644
index 777907e0e2c6..000000000000
--- a/www/galeon/files/patch-src_galeon-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/galeon-main.c.orig Thu Sep 11 01:11:30 2003
-+++ src/galeon-main.c Thu Sep 11 01:12:31 2003
-@@ -130,7 +130,7 @@
- #ifdef ENABLE_NLS
- /* Initialize the i18n stuff */
- setlocale(LC_ALL, "");
-- bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale");
-+ bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
- textdomain(GETTEXT_PACKAGE);
- #endif
- /* set the application name manually until gnome handles the
diff --git a/www/galeon/files/patch-ui_Makefile.in b/www/galeon/files/patch-ui_Makefile.in
deleted file mode 100644
index 9e87b8029a20..000000000000
--- a/www/galeon/files/patch-ui_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ui/Makefile.in.orig Fri Jan 23 01:48:25 2004
-+++ ui/Makefile.in Fri Jan 23 01:48:55 2004
-@@ -265,8 +265,7 @@
- uidir = $(pkgdatadir)
-
- uixmldir = $(datadir)/gnome-2.0/ui
--uixml_in_files = galeon-bookmarks-editor-ui.xml.in \
-- nautilus-galeon-view-ui.xml.in
-+uixml_in_files = galeon-bookmarks-editor-ui.xml.in
-
-
- uixml_DATA = $(uixml_in_files:.xml.in=.xml)
diff --git a/www/galeon/pkg-descr b/www/galeon/pkg-descr
deleted file mode 100644
index 9a420538650d..000000000000
--- a/www/galeon/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Galeon is a GNOME 2 Web browser based on Gecko (the mozilla rendering engine).
-It's fast, it has a light interface, and it is fully standards-compliant.
-
-WWW: http://galeon.sourceforge.net/
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
deleted file mode 100644
index 21a4ba4f2390..000000000000
--- a/www/galeon/pkg-plist
+++ /dev/null
@@ -1,244 +0,0 @@
-bin/galeon
-bin/galeon-config-tool
-etc/sound/events/galeon.soundlist
-libdata/bonobo/servers/GNOME_Galeon_Automation.server
-libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/applications/galeon.desktop
-share/galeon/FAQ.html
-share/galeon/about_logo.png
-share/galeon/autoscroll.xpm
-share/galeon/bookmarks-editor-small.glade
-share/galeon/bookmarks-editor.glade
-share/galeon/bookmarks.glade
-share/galeon/bug.png
-share/galeon/certificate-dialogs.glade
-share/galeon/chrome/branding/brand.dtd
-share/galeon/chrome/branding/brand.properties
-share/galeon/chrome/galeon.manifest
-share/galeon/chrome/global/about.xhtml
-share/galeon/debian.png
-share/galeon/default-bookmarks.xbel
-share/galeon/default-prefs.js
-share/galeon/fetch_favicon.xpm
-share/galeon/freshmeat.png
-share/galeon/galeon-bookmark-alias-mark.png
-share/galeon/galeon-default.png
-share/galeon/galeon-download.png
-share/galeon/galeon-egg-ui-toolbar.xml
-share/galeon/galeon-egg-ui.xml
-share/galeon/galeon-entry.png
-share/galeon/galeon-filter.png
-share/galeon/galeon-folder.png
-share/galeon/galeon-history.png
-share/galeon/galeon-insecure.png
-share/galeon/galeon-popup-blocked.png
-share/galeon/galeon-prefs-fonts.png
-share/galeon/galeon-prefs-general.png
-share/galeon/galeon-prefs-language.png
-share/galeon/galeon-prefs-mouse.png
-share/galeon/galeon-prefs-network.png
-share/galeon/galeon-prefs-privacy.png
-share/galeon/galeon-prefs-tabs.png
-share/galeon/galeon-prefs-web-content.png
-share/galeon/galeon-secure.png
-share/galeon/galeon-separator.png
-share/galeon/galeon-tab-loading.gif
-share/galeon/galeon.glade
-share/galeon/galeon.png
-share/galeon/gnu.png
-share/galeon/google.png
-share/galeon/google_groups.png
-share/galeon/google_images.png
-share/galeon/hand-open.png
-share/galeon/imdb_movies.png
-share/galeon/logo.png
-share/galeon/myportal.css
-share/galeon/new_alias.xpm
-share/galeon/new_alias_small.xpm
-share/galeon/new_folder.xpm
-share/galeon/new_folder_small.xpm
-share/galeon/new_item.xpm
-share/galeon/new_item_small.xpm
-share/galeon/new_separator.xpm
-share/galeon/new_separator_small.xpm
-share/galeon/prefs-dialog.glade
-share/galeon/print.glade
-share/galeon/rpm.png
-share/galeon/slack.png
-share/galeon/smart-bm-fold.png
-share/galeon/smart-bm-unfold.png
-share/galeon/stocks.png
-share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
-share/gnome/help/galeon/C/apx-authors.xml
-share/gnome/help/galeon/C/apx-bugs.xml
-share/gnome/help/galeon/C/apx-command-line.xml
-share/gnome/help/galeon/C/apx-compiling.xml
-share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml
-share/gnome/help/galeon/C/apx-mouse-gestures.xml
-share/gnome/help/galeon/C/apx-troubleshooting.xml
-share/gnome/help/galeon/C/bookmarks.xml
-share/gnome/help/galeon/C/browser-window.xml
-share/gnome/help/galeon/C/figures/bookmarks-editor.png
-share/gnome/help/galeon/C/figures/browser-window.png
-share/gnome/help/galeon/C/figures/find-dialog.png
-share/gnome/help/galeon/C/figures/gesture-back.png
-share/gnome/help/galeon/C/figures/gesture-clone-tab.png
-share/gnome/help/galeon/C/figures/gesture-clone-window.png
-share/gnome/help/galeon/C/figures/gesture-close-2.png
-share/gnome/help/galeon/C/figures/gesture-close.png
-share/gnome/help/galeon/C/figures/gesture-contents.png
-share/gnome/help/galeon/C/figures/gesture-forward.png
-share/gnome/help/galeon/C/figures/gesture-fullscreen.png
-share/gnome/help/galeon/C/figures/gesture-homepage.png
-share/gnome/help/galeon/C/figures/gesture-new-tab.png
-share/gnome/help/galeon/C/figures/gesture-new-window.png
-share/gnome/help/galeon/C/figures/gesture-next-link.png
-share/gnome/help/galeon/C/figures/gesture-next-tab.png
-share/gnome/help/galeon/C/figures/gesture-prev-link.png
-share/gnome/help/galeon/C/figures/gesture-prev-tab.png
-share/gnome/help/galeon/C/figures/gesture-reload-bypass.png
-share/gnome/help/galeon/C/figures/gesture-reload.png
-share/gnome/help/galeon/C/figures/gesture-stop.png
-share/gnome/help/galeon/C/figures/gesture-up.png
-share/gnome/help/galeon/C/figures/gesture-view-source.png
-share/gnome/help/galeon/C/figures/othertools-history.png
-share/gnome/help/galeon/C/figures/othertools-pdm.png
-share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png
-share/gnome/help/galeon/C/figures/statusbar.png
-share/gnome/help/galeon/C/figures/tabbed-browsing.png
-share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
-share/gnome/help/galeon/C/figures/toolbars-main.png
-share/gnome/help/galeon/C/galeon.xml
-share/gnome/help/galeon/C/getting-started.xml
-share/gnome/help/galeon/C/other-tools.xml
-share/gnome/help/galeon/C/plugins.xml
-share/gnome/help/galeon/C/preface.xml
-share/gnome/help/galeon/C/preferences.xml
-share/gnome/help/galeon/es/apx-authors.xml
-share/gnome/help/galeon/es/apx-bugs.xml
-share/gnome/help/galeon/es/apx-command-line.xml
-share/gnome/help/galeon/es/apx-compiling.xml
-share/gnome/help/galeon/es/apx-keyboard-shortcuts.xml
-share/gnome/help/galeon/es/apx-mouse-gestures.xml
-share/gnome/help/galeon/es/apx-troubleshooting.xml
-share/gnome/help/galeon/es/bookmarks.xml
-share/gnome/help/galeon/es/browser-window.xml
-share/gnome/help/galeon/es/figures/bookmarks-editor.png
-share/gnome/help/galeon/es/figures/browser-window.png
-share/gnome/help/galeon/es/figures/find-dialog.png
-share/gnome/help/galeon/es/figures/gesture-back.png
-share/gnome/help/galeon/es/figures/gesture-clone-tab.png
-share/gnome/help/galeon/es/figures/gesture-clone-window.png
-share/gnome/help/galeon/es/figures/gesture-close-2.png
-share/gnome/help/galeon/es/figures/gesture-close.png
-share/gnome/help/galeon/es/figures/gesture-contents.png
-share/gnome/help/galeon/es/figures/gesture-forward.png
-share/gnome/help/galeon/es/figures/gesture-fullscreen.png
-share/gnome/help/galeon/es/figures/gesture-homepage.png
-share/gnome/help/galeon/es/figures/gesture-new-tab.png
-share/gnome/help/galeon/es/figures/gesture-new-window.png
-share/gnome/help/galeon/es/figures/gesture-next-link.png
-share/gnome/help/galeon/es/figures/gesture-next-tab.png
-share/gnome/help/galeon/es/figures/gesture-prev-link.png
-share/gnome/help/galeon/es/figures/gesture-prev-tab.png
-share/gnome/help/galeon/es/figures/gesture-reload-bypass.png
-share/gnome/help/galeon/es/figures/gesture-reload.png
-share/gnome/help/galeon/es/figures/gesture-stop.png
-share/gnome/help/galeon/es/figures/gesture-up.png
-share/gnome/help/galeon/es/figures/gesture-view-source.png
-share/gnome/help/galeon/es/figures/othertools-history.png
-share/gnome/help/galeon/es/figures/othertools-pdm.png
-share/gnome/help/galeon/es/figures/othertools-toolbar-editor.png
-share/gnome/help/galeon/es/figures/statusbar.png
-share/gnome/help/galeon/es/figures/tabbed-browsing.png
-share/gnome/help/galeon/es/figures/toolbars-bookmarks.png
-share/gnome/help/galeon/es/figures/toolbars-main.png
-share/gnome/help/galeon/es/galeon.xml
-share/gnome/help/galeon/es/getting-started.xml
-share/gnome/help/galeon/es/other-tools.xml
-share/gnome/help/galeon/es/plugins.xml
-share/gnome/help/galeon/es/preface.xml
-share/gnome/help/galeon/es/preferences.xml
-share/omf/galeon/galeon-C.omf
-share/omf/galeon/galeon-es.omf
-share/pixmaps/galeon.png
-share/sounds/galeon/clicked.wav
-share/locale/am/LC_MESSAGES/galeon-2.0.mo
-share/locale/ar/LC_MESSAGES/galeon-2.0.mo
-share/locale/az/LC_MESSAGES/galeon-2.0.mo
-share/locale/be/LC_MESSAGES/galeon-2.0.mo
-share/locale/bg/LC_MESSAGES/galeon-2.0.mo
-share/locale/bs/LC_MESSAGES/galeon-2.0.mo
-share/locale/ca/LC_MESSAGES/galeon-2.0.mo
-share/locale/cs/LC_MESSAGES/galeon-2.0.mo
-share/locale/da/LC_MESSAGES/galeon-2.0.mo
-share/locale/de/LC_MESSAGES/galeon-2.0.mo
-share/locale/dz/LC_MESSAGES/galeon-2.0.mo
-share/locale/el/LC_MESSAGES/galeon-2.0.mo
-share/locale/en_CA/LC_MESSAGES/galeon-2.0.mo
-share/locale/en_GB/LC_MESSAGES/galeon-2.0.mo
-share/locale/es/LC_MESSAGES/galeon-2.0.mo
-share/locale/et/LC_MESSAGES/galeon-2.0.mo
-share/locale/eu/LC_MESSAGES/galeon-2.0.mo
-share/locale/fi/LC_MESSAGES/galeon-2.0.mo
-share/locale/fr/LC_MESSAGES/galeon-2.0.mo
-share/locale/ga/LC_MESSAGES/galeon-2.0.mo
-share/locale/gl/LC_MESSAGES/galeon-2.0.mo
-share/locale/hr/LC_MESSAGES/galeon-2.0.mo
-share/locale/hu/LC_MESSAGES/galeon-2.0.mo
-share/locale/it/LC_MESSAGES/galeon-2.0.mo
-share/locale/ja/LC_MESSAGES/galeon-2.0.mo
-share/locale/ko/LC_MESSAGES/galeon-2.0.mo
-share/locale/lt/LC_MESSAGES/galeon-2.0.mo
-share/locale/lv/LC_MESSAGES/galeon-2.0.mo
-share/locale/mk/LC_MESSAGES/galeon-2.0.mo
-share/locale/ml/LC_MESSAGES/galeon-2.0.mo
-share/locale/mn/LC_MESSAGES/galeon-2.0.mo
-share/locale/ms/LC_MESSAGES/galeon-2.0.mo
-share/locale/nb/LC_MESSAGES/galeon-2.0.mo
-share/locale/nl/LC_MESSAGES/galeon-2.0.mo
-share/locale/nn/LC_MESSAGES/galeon-2.0.mo
-share/locale/oc/LC_MESSAGES/galeon-2.0.mo
-share/locale/pa/LC_MESSAGES/galeon-2.0.mo
-share/locale/pl/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
-share/locale/ro/LC_MESSAGES/galeon-2.0.mo
-share/locale/ru/LC_MESSAGES/galeon-2.0.mo
-share/locale/rw/LC_MESSAGES/galeon-2.0.mo
-share/locale/sk/LC_MESSAGES/galeon-2.0.mo
-share/locale/sl/LC_MESSAGES/galeon-2.0.mo
-share/locale/sq/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
-share/locale/sv/LC_MESSAGES/galeon-2.0.mo
-share/locale/ta/LC_MESSAGES/galeon-2.0.mo
-share/locale/tr/LC_MESSAGES/galeon-2.0.mo
-share/locale/uk/LC_MESSAGES/galeon-2.0.mo
-share/locale/vi/LC_MESSAGES/galeon-2.0.mo
-share/locale/wa/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/sounds/galeon
-@dirrm share/omf/galeon
-@dirrm share/gnome/help/galeon/es/figures
-@dirrm share/gnome/help/galeon/es
-@dirrm share/gnome/help/galeon/C/figures
-@dirrm share/gnome/help/galeon/C
-@dirrm share/gnome/help/galeon
-@dirrm share/galeon/chrome/global
-@dirrm share/galeon/chrome/branding
-@dirrm share/galeon/chrome
-@dirrm share/galeon
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/applications
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 3528bd5cb8e0..3f47df649814 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gnome-user-share/Makefile,v 1.14 2009/03/17 13:35:33 kwm Exp $
+# $MCom: ports/www/gnome-user-share/Makefile,v 1.17 2009/10/27 11:20:53 kwm Exp $
#
PORTNAME= gnome-user-share
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= www deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,14 +16,16 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Personal file-sharing service for the GNOME Desktop
LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app \
+ canberra.0:${PORTSDIR}/audio/libcanberra \
notify.1:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
+RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd \
+ console-kit-daemon:${PORTSDIR}/sysutils/consolekit
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_APACHE= 2.2+
-USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 gnomedocutils
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index e02044498cab..35fa78e70075 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-2.26.0.tar.bz2) = c99133b74a81a78ac0e4e10ef73fada7
-SHA256 (gnome2/gnome-user-share-2.26.0.tar.bz2) = 405be1ffbec4f865846746ab016e6816a58d9e2f2545fae48c31d4999c94d5f6
-SIZE (gnome2/gnome-user-share-2.26.0.tar.bz2) = 644020
+MD5 (gnome2/gnome-user-share-2.28.1.tar.bz2) = 4dde75de682805357af5995a748d6e4e
+SHA256 (gnome2/gnome-user-share-2.28.1.tar.bz2) = 4803ddedd77ce64ae25a85fcb04550b2589dc735baa4afd485618629700429bf
+SIZE (gnome2/gnome-user-share-2.28.1.tar.bz2) = 912102
diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure
new file mode 100644
index 000000000000..52ca647a5e2f
--- /dev/null
+++ b/www/gnome-user-share/files/patch-configure
@@ -0,0 +1,61 @@
+--- configure.orig 2009-10-27 12:12:48.000000000 +0100
++++ configure 2009-10-27 12:15:00.000000000 +0100
+@@ -15214,12 +15214,12 @@
+ pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
++ pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -15230,12 +15230,12 @@
+ pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
++ pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -15253,14 +15253,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>&1`
++ USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>&1`
+ else
+- USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>&1`
++ USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$USER_SHARE_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
+
+ $USER_SHARE_PKG_ERRORS
+
+@@ -15271,7 +15271,7 @@
+ and USER_SHARE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
++$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
+
+ $USER_SHARE_PKG_ERRORS
+
diff --git a/www/gnome-user-share/files/patch-src_user_share.c b/www/gnome-user-share/files/patch-src_user_share.c
new file mode 100644
index 000000000000..4305314fbdef
--- /dev/null
+++ b/www/gnome-user-share/files/patch-src_user_share.c
@@ -0,0 +1,48 @@
+--- src/user_share.c.orig 2009-09-26 09:10:16.000000000 -0400
++++ src/user_share.c 2009-09-26 09:13:52.000000000 -0400
+@@ -26,7 +26,9 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
++#ifndef __FreeBSD__
+ #include <bluetooth-client.h>
++#endif
+ #include <X11/Xlib.h>
+
+ #include "user_share.h"
+@@ -58,7 +60,9 @@
+ static guint disabled_timeout_tag = 0;
+ static gboolean has_console = TRUE;
+
++#ifndef __FreeBSD__
+ static BluetoothClient *client = NULL;
++#endif
+ static gboolean bluetoothd_enabled = FALSE;
+
+ #define OBEX_ENABLED (bluetoothd_enabled && has_console)
+@@ -224,6 +228,7 @@ consolekit_init (void)
+ dbus_g_connection_unref (dbus_connection);
+ }
+
++#ifndef __FreeBSD__
+ static void
+ default_adapter_changed (GObject *gobject,
+ GParamSpec *pspec,
+@@ -261,6 +266,7 @@ bluez_init (void)
+ g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
+ G_CALLBACK (default_adapter_changed), NULL);
+ }
++#endif
+
+ char *
+ lookup_public_dir (void)
+@@ -590,7 +596,9 @@ main (int argc, char **argv)
+
+ g_object_unref (client);
+
++#ifndef __FreeBSD__
+ bluez_init ();
++#endif
+ consolekit_init ();
+
+ /* Initial setting */
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 447088a2ca0b..9d64b7329e80 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -12,6 +12,18 @@ share/gnome/help/gnome-user-share/C/figures/sharing-over-bluetooth.png
share/gnome/help/gnome-user-share/C/figures/sharing-over-the-network.png
share/gnome/help/gnome-user-share/C/gnome-user-share.xml
share/gnome/help/gnome-user-share/C/legal.xml
+share/gnome/help/gnome-user-share/ca/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/ca/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/ca/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/ca/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/ca/gnome-user-share.xml
+share/gnome/help/gnome-user-share/ca/legal.xml
+share/gnome/help/gnome-user-share/cs/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/cs/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/cs/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/cs/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/cs/gnome-user-share.xml
+share/gnome/help/gnome-user-share/cs/legal.xml
share/gnome/help/gnome-user-share/de/figures/file-sharing-preferences.png
share/gnome/help/gnome-user-share/de/figures/receiving-over-bluetooth.png
share/gnome/help/gnome-user-share/de/figures/sharing-over-bluetooth.png
@@ -36,6 +48,12 @@ share/gnome/help/gnome-user-share/es/figures/sharing-over-bluetooth.png
share/gnome/help/gnome-user-share/es/figures/sharing-over-the-network.png
share/gnome/help/gnome-user-share/es/gnome-user-share.xml
share/gnome/help/gnome-user-share/es/legal.xml
+share/gnome/help/gnome-user-share/fr/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/fr/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/fr/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/fr/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/fr/gnome-user-share.xml
+share/gnome/help/gnome-user-share/fr/legal.xml
share/gnome/help/gnome-user-share/it/figures/file-sharing-preferences.png
share/gnome/help/gnome-user-share/it/figures/receiving-over-bluetooth.png
share/gnome/help/gnome-user-share/it/figures/sharing-over-bluetooth.png
@@ -48,6 +66,12 @@ share/gnome/help/gnome-user-share/sv/figures/sharing-over-bluetooth.png
share/gnome/help/gnome-user-share/sv/figures/sharing-over-the-network.png
share/gnome/help/gnome-user-share/sv/gnome-user-share.xml
share/gnome/help/gnome-user-share/sv/legal.xml
+share/gnome/help/gnome-user-share/zh_CN/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/zh_CN/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/zh_CN/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/zh_CN/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/zh_CN/gnome-user-share.xml
+share/gnome/help/gnome-user-share/zh_CN/legal.xml
share/icons/hicolor/16x16/apps/gnome-obex-server.png
share/icons/hicolor/22x22/apps/gnome-obex-server.png
share/icons/hicolor/32x32/apps/gnome-obex-server.png
@@ -55,8 +79,10 @@ share/icons/hicolor/48x48/apps/gnome-obex-server.png
share/locale/ar/LC_MESSAGES/gnome-user-share.mo
share/locale/as/LC_MESSAGES/gnome-user-share.mo
share/locale/bg/LC_MESSAGES/gnome-user-share.mo
+share/locale/bn/LC_MESSAGES/gnome-user-share.mo
share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo
share/locale/ca/LC_MESSAGES/gnome-user-share.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-user-share.mo
share/locale/cs/LC_MESSAGES/gnome-user-share.mo
share/locale/da/LC_MESSAGES/gnome-user-share.mo
share/locale/de/LC_MESSAGES/gnome-user-share.mo
@@ -66,8 +92,10 @@ share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo
share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo
share/locale/eu/LC_MESSAGES/gnome-user-share.mo
share/locale/es/LC_MESSAGES/gnome-user-share.mo
+share/locale/et/LC_MESSAGES/gnome-user-share.mo
share/locale/fi/LC_MESSAGES/gnome-user-share.mo
share/locale/fr/LC_MESSAGES/gnome-user-share.mo
+share/locale/ga/LC_MESSAGES/gnome-user-share.mo
share/locale/gl/LC_MESSAGES/gnome-user-share.mo
share/locale/gu/LC_MESSAGES/gnome-user-share.mo
share/locale/he/LC_MESSAGES/gnome-user-share.mo
@@ -75,8 +103,10 @@ share/locale/hi/LC_MESSAGES/gnome-user-share.mo
share/locale/hu/LC_MESSAGES/gnome-user-share.mo
share/locale/it/LC_MESSAGES/gnome-user-share.mo
share/locale/ja/LC_MESSAGES/gnome-user-share.mo
+share/locale/kn/LC_MESSAGES/gnome-user-share.mo
share/locale/ko/LC_MESSAGES/gnome-user-share.mo
share/locale/lt/LC_MESSAGES/gnome-user-share.mo
+share/locale/mai/LC_MESSAGES/gnome-user-share.mo
share/locale/mk/LC_MESSAGES/gnome-user-share.mo
share/locale/ml/LC_MESSAGES/gnome-user-share.mo
share/locale/mr/LC_MESSAGES/gnome-user-share.mo
@@ -95,6 +125,8 @@ share/locale/rw/LC_MESSAGES/gnome-user-share.mo
share/locale/sk/LC_MESSAGES/gnome-user-share.mo
share/locale/sl/LC_MESSAGES/gnome-user-share.mo
share/locale/sq/LC_MESSAGES/gnome-user-share.mo
+share/locale/sr/LC_MESSAGES/gnome-user-share.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-user-share.mo
share/locale/sv/LC_MESSAGES/gnome-user-share.mo
share/locale/ta/LC_MESSAGES/gnome-user-share.mo
share/locale/te/LC_MESSAGES/gnome-user-share.mo
@@ -106,17 +138,25 @@ share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo
share/locale/zh_HK/LC_MESSAGES/gnome-user-share.mo
share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo
share/omf/gnome-user-share/gnome-user-share-C.omf
+share/omf/gnome-user-share/gnome-user-share-ca.omf
+share/omf/gnome-user-share/gnome-user-share-cs.omf
share/omf/gnome-user-share/gnome-user-share-de.omf
share/omf/gnome-user-share/gnome-user-share-el.omf
share/omf/gnome-user-share/gnome-user-share-en_GB.omf
share/omf/gnome-user-share/gnome-user-share-es.omf
+share/omf/gnome-user-share/gnome-user-share-fr.omf
share/omf/gnome-user-share/gnome-user-share-it.omf
share/omf/gnome-user-share/gnome-user-share-sv.omf
+share/omf/gnome-user-share/gnome-user-share-zh_CN.omf
@dirrm share/omf/gnome-user-share
+@dirrm share/gnome/help/gnome-user-share/zh_CN/figures
+@dirrm share/gnome/help/gnome-user-share/zh_CN
@dirrm share/gnome/help/gnome-user-share/sv/figures
@dirrm share/gnome/help/gnome-user-share/sv
@dirrm share/gnome/help/gnome-user-share/it/figures
@dirrm share/gnome/help/gnome-user-share/it
+@dirrm share/gnome/help/gnome-user-share/fr/figures
+@dirrm share/gnome/help/gnome-user-share/fr
@dirrm share/gnome/help/gnome-user-share/es/figures
@dirrm share/gnome/help/gnome-user-share/es
@dirrm share/gnome/help/gnome-user-share/en_GB/figures
@@ -125,6 +165,10 @@ share/omf/gnome-user-share/gnome-user-share-sv.omf
@dirrm share/gnome/help/gnome-user-share/el
@dirrm share/gnome/help/gnome-user-share/de/figures
@dirrm share/gnome/help/gnome-user-share/de
+@dirrm share/gnome/help/gnome-user-share/cs/figures
+@dirrm share/gnome/help/gnome-user-share/cs
+@dirrm share/gnome/help/gnome-user-share/ca/figures
+@dirrm share/gnome/help/gnome-user-share/ca
@dirrm share/gnome/help/gnome-user-share/C/figures
@dirrm share/gnome/help/gnome-user-share/C
@dirrm share/gnome/help/gnome-user-share
@@ -134,14 +178,20 @@ share/omf/gnome-user-share/gnome-user-share-sv.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/as/LC_MESSAGES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 5beddfa0c5e4..05b02069e32e 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.7 2009/04/15 23:28:43 kwm Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.159 2009/10/18 04:03:22 marcus Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.26.3
-PORTREVISION= 1
+PORTVERSION= 3.28.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,16 +17,18 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight HTML rendering/printing/editing engine
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
enchant.1:${PORTSDIR}/textproc/enchant
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_GETTEXT= yes
USE_BZIP2= yes
USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack libglade2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -38,5 +39,7 @@ PLIST_SUB= VERSION="3.14"
post-patch:
@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
${WRKSRC}/intltool-merge.in
+ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 7ecafba5fda4..829cec97d508 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.26.3.tar.bz2) = 9a9586fa4581ad20f273952fb70e4101
-SHA256 (gnome2/gtkhtml-3.26.3.tar.bz2) = e700a1d57522d63987d27c1b4f0b1b3936a13471d61873c5f77c4535dbfd63eb
-SIZE (gnome2/gtkhtml-3.26.3.tar.bz2) = 1487455
+MD5 (gnome2/gtkhtml-3.28.1.tar.bz2) = 332bea8d39e1348c0f630a79146de5f6
+SHA256 (gnome2/gtkhtml-3.28.1.tar.bz2) = 7a39302134b405c2427b0b43afc06b6168074bfbd24bd4a9600d19fbc9aea084
+SIZE (gnome2/gtkhtml-3.28.1.tar.bz2) = 1335433
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 3c04f90bda86..520bc55ef52a 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -25,8 +25,8 @@ lib/libgtkhtml-editor.so
lib/libgtkhtml-editor.so.0
libdata/pkgconfig/gtkhtml-editor.pc
libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gtkhtml-%%VERSION%%/gtkhtml-editor.glade
-share/gtkhtml-%%VERSION%%/gtkhtml-editor.ui
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-builder.ui
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-manager.ui
share/gtkhtml-%%VERSION%%/icons/bulb.png
share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
share/gtkhtml-%%VERSION%%/icons/draft-paper.png
@@ -57,6 +57,7 @@ share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -153,6 +154,8 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/as/LC_MESSAGES
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 3935408baa8e..f0034a03eb69 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,29 +3,30 @@
# Whom: michael johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom: ports/www/kazehakase/Makefile,v 1.15 2008/08/06 04:22:50 mezz Exp $
+# $MCom: ports/www/kazehakase/Makefile,v 1.26 2009/10/22 22:10:49 kwm Exp $
#
PORTNAME= kazehakase
-PORTVERSION= 0.5.4
-PORTREVISION= 7
+PORTVERSION= 0.5.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/30219
+MASTER_SITE_SUBDIR= ${PORTNAME}/43802
MAINTAINER= ahze@FreeBSD.org
COMMENT= Kazehakase is a browser with gecko engine like Epiphany or Galeon
-LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls \
+ estraier.8:${PORTSDIR}/textproc/hyperestraier
USE_GNOME= gnomehack intlhack gnomeprefix gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_GECKO= seamonkey
+USE_GECKO= libxul seamonkey
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gecko_engine=${GECKO}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+ -I${LOCALBASE}/include/nspr" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
MAN1= kazehakase.1
OPTIONS= WEBKIT "Webkit Backend (along with Gecko)" On
@@ -39,7 +40,7 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
.include <bsd.port.pre.mk>
.if defined(WITH_WEBKIT)
-LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
PLIST_SUB+= WEBKIT=""
.else
PLIST_SUB+= WEBKIT="@comment "
@@ -57,24 +58,12 @@ CONFIGURE_ARGS+= --enable-migemo
.endif
.endif
-WITH_SEARCH?= hyperestraier
-.if ${WITH_SEARCH:L}=="rast"
-LIB_DEPENDS+= rast.1:${PORTSDIR}/textproc/rast
-CONFIGURE_ARGS+= --with-search-engine=rast
-.else
-LIB_DEPENDS+= estraier.8:${PORTSDIR}/textproc/hyperestraier
-CONFIGURE_ARGS+= --with-search-engine=hyperestraier
-.endif
-
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "Enable Migemo (Japanese incremental search) by defining WITH_MIGEMO"
@${ECHO_MSG} ""
@${ECHO_MSG} "Enable Thumbnail support by defining WITH_THUMBNAIL"
@${ECHO_MSG} ""
- @${ECHO_MSG} "By default the search uses hyperestraier but you can"
- @${ECHO_MSG} "use rast by using WITH_SEARCH=rast"
- @${ECHO_MSG} ""
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/migemo|${LOCALBASE}/share/migemo|; \
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 08778bd955ce..eded3d9e8892 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.5.4.tar.gz) = 75f8afb9ddf4493c3a1fb4eb38a044df
-SHA256 (kazehakase-0.5.4.tar.gz) = ce6ae61832d83242b298721be62fcfa61a046d8c16a00c2d224c9169fae51416
-SIZE (kazehakase-0.5.4.tar.gz) = 1403194
+MD5 (kazehakase-0.5.8.tar.gz) = 22d831982ebe010338907381caee8fdf
+SHA256 (kazehakase-0.5.8.tar.gz) = 1d461c56b3df86544d123d2a15484a156a6053c4fe2884d773a987d450406943
+SIZE (kazehakase-0.5.8.tar.gz) = 1433099
diff --git a/www/kazehakase/files/patch-src_net_kz-http.c b/www/kazehakase/files/patch-src_net_kz-http.c
new file mode 100644
index 000000000000..deb8e918b41f
--- /dev/null
+++ b/www/kazehakase/files/patch-src_net_kz-http.c
@@ -0,0 +1,11 @@
+--- src/net/kz-http.c.orig 2009-09-04 00:46:36.000000000 +0200
++++ src/net/kz-http.c 2009-09-04 00:46:49.000000000 +0200
+@@ -25,7 +25,7 @@
+ # include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#include <features.h>
++//#include <features.h>
+ #define __USE_XOPEN
+ #include <time.h>
+ #include "gnet.h"
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index 37e9d028f7ec..d27231a952ac 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -1,4 +1,5 @@
bin/kazehakase
+bin/kz-embed-process
etc/kazehakase/bookmarkbar.xml
etc/kazehakase/bookmarks.xml
etc/kazehakase/kz-ui-beginner.xml
@@ -14,6 +15,8 @@ lib/kazehakase/libkazehakase.so
lib/kazehakase/libkazehakase.so.1
lib/kazehakase/embed/gecko.la
lib/kazehakase/embed/gecko.so
+lib/kazehakase/embed/per_process.la
+lib/kazehakase/embed/per_process.so
%%WEBKIT%%lib/kazehakase/embed/webkit_gtk.la
%%WEBKIT%%lib/kazehakase/embed/webkit_gtk.so
lib/kazehakase/search/hyper-estraier.la
@@ -69,6 +72,7 @@ share/locale/cs/LC_MESSAGES/kazehakase.mo
share/locale/de/LC_MESSAGES/kazehakase.mo
share/locale/fr/LC_MESSAGES/kazehakase.mo
share/locale/ja/LC_MESSAGES/kazehakase.mo
+share/locale/nl/LC_MESSAGES/kazehakase.mo
share/locale/ru/LC_MESSAGES/kazehakase.mo
@dirrm share/kazehakase/icons
@dirrm share/kazehakase
diff --git a/www/midori/Makefile b/www/midori/Makefile
index ced3fda9a0ad..2d5c0f7931d1 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,14 +3,13 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/midori/Makefile,v 1.10 2008/12/31 03:30:21 mezz Exp $
+# $MCom: ports/www/midori/Makefile,v 1.19 2009/10/22 21:20:56 kwm Exp $
#
PORTNAME= midori
-PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= www
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= ahze@FreeBSD.org
COMMENT= Lightweight web browser using WebKit browser engine
@@ -35,7 +34,7 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
# WAF needs that
-CONFIGURE_ENV+= CC="${CC=gcc}"
+CONFIGURE_ENV+= CC=${CC}
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/www/midori/distinfo b/www/midori/distinfo
index d5aa5a28086d..2c2276146402 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,3 +1,3 @@
-MD5 (midori-0.1.2.tar.bz2) = 5169ead6783f374cedf3f89bf399bd75
-SHA256 (midori-0.1.2.tar.bz2) = a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
-SIZE (midori-0.1.2.tar.bz2) = 311182
+MD5 (midori-0.2.0.tar.bz2) = 805e2e59a93a0a4b7652d6547b2bd923
+SHA256 (midori-0.2.0.tar.bz2) = 97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
+SIZE (midori-0.2.0.tar.bz2) = 570091
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index a96b5b143d2b..639d57a8ba6e 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,7 +1,17 @@
bin/midori
+etc/xdg/midori/search
+lib/midori/libadblock.so
+lib/midori/libcolorful-tabs.so
+lib/midori/libcookie-manager.so
+lib/midori/libdnsprefetch.so
+lib/midori/libfeed-panel.so
+lib/midori/libformhistory.so
+lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
-lib/midori/libtab-panel.so
+lib/midori/libshortcuts.so
lib/midori/libstatusbar-features.so
+lib/midori/libtab-panel.so
+lib/midori/libtoolbar-editor.so
%%NLS%%share/applications/midori.desktop
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/ChangeLog
@@ -15,12 +25,18 @@ share/icons/hicolor/16x16/status/news-feed.png
share/icons/hicolor/22x22/apps/midori.png
share/icons/hicolor/22x22/categories/extension.png
share/icons/hicolor/22x22/status/news-feed.png
+share/icons/hicolor/24x24/apps/midori.png
+share/icons/hicolor/24x24/categories/extension.png
+share/icons/hicolor/24x24/status/news-feed.png
share/icons/hicolor/32x32/apps/midori.png
share/icons/hicolor/32x32/categories/extension.png
share/icons/hicolor/32x32/status/news-feed.png
share/icons/hicolor/48x48/apps/midori.png
share/icons/hicolor/48x48/categories/extension.png
share/icons/hicolor/48x48/status/news-feed.png
+%%NLS%%share/locale/ast/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo
%%NLS%%share/locale/da/LC_MESSAGES/midori.mo
%%NLS%%share/locale/de/LC_MESSAGES/midori.mo
%%NLS%%share/locale/el/LC_MESSAGES/midori.mo
@@ -30,18 +46,41 @@ share/icons/hicolor/48x48/status/news-feed.png
%%NLS%%share/locale/fi/LC_MESSAGES/midori.mo
%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/he/LC_MESSAGES/midori.mo
%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
%%NLS%%share/locale/id/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/it/LC_MESSAGES/midori.mo
%%NLS%%share/locale/ja/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo
%%NLS%%share/locale/nl/LC_MESSAGES/midori.mo
%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/midori.mo
%%NLS%%share/locale/ru/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/midori.mo
%%NLS%%share/locale/sv/LC_MESSAGES/midori.mo
%%NLS%%share/locale/tr/LC_MESSAGES/midori.mo
%%NLS%%share/locale/uk/LC_MESSAGES/midori.mo
-share/midori/logo-shade.png
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
+%%DATADIR%%/autosuggestcontrol.css
+%%DATADIR%%/autosuggestcontrol.js
+%%DATADIR%%/res/error.html
+%%DATADIR%%/res/logo-shade.png
+%%DATADIR%%/res/mootools.js
+%%DATADIR%%/res/speeddial-head.html
+%%DATADIR%%/res/speeddial.json
+@dirrm %%DATADIR%%/res
+@dirrm %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@latin
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
@dirrm lib/midori
-@dirrm share/midori
@dirrmtry share/applications
@dirrm %%DOCSDIR%%
+@dirrm etc/xdg/midori
+@dirrmtry etc/xdg
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index c4ef21215007..b00c2a29c223 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-WebKit
PORTVERSION= 0.04
-PORTREVISION= 1
+PORTREVISION= 6
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLORA
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 3ca4dd05bb4d..ad2f4c734c48 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,76 +3,91 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/webkit-gtk2/Makefile,v 1.23 2008/10/23 02:41:54 mezz Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.50 2009/11/28 17:35:07 kwm Exp $
#
PORTNAME= webkit
-PORTVERSION= 1.0.1
-PORTREVISION= 8
+PORTVERSION= 1.1.15.4
CATEGORIES= www
-MASTER_SITES= http://people.freedesktop.org/~alp/webkit/gtk/
+MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An opensource browser engine
+BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex
LIB_DEPENDS= icutu.38:${PORTSDIR}/devel/icu \
+ enchant.1:${PORTSDIR}/textproc/enchant \
curl.5:${PORTSDIR}/ftp/curl \
- sqlite3.8:${PORTSDIR}/databases/sqlite3
+ sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ soup-2.4.1:${PORTSDIR}/devel/libsoup
WANT_GSTREAMER= yes
+MAKE_JOBS_SAFE= yes
USE_XORG= xt
USE_BISON= build
USE_GMAKE= yes
-USE_GNOME= gtk20 libxslt
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gtk20 libxslt ltverhack:13
USE_PERL5= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:262 automake:110 libtool:22
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
+ ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
ac_cv_path_DOLT_BASH=""
-CONFIGURE_ARGS= --with-webkit-target=x11 \
- --enable-icon-database \
+CONFIGURE_ARGS= --enable-icon-database \
--enable-svg \
- --enable-svg-fonts \
- --enable-svg-experimental \
- --enable-static
+ --enable-svg-fonts
MAKEFILE= GNUmakefile
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
-OPTIONS= VIDEO "Enable video support" on
+OPTIONS= VIDEO "Enable video support" on \
+ DEBUG "Build with debug support" off \
+ STATIC "Enable building static library" off
.include <bsd.port.pre.mk>
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
-
.if defined(WITH_VIDEO)
-USE_GSTREAMER+= gnomevfs
+USE_GSTREAMER+= yes
CONFIGURE_ARGS+=--enable-video
.endif
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug
+.endif
+
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=--enable-static
+PLIST_SUB+= STATIC=""
+.else
+PLIST_SUB+= STATIC="@comment "
+.endif
+
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \
+ ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubs.cpp
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
${WRKSRC}/WebCore/plugins/PluginDatabase.cpp
- @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \
- s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \
- s|autoheader|${AUTOHEADER}|g ; \
- s|LIBTOOLIZE=libtoolize|LIBTOOLIZE=${LIBTOOLIZE}|g ; \
- s|$$srcdir/configure|#$$srcdir/configure|g' \
- ${WRKSRC}/autogen.sh
- @${FIND} ${WRKSRC} -name GNUmakefile.am | ${XARGS} ${REINPLACE_CMD} -e \
+ @${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
-pre-configure:
- @(cd ${WRKSRC} && ${SH} autogen.sh)
-
-post-install:
-# Install compat pkg-config file so we don't have to patch ports
- ${CP} ${PREFIX}/libdata/pkgconfig/webkit-1.0.pc \
- ${PREFIX}/libdata/pkgconfig/WebKitGtk.pc
+.if !defined(WITH_STATIC)
+ @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \
+ ${WRKDIR}/gnome-libtool
+.endif
+ @${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \
+ ${WRKSRC}/WebCore/dom/make_names.pl \
+ ${WRKSRC}/WebCore/css/make-css-file-arrays.pl \
+ ${WRKSRC}/WebCore/bindings/scripts/IDLParser.pm
.include <bsd.port.post.mk>
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index b36c0f022f15..412335d8ad21 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.0.1.tar.gz) = 4de68a5773998bea14e8939aa341c466
-SHA256 (webkit-1.0.1.tar.gz) = 9601ed57978e7f1221f770c24933d2037fdb93e4b412716d842b993507f0b856
-SIZE (webkit-1.0.1.tar.gz) = 13418752
+MD5 (webkit-1.1.15.4.tar.gz) = 47301fb7120421ac38bf714db8f5d428
+SHA256 (webkit-1.1.15.4.tar.gz) = ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
+SIZE (webkit-1.1.15.4.tar.gz) = 6093252
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
new file mode 100644
index 000000000000..dc03dce02dc1
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400
++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400
+@@ -69,7 +69,7 @@ public:
+
+ template<typename FunctionType>
+ explicit FunctionPtr(FunctionType* value)
+- : m_value(reinterpret_cast<void*>(value))
++ : m_value((void*)(value))
+ {
+ ASSERT_VALID_CODE_POINTER(m_value);
+ }
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp
new file mode 100644
index 000000000000..6e6ffe831486
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp
@@ -0,0 +1,20 @@
+--- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400
++++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500
+@@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo
+ emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
+ move(ImmPtr(&globalData->exceptionLocation), regT2);
+ storePtr(regT1, regT2);
+- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2);
+ emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
+ poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*));
+ restoreReturnAddressBeforeReturn(regT2);
+@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo
+ emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
+ move(ImmPtr(&globalData->exceptionLocation), regT2);
+ storePtr(regT1, regT2);
+- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2);
+ emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
+ poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*));
+ restoreReturnAddressBeforeReturn(regT2);
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h
new file mode 100644
index 000000000000..4d4a76bce3f0
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h
@@ -0,0 +1,65 @@
+--- JavaScriptCore/jit/JITStubCall.h.orig 2009-10-18 13:44:09.000000000 -0400
++++ JavaScriptCore/jit/JITStubCall.h 2009-10-18 13:45:53.000000000 -0400
+@@ -36,7 +36,7 @@ namespace JSC {
+ public:
+ JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Cell)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -44,7 +44,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Cell)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -52,7 +52,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(VoidPtr)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -60,7 +60,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Int)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -68,7 +68,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Int)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -76,7 +76,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Void)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -85,7 +85,7 @@ namespace JSC {
+ #if USE(JSVALUE32_64)
+ JITStubCall(JIT* jit, EncodedJSValue (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Value)
+ , m_stackIndex(stackIndexStart)
+ {
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp
new file mode 100644
index 000000000000..59229e8bc82e
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp
@@ -0,0 +1,11 @@
+--- JavaScriptCore/jit/JITStubs.cpp.orig 2009-10-19 15:13:27.000000000 -0400
++++ JavaScriptCore/jit/JITStubs.cpp 2009-10-19 15:13:46.000000000 -0400
+@@ -2672,7 +2672,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_
+
+ if (!handler) {
+ *stackFrame.exception = exceptionValue;
+- STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught));
++ STUB_SET_RETURN_ADDRESS((void*)(ctiOpThrowNotCaught));
+ return JSValue::encode(jsNull());
+ }
+
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h
new file mode 100644
index 000000000000..c46912d7aee8
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/yarr/RegexJIT.h.orig 2009-10-09 23:47:41.000000000 -0400
++++ JavaScriptCore/yarr/RegexJIT.h 2009-10-09 23:48:19.000000000 -0400
+@@ -73,7 +73,7 @@ public:
+
+ int execute(const UChar* input, unsigned start, unsigned length, int* output)
+ {
+- return reinterpret_cast<RegexJITCode>(m_ref.m_code.executableAddress())(input, start, length, output);
++ return ((RegexJITCode)m_ref.m_code.executableAddress())(input, start, length, output);
+ }
+
+ private:
diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in
new file mode 100644
index 000000000000..53333a520d38
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-GNUmakefile.in
@@ -0,0 +1,13 @@
+--- GNUmakefile.in.orig 2009-07-28 12:36:13.000000000 +0200
++++ GNUmakefile.in 2009-07-28 12:39:13.000000000 +0200
+@@ -8154,7 +8154,9 @@ libWebCoreJS_depfiles := $(patsubst \
+ webinspectordir = ${datadir}/webkit-1.0/webinspector
+ dist_webinspector_DATA = \
+ $(WebCore)/English.lproj/localizedStrings.js \
+- $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
++ $(shell ls $(WebCore)/inspector/front-end/*.js) \
++ $(shell ls $(WebCore)/inspector/front-end/*.html) \
++ $(shell ls $(WebCore)/inspector/front-end/*.css)
+
+ webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
+ dist_webinspectorimages_DATA = \
diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
new file mode 100644
index 000000000000..1b4d9eec188f
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/wtf/Platform.h.orig 2009-09-20 01:06:03.000000000 +0200
++++ JavaScriptCore/wtf/Platform.h 2009-09-21 22:01:16.000000000 +0200
+@@ -626,7 +626,7 @@
+ #endif
+
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
++#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD))
+ #define WTF_USE_JSVALUE64 1
+ #elif PLATFORM(ARM) || PLATFORM(PPC64)
+ #define WTF_USE_JSVALUE32 1
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
index 006b49709b38..1d41c7c8db1c 100644
--- a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
@@ -1,8 +1,8 @@
---- WebKit/gtk/webkit.pc.in.orig 2008-04-01 14:46:09.251210738 -0400
-+++ WebKit/gtk/webkit.pc.in 2008-04-01 14:46:21.218068816 -0400
-@@ -8,4 +8,4 @@
+--- WebKit/gtk/webkit.pc.in.orig 2009-05-13 20:55:10.000000000 +0800
++++ WebKit/gtk/webkit.pc.in 2009-05-19 15:09:51.000000000 +0800
+@@ -8,4 +8,4 @@ Description: Web content engine for GTK+
Version: @VERSION@
- Requires: gtk+-2.0
+ Requires: glib-2.0 gtk+-2.0 libsoup-2.4
Libs: -L${libdir} -lwebkit-1.0
-Cflags: -I${includedir}/webkit-1.0
+Cflags: -I${includedir}/webkit-1.0 -I${includedir}/webkit-1.0/webkit
diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
index ed0a5895fca9..2670c229d1b1 100644
--- a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
+++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
@@ -1,10 +1,10 @@
---- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700
-+++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700
-@@ -281,6 +281,7 @@
+--- WebCore/plugins/PluginDatabase.cpp.orig 2008-11-02 03:12:05.000000000 +0800
++++ WebCore/plugins/PluginDatabase.cpp 2009-05-19 15:09:51.000000000 +0800
+@@ -283,6 +283,7 @@ Vector<String> PluginDatabase::defaultPl
userPluginPath.append(String("/.netscape/plugins"));
paths.append(userPluginPath);
-+ paths.append("%%BROWSER_PLUGINS%%");
++ paths.append("%%BROWSER_PLUGINS_DIR%%");
paths.append("/usr/lib/browser/plugins");
paths.append("/usr/local/lib/mozilla/plugins");
paths.append("/usr/lib/firefox/plugins");
diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo
index 4bba0cc2a860..2c4293af518e 100644
--- a/www/webkit-gtk2/files/patch-cairo
+++ b/www/webkit-gtk2/files/patch-cairo
@@ -1,31 +1,11 @@
---- WebCore/platform/graphics/BitmapImage.cpp
-+++ WebCore/platform/graphics/BitmapImage.cpp
-@@ -203,7 +203,7 @@ float BitmapImage::frameDurationAtIndex(size_t index)
- bool BitmapImage::frameHasAlphaAtIndex(size_t index)
+--- WebCore/platform/graphics/BitmapImage.cpp.orig 2009-03-04 03:34:16.000000000 +0800
++++ WebCore/platform/graphics/BitmapImage.cpp 2009-05-19 15:09:51.000000000 +0800
+@@ -202,7 +202,7 @@ bool BitmapImage::isSizeAvailable()
+ NativeImagePtr BitmapImage::frameAtIndex(size_t index)
{
if (index >= frameCount())
- return 0;
-+ return true;
++ return NULL;
if (index >= m_frames.size() || !m_frames[index].m_frame)
cacheFrame(index);
---- WebCore/platform/graphics/cairo/ImageCairo.cpp
-+++ WebCore/platform/graphics/cairo/ImageCairo.cpp
-@@ -76,6 +76,7 @@ BitmapImage::BitmapImage(cairo_surface_t* surface, ImageObserver* observer)
-
- m_frames.grow(1);
- m_frames[0].m_frame = surface;
-+ m_frames[0].m_hasAlpha = cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR;
- checkForSolidColor();
- }
-
---- WebCore/platform/graphics/cg/ImageCG.cpp
-+++ WebCore/platform/graphics/cg/ImageCG.cpp
-@@ -87,6 +87,7 @@ BitmapImage::BitmapImage(CGImageRef cgImage, ImageObserver* observer)
-
- m_frames.grow(1);
- m_frames[0].m_frame = cgImage;
-+ m_frames[0].m_hasAlpha = true;
- checkForSolidColor();
- }
-
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
new file mode 100644
index 000000000000..08c05beeab7c
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2009-06-15 17:23:17.000000000 +0200
++++ configure 2009-06-15 20:19:44.000000000 +0200
+@@ -21204,7 +21204,7 @@ fi
+
+ if test "$enable_jit" = "yes"; then
+ case "$host_cpu" in
+- i*86|x86_64)
++ i*86|x86_64|amd64)
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_JIT 1
+@@ -21243,7 +21243,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+
+ ;;
+- x86_64)
++ x86_64|amd64)
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 85d72c47fc5b..3e9628ce253a 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -8,21 +8,248 @@ include/webkit-1.0/JavaScriptCore/JSStringRefCF.h
include/webkit-1.0/JavaScriptCore/JSValueRef.h
include/webkit-1.0/JavaScriptCore/JavaScript.h
include/webkit-1.0/JavaScriptCore/JavaScriptCore.h
+include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
include/webkit-1.0/webkit/webkit.h
include/webkit-1.0/webkit/webkitdefines.h
+include/webkit-1.0/webkit/webkitdownload.h
+include/webkit-1.0/webkit/webkitenumtypes.h
+include/webkit-1.0/webkit/webkiterror.h
+include/webkit-1.0/webkit/webkithittestresult.h
include/webkit-1.0/webkit/webkitnetworkrequest.h
+include/webkit-1.0/webkit/webkitnetworkresponse.h
+include/webkit-1.0/webkit/webkitsecurityorigin.h
+include/webkit-1.0/webkit/webkitsoupauthdialog.h
include/webkit-1.0/webkit/webkitversion.h
include/webkit-1.0/webkit/webkitwebbackforwardlist.h
+include/webkit-1.0/webkit/webkitwebdatabase.h
+include/webkit-1.0/webkit/webkitwebdatasource.h
include/webkit-1.0/webkit/webkitwebframe.h
include/webkit-1.0/webkit/webkitwebhistoryitem.h
+include/webkit-1.0/webkit/webkitwebinspector.h
+include/webkit-1.0/webkit/webkitwebnavigationaction.h
+include/webkit-1.0/webkit/webkitwebpolicydecision.h
+include/webkit-1.0/webkit/webkitwebresource.h
include/webkit-1.0/webkit/webkitwebsettings.h
include/webkit-1.0/webkit/webkitwebview.h
-lib/libwebkit-1.0.a
+include/webkit-1.0/webkit/webkitwebwindowfeatures.h
+%%STATIC%%lib/libwebkit-1.0.a
lib/libwebkit-1.0.la
lib/libwebkit-1.0.so
-lib/libwebkit-1.0.so.1
-libdata/pkgconfig/WebKitGtk.pc
+lib/libwebkit-1.0.so.13
libdata/pkgconfig/webkit-1.0.pc
+share/locale/de/LC_MESSAGES/webkit.mo
+share/locale/en_GB/LC_MESSAGES/webkit.mo
+share/locale/es/LC_MESSAGES/webkit.mo
+share/locale/it/LC_MESSAGES/webkit.mo
+share/locale/lt/LC_MESSAGES/webkit.mo
+share/locale/nl/LC_MESSAGES/webkit.mo
+share/locale/pt_BR/LC_MESSAGES/webkit.mo
+share/locale/ru/LC_MESSAGES/webkit.mo
+share/locale/sr/LC_MESSAGES/webkit.mo
+share/locale/sr@latin/LC_MESSAGES/webkit.mo
+share/locale/sv/LC_MESSAGES/webkit.mo
+share/locale/vi/LC_MESSAGES/webkit.mo
+share/locale/zh_CN/LC_MESSAGES/webkit.mo
+share/webkit-1.0/images/deleteButton.png
+share/webkit-1.0/images/missingImage.png
+share/webkit-1.0/images/nullPlugin.png
+share/webkit-1.0/images/panIcon.png
+share/webkit-1.0/images/textAreaResizeCorner.png
+share/webkit-1.0/images/urlIcon.png
+share/webkit-1.0/resources/error.html
+share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
+share/webkit-1.0/webinspector/Breakpoint.js
+share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
+share/webkit-1.0/webinspector/CallStackSidebarPane.js
+share/webkit-1.0/webinspector/Callback.js
+share/webkit-1.0/webinspector/ChangesView.js
+share/webkit-1.0/webinspector/Color.js
+share/webkit-1.0/webinspector/ConsoleView.js
+share/webkit-1.0/webinspector/CookieItemsView.js
+share/webkit-1.0/webinspector/DOMAgent.js
+share/webkit-1.0/webinspector/DOMStorage.js
+share/webkit-1.0/webinspector/DOMStorageDataGrid.js
+share/webkit-1.0/webinspector/DOMStorageItemsView.js
+share/webkit-1.0/webinspector/DataGrid.js
+share/webkit-1.0/webinspector/Database.js
+share/webkit-1.0/webinspector/DatabaseQueryView.js
+share/webkit-1.0/webinspector/DatabaseTableView.js
+share/webkit-1.0/webinspector/Drawer.js
+share/webkit-1.0/webinspector/ElementsPanel.js
+share/webkit-1.0/webinspector/ElementsTreeOutline.js
+share/webkit-1.0/webinspector/FontView.js
+share/webkit-1.0/webinspector/ImageView.js
+share/webkit-1.0/webinspector/Images/back.png
+share/webkit-1.0/webinspector/Images/checker.png
+share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png
+share/webkit-1.0/webinspector/Images/closeButtons.png
+share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png
+share/webkit-1.0/webinspector/Images/cookie.png
+share/webkit-1.0/webinspector/Images/database.png
+share/webkit-1.0/webinspector/Images/databaseTable.png
+share/webkit-1.0/webinspector/Images/debuggerContinue.png
+share/webkit-1.0/webinspector/Images/debuggerPause.png
+share/webkit-1.0/webinspector/Images/debuggerStepInto.png
+share/webkit-1.0/webinspector/Images/debuggerStepOut.png
+share/webkit-1.0/webinspector/Images/debuggerStepOver.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDown.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRight.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
+share/webkit-1.0/webinspector/Images/dockButtonGlyph.png
+share/webkit-1.0/webinspector/Images/elementsIcon.png
+share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png
+share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png
+share/webkit-1.0/webinspector/Images/errorIcon.png
+share/webkit-1.0/webinspector/Images/errorMediumIcon.png
+share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png
+share/webkit-1.0/webinspector/Images/focusButtonGlyph.png
+share/webkit-1.0/webinspector/Images/forward.png
+share/webkit-1.0/webinspector/Images/glossyHeader.png
+share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png
+share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png
+share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
+share/webkit-1.0/webinspector/Images/goArrow.png
+share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png
+share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png
+share/webkit-1.0/webinspector/Images/localStorage.png
+share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png
+share/webkit-1.0/webinspector/Images/paneBottomGrow.png
+share/webkit-1.0/webinspector/Images/paneBottomGrowActive.png
+share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png
+share/webkit-1.0/webinspector/Images/paneSettingsButtons.png
+share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png
+share/webkit-1.0/webinspector/Images/percentButtonGlyph.png
+share/webkit-1.0/webinspector/Images/profileGroupIcon.png
+share/webkit-1.0/webinspector/Images/profileIcon.png
+share/webkit-1.0/webinspector/Images/profileSmallIcon.png
+share/webkit-1.0/webinspector/Images/profilesIcon.png
+share/webkit-1.0/webinspector/Images/profilesSilhouette.png
+share/webkit-1.0/webinspector/Images/radioDot.png
+share/webkit-1.0/webinspector/Images/recordButtonGlyph.png
+share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png
+share/webkit-1.0/webinspector/Images/reloadButtonGlyph.png
+share/webkit-1.0/webinspector/Images/resourceCSSIcon.png
+share/webkit-1.0/webinspector/Images/resourceDocumentIcon.png
+share/webkit-1.0/webinspector/Images/resourceDocumentIconSmall.png
+share/webkit-1.0/webinspector/Images/resourceJSIcon.png
+share/webkit-1.0/webinspector/Images/resourcePlainIcon.png
+share/webkit-1.0/webinspector/Images/resourcePlainIconSmall.png
+share/webkit-1.0/webinspector/Images/resourcesIcon.png
+share/webkit-1.0/webinspector/Images/resourcesSilhouette.png
+share/webkit-1.0/webinspector/Images/resourcesSizeGraphIcon.png
+share/webkit-1.0/webinspector/Images/resourcesTimeGraphIcon.png
+share/webkit-1.0/webinspector/Images/scriptsIcon.png
+share/webkit-1.0/webinspector/Images/scriptsSilhouette.png
+share/webkit-1.0/webinspector/Images/searchSmallBlue.png
+share/webkit-1.0/webinspector/Images/searchSmallBrightBlue.png
+share/webkit-1.0/webinspector/Images/searchSmallGray.png
+share/webkit-1.0/webinspector/Images/searchSmallWhite.png
+share/webkit-1.0/webinspector/Images/segment.png
+share/webkit-1.0/webinspector/Images/segmentEnd.png
+share/webkit-1.0/webinspector/Images/segmentHover.png
+share/webkit-1.0/webinspector/Images/segmentHoverEnd.png
+share/webkit-1.0/webinspector/Images/segmentSelected.png
+share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png
+share/webkit-1.0/webinspector/Images/sessionStorage.png
+share/webkit-1.0/webinspector/Images/splitviewDimple.png
+share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png
+share/webkit-1.0/webinspector/Images/storageIcon.png
+share/webkit-1.0/webinspector/Images/statusbarBackground.png
+share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png
+share/webkit-1.0/webinspector/Images/statusbarButtons.png
+share/webkit-1.0/webinspector/Images/statusbarMenuButton.png
+share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png
+share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png
+share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png
+share/webkit-1.0/webinspector/Images/timelinePillBlue.png
+share/webkit-1.0/webinspector/Images/timelinePillGray.png
+share/webkit-1.0/webinspector/Images/timelinePillGreen.png
+share/webkit-1.0/webinspector/Images/timelinePillOrange.png
+share/webkit-1.0/webinspector/Images/timelinePillPurple.png
+share/webkit-1.0/webinspector/Images/timelinePillRed.png
+share/webkit-1.0/webinspector/Images/timelinePillYellow.png
+share/webkit-1.0/webinspector/Images/tipBalloon.png
+share/webkit-1.0/webinspector/Images/tipBalloonBottom.png
+share/webkit-1.0/webinspector/Images/tipIcon.png
+share/webkit-1.0/webinspector/Images/tipIconPressed.png
+share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
+share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
+share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeRightTriangleWhite.png
+share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
+share/webkit-1.0/webinspector/Images/undockButtonGlyph.png
+share/webkit-1.0/webinspector/Images/userInputIcon.png
+share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
+share/webkit-1.0/webinspector/Images/userInputResultIcon.png
+share/webkit-1.0/webinspector/Images/warningIcon.png
+share/webkit-1.0/webinspector/Images/warningMediumIcon.png
+share/webkit-1.0/webinspector/Images/warningsErrors.png
+share/webkit-1.0/webinspector/InjectedScript.js
+share/webkit-1.0/webinspector/InjectedScriptAccess.js
+share/webkit-1.0/webinspector/KeyboardShortcut.js
+share/webkit-1.0/webinspector/MetricsSidebarPane.js
+share/webkit-1.0/webinspector/Object.js
+share/webkit-1.0/webinspector/ObjectPropertiesSection.js
+share/webkit-1.0/webinspector/ObjectProxy.js
+share/webkit-1.0/webinspector/Panel.js
+share/webkit-1.0/webinspector/PanelEnablerView.js
+share/webkit-1.0/webinspector/Placard.js
+share/webkit-1.0/webinspector/Popup.js
+share/webkit-1.0/webinspector/ProfileDataGridTree.js
+share/webkit-1.0/webinspector/ProfileView.js
+share/webkit-1.0/webinspector/ProfilesPanel.js
+share/webkit-1.0/webinspector/PropertiesSection.js
+share/webkit-1.0/webinspector/PropertiesSidebarPane.js
+share/webkit-1.0/webinspector/Resource.js
+share/webkit-1.0/webinspector/ResourceCategory.js
+share/webkit-1.0/webinspector/ResourceView.js
+share/webkit-1.0/webinspector/ResourcesPanel.js
+share/webkit-1.0/webinspector/ScopeChainSidebarPane.js
+share/webkit-1.0/webinspector/Script.js
+share/webkit-1.0/webinspector/ScriptView.js
+share/webkit-1.0/webinspector/ScriptsPanel.js
+share/webkit-1.0/webinspector/SidebarPane.js
+share/webkit-1.0/webinspector/SidebarTreeElement.js
+share/webkit-1.0/webinspector/SourceFrame.js
+share/webkit-1.0/webinspector/SourceView.js
+share/webkit-1.0/webinspector/StatusBarButton.js
+share/webkit-1.0/webinspector/StoragePanel.js
+share/webkit-1.0/webinspector/StylesSidebarPane.js
+share/webkit-1.0/webinspector/SummaryBar.js
+share/webkit-1.0/webinspector/TextPrompt.js
+share/webkit-1.0/webinspector/TimelineAgent.js
+share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js
+share/webkit-1.0/webinspector/View.js
+share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js
+share/webkit-1.0/webinspector/inspector.css
+share/webkit-1.0/webinspector/inspector.html
+share/webkit-1.0/webinspector/inspector.js
+share/webkit-1.0/webinspector/localizedStrings.js
+share/webkit-1.0/webinspector/treeoutline.js
+share/webkit-1.0/webinspector/utilities.js
+@dirrm share/webkit-1.0/webinspector/Images
+@dirrm share/webkit-1.0/webinspector
+@dirrm share/webkit-1.0/resources
+@dirrm share/webkit-1.0/images
+@dirrm share/webkit-1.0
@dirrm include/webkit-1.0/webkit
@dirrm include/webkit-1.0/JavaScriptCore
@dirrm include/webkit-1.0
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
index baa5dca1f1bf..20f9c112f09a 100644
--- a/www/webkit-sharp/Makefile
+++ b/www/webkit-sharp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= webkit-sharp
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 5
#PORTEPOCH= 0
CATEGORIES= www
MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/