25 files changed, 202 insertions, 97 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index c2633f3571e8..64e51f1a2c01 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.105 2008/03/11 17:19:08 mezz Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.110 2008/10/21 01:27:34 kwm Exp $
 #
 
 PORTNAME=	epiphany-extensions
-PORTVERSION=	2.22.2
-PORTREVISION=	1
+PORTVERSION=	2.24.1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,7 +22,7 @@ RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GECKO=	firefox xulrunner
-USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget
+USE_GNOME=	gnomeprefix gnomehack intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -34,9 +33,9 @@ CONFIGURE_ARGS=	--with-mozilla=${GECKO}
 GCONF_SCHEMAS=	smart-bookmarks.schemas
 
 EPHY_EXTENSIONS=all,rss
-EPHY_VERSION=	2.22
+EPHY_VERSION=	${PORTVERSION:R}
 
-PLIST_SUB=	VERSION="2.22" EPHY_VERSION=${EPHY_VERSION}
+PLIST_SUB=	VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
 
 OPTIONS=	OPENSP "Enable OpenSP SGML support" off
 
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 38e3ada433f0..ecded60f346c 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.22.2.tar.bz2) = 9728577d63117275d8f12d529ecc866d
-SHA256 (gnome2/epiphany-extensions-2.22.2.tar.bz2) = de649d99d19c20d41d6c466ecbaa82a244679fcb0d2bf30ced8b340c4e2481d4
-SIZE (gnome2/epiphany-extensions-2.22.2.tar.bz2) = 947322
+MD5 (gnome2/epiphany-extensions-2.24.1.tar.bz2) = 2552ef6c4f059c0dd76a3a57b59aaa9a
+SHA256 (gnome2/epiphany-extensions-2.24.1.tar.bz2) = d7c8570c73fc9539c038d927be16b9310e4d2657f9ebe3751b36c01d412f6b74
+SIZE (gnome2/epiphany-extensions-2.24.1.tar.bz2) = 1023406
diff --git a/www/epiphany-webkit/Makefile b/www/epiphany-webkit/Makefile
index 3bdfbbb3e795..2be23b9e134c 100644
--- a/www/epiphany-webkit/Makefile
+++ b/www/epiphany-webkit/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/epiphany-webkit/Makefile,v 1.2 2008/02/24 22:10:56 ahze Exp $
+#    $MCom: ports/www/epiphany-webkit/Makefile,v 1.8 2008/06/18 18:40:49 marcus Exp $
 
 PORTVERSION=	0
 PKGNAMESUFFIX=	-webkit
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 7383a988d046..b758202eaa53 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/www/epiphany/Makefile,v 1.11 2008/08/06 04:20:12 mezz Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.188 2008/11/27 01:59:20 marcus Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.22.3
-PORTREVISION?=	1
+PORTVERSION=	2.24.2.1
+PORTREVISION?=	0
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -53,7 +53,7 @@ WITH_GNOME=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(EPHY_SLAVE) && ${EPHY_SLAVE}=="webkit"
-LIB_DEPENDS+=	WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
 CONFIGURE_ARGS+=	--with-engine=webkit
 EXTRA_CFLAGS+=	`pkg-config --cflags WebKitGtk` -I${LOCALBASE}/include/WebKit/webkit
 EXTRA_LIBS+=	`pkg-config --libs WebKitGtk`
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 776cfec5a29d..99e34c00e91b 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.22.3.tar.bz2) = 7d058b57cb3e992889e456848fcc89a9
-SHA256 (gnome2/epiphany-2.22.3.tar.bz2) = d61c4fe6cc351bab526d0973491f704db592a9e65d9fbf86c7a9607decb94215
-SIZE (gnome2/epiphany-2.22.3.tar.bz2) = 5718239
+MD5 (gnome2/epiphany-2.24.2.1.tar.bz2) = c4993233792e83b00df11feae950e201
+SHA256 (gnome2/epiphany-2.24.2.1.tar.bz2) = f2fd6df89671262043362b96cc30a90b678679dbfad9ed9724d528289e2a505a
+SIZE (gnome2/epiphany-2.24.2.1.tar.bz2) = 5724989
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 10c5e6f52a2d..51bc2d1fdb07 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -142,6 +142,11 @@ share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
+share/gnome/help/epiphany/cs/epiphany.xml
+share/gnome/help/epiphany/cs/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/cs/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/cs/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/cs/figures/ephy-screenshot.png
 share/gnome/help/epiphany/de/epiphany.xml
 share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -224,6 +229,7 @@ share/icons/hicolor/scalable/apps/gnome-web-browser.svg
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
 share/locale/as/LC_MESSAGES/epiphany.mo
+share/locale/ast/LC_MESSAGES/epiphany.mo
 share/locale/az/LC_MESSAGES/epiphany.mo
 share/locale/be/LC_MESSAGES/epiphany.mo
 share/locale/be@latin/LC_MESSAGES/epiphany.mo
@@ -289,7 +295,7 @@ share/locale/sk/LC_MESSAGES/epiphany.mo
 share/locale/sl/LC_MESSAGES/epiphany.mo
 share/locale/sq/LC_MESSAGES/epiphany.mo
 share/locale/sr/LC_MESSAGES/epiphany.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany.mo
+share/locale/sr@latin/LC_MESSAGES/epiphany.mo
 share/locale/sv/LC_MESSAGES/epiphany.mo
 share/locale/ta/LC_MESSAGES/epiphany.mo
 share/locale/te/LC_MESSAGES/epiphany.mo
@@ -305,6 +311,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 share/omf/epiphany/epiphany-C.omf
 share/omf/epiphany/epiphany-bg.omf
 share/omf/epiphany/epiphany-ca.omf
+share/omf/epiphany/epiphany-cs.omf
 share/omf/epiphany/epiphany-de.omf
 share/omf/epiphany/epiphany-el.omf
 share/omf/epiphany/epiphany-en_GB.omf
@@ -352,6 +359,8 @@ share/pygtk/2.0/defs/epiphany.defs
 @dirrm share/gnome/help/epiphany/el
 @dirrm share/gnome/help/epiphany/de/figures
 @dirrm share/gnome/help/epiphany/de
+@dirrm share/gnome/help/epiphany/cs/figures
+@dirrm share/gnome/help/epiphany/cs
 @dirrm share/gnome/help/epiphany/ca/figures
 @dirrm share/gnome/help/epiphany/ca
 @dirrm share/gnome/help/epiphany/bg/figures
@@ -401,6 +410,8 @@ share/pygtk/2.0/defs/epiphany.defs
 @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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -421,5 +432,7 @@ share/pygtk/2.0/defs/epiphany.defs
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 98c2e9cd46bb..55c46799ec61 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.54 2008/02/25 10:46:40 kwm Exp $
+#   $MCom: ports/www/evolution-webcal/Makefile,v 1.58 2008/09/23 15:37:03 kwm Exp $
 #
 
 PORTNAME=	evolution-webcal
-PORTVERSION=	2.21.92
-PORTREVISION=	3
+PORTVERSION=	2.24.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index d5c1ae16d141..cd6b33201b3e 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.21.92.tar.bz2) = 049ea414f6d82a1e4b1e88f71a4f19cb
-SHA256 (evolution-webcal-2.21.92.tar.bz2) = c583707d338edf7957a2f92804901569c9f6c1b2d16ba3682b92ba96fa300dca
-SIZE (evolution-webcal-2.21.92.tar.bz2) = 199394
+MD5 (evolution-webcal-2.24.0.tar.bz2) = 8030ebaefb18050c079a71dc23701d82
+SHA256 (evolution-webcal-2.24.0.tar.bz2) = 370278680634f65717df9cef98f9a731eb93d58d303f322be51d7b38b1ff29a9
+SIZE (evolution-webcal-2.24.0.tar.bz2) = 153766
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index a7beaebff5b2..f8b5a4ad950e 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -2,6 +2,7 @@ libexec/evolution-webcal
 share/locale/ar/LC_MESSAGES/evolution-webcal.mo
 share/locale/as/LC_MESSAGES/evolution-webcal.mo
 share/locale/az/LC_MESSAGES/evolution-webcal.mo
+share/locale/be@latin/LC_MESSAGES/evolution-webcal.mo
 share/locale/bg/LC_MESSAGES/evolution-webcal.mo
 share/locale/bn/LC_MESSAGES/evolution-webcal.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo
@@ -23,12 +24,15 @@ share/locale/fi/LC_MESSAGES/evolution-webcal.mo
 share/locale/fr/LC_MESSAGES/evolution-webcal.mo
 share/locale/gl/LC_MESSAGES/evolution-webcal.mo
 share/locale/gu/LC_MESSAGES/evolution-webcal.mo
+share/locale/he/LC_MESSAGES/evolution-webcal.mo
 share/locale/hi/LC_MESSAGES/evolution-webcal.mo
+share/locale/hr/LC_MESSAGES/evolution-webcal.mo
 share/locale/hu/LC_MESSAGES/evolution-webcal.mo
 share/locale/id/LC_MESSAGES/evolution-webcal.mo
 share/locale/it/LC_MESSAGES/evolution-webcal.mo
 share/locale/ja/LC_MESSAGES/evolution-webcal.mo
 share/locale/ka/LC_MESSAGES/evolution-webcal.mo
+share/locale/kn/LC_MESSAGES/evolution-webcal.mo
 share/locale/ko/LC_MESSAGES/evolution-webcal.mo
 share/locale/ku/LC_MESSAGES/evolution-webcal.mo
 share/locale/ky/LC_MESSAGES/evolution-webcal.mo
@@ -46,6 +50,7 @@ share/locale/oc/LC_MESSAGES/evolution-webcal.mo
 share/locale/or/LC_MESSAGES/evolution-webcal.mo
 share/locale/pa/LC_MESSAGES/evolution-webcal.mo
 share/locale/pl/LC_MESSAGES/evolution-webcal.mo
+share/locale/ps/LC_MESSAGES/evolution-webcal.mo
 share/locale/pt/LC_MESSAGES/evolution-webcal.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo
 share/locale/ro/LC_MESSAGES/evolution-webcal.mo
@@ -56,7 +61,7 @@ share/locale/sk/LC_MESSAGES/evolution-webcal.mo
 share/locale/sl/LC_MESSAGES/evolution-webcal.mo
 share/locale/sq/LC_MESSAGES/evolution-webcal.mo
 share/locale/sr/LC_MESSAGES/evolution-webcal.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-webcal.mo
 share/locale/sv/LC_MESSAGES/evolution-webcal.mo
 share/locale/ta/LC_MESSAGES/evolution-webcal.mo
 share/locale/te/LC_MESSAGES/evolution-webcal.mo
@@ -77,10 +82,14 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
 @dirrmtry share/locale/ug
 @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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -93,5 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index edbd9a572ffe..e5317039d254 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.124 2008/03/10 20:10:34 mezz Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.142 2008/11/25 01:16:48 marcus Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.18.3
+PORTVERSION=	3.24.2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,13 +17,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+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
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 0abb76ac7b0f..043beb3f494f 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.18.3.tar.bz2) = 4dae02a10f05fbca1cfd3bb5336f9273
-SHA256 (gnome2/gtkhtml-3.18.3.tar.bz2) = f4a07f292ed722da7c1b58daafcfd7f668ccb7293eca42e4c364a26cca50a02c
-SIZE (gnome2/gtkhtml-3.18.3.tar.bz2) = 1313556
+MD5 (gnome2/gtkhtml-3.24.2.tar.bz2) = d6b7471d2806d28d76b09b20f6ea86b0
+SHA256 (gnome2/gtkhtml-3.24.2.tar.bz2) = 62f5a5620aac9c2241e8e7cd18d81675827e776319dac33eb11bb85575c8eed8
+SIZE (gnome2/gtkhtml-3.24.2.tar.bz2) = 1438665
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index a084714f5c45..84f8e7ab0131 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -1,3 +1,10 @@
+bin/gtkhtml-editor-test
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-actions.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-common.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-widgets.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-spell-checker.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-spell-language.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
@@ -8,19 +15,18 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.a
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.la
-lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.la
 lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.19
-libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
+lib/libgtkhtml-editor.a
+lib/libgtkhtml-editor.la
+lib/libgtkhtml-editor.so
+lib/libgtkhtml-editor.so.0
+libdata/pkgconfig/gtkhtml-editor.pc
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gtkhtml-%%VERSION%%/Editor.idl
-share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/gtkhtml-editor.glade
+share/gtkhtml-%%VERSION%%/gtkhtml-editor.ui
 share/gtkhtml-%%VERSION%%/icons/bulb.png
 share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
 share/gtkhtml-%%VERSION%%/icons/draft-paper.png
@@ -76,6 +82,7 @@ share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -104,9 +111,10 @@ share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sr@latin/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -117,13 +125,17 @@ share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 @dirrm share/gtkhtml-%%VERSION%%/icons
 @dirrm share/gtkhtml-%%VERSION%%
-@dirrmtry lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
+@dirrm include/libgtkhtml-%%VERSION%%/editor
 @dirrm include/libgtkhtml-%%VERSION%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 96f275485d97..d88e904d4278 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml38/Makefile,v 1.106 2008/01/29 01:43:06 marcus Exp $
+#   $MCom: ports/www/gtkhtml38/Makefile,v 1.108 2008/08/23 18:23:00 mezz Exp $
 #
 
 PORTNAME=	gtkhtml3
@@ -26,7 +26,7 @@ DEPRECATED=	Older API; newer applications should use www/gtkhtml3
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui ltverhack \
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack \
 		libgnomeprintui
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index fad5be442a55..546a1f3ad8dc 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,12 +3,12 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#   $MCom: ports/www/kazehakase/Makefile,v 1.9 2007/10/24 16:17:14 ahze Exp $
+#   $MCom: ports/www/kazehakase/Makefile,v 1.15 2008/08/06 04:22:50 mezz Exp $
 #
 
 PORTNAME=	kazehakase
 PORTVERSION=	0.5.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/30219
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GECKO=	firefox mozilla seamonkey xulrunner seamonkey
+USE_GECKO=	firefox mozilla seamonkey xulrunner
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gecko_engine=${GECKO}
@@ -40,7 +40,7 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 .if defined(WITH_WEBKIT)
-LIB_DEPENDS+=	WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
 PLIST_SUB+=	WEBKIT=""
 .else
 PLIST_SUB+=	WEBKIT="@comment "
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 3fb7fbe08777..8eafcfbeaad7 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/libgtkhtml/Makefile,v 1.39 2006/09/10 00:51:14 mezz Exp $
+#   $MCom: ports/www/libgtkhtml/Makefile,v 1.41 2008/08/23 18:23:00 mezz Exp $
 #
 
 PORTNAME=	libgtkhtml
@@ -19,7 +19,7 @@ COMMENT=	Lightweight HTML rendering/printing/editing engine
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack
+USE_GNOME=	gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/midori/Makefile b/www/midori/Makefile
index a4a52945dd7d..ce9444e4ea0d 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,17 +3,19 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/midori/Makefile,v 1.3 2008/03/21 18:31:39 ahze Exp $
+#   $MCom: ports/www/midori/Makefile,v 1.10 2008/12/31 03:30:21 mezz Exp $
+#
 
 PORTNAME=	midori
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Lightweight web browser using WebKit browser engine
 
-LIB_DEPENDS=	WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		rsvg-convert:${PORTSDIR}/graphics/librsvg2
 
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index af9a85317e91..083b5408376b 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	swfdec-plugin
-PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTVERSION=	0.8.2
 CATEGORIES=	www
-MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.6/
+MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
 DISTNAME=	swfdec-mozilla-${PORTVERSION}
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Flash rendering plugin
 
-LIB_DEPENDS=	swfdec-0.6:${PORTSDIR}/graphics/swfdec
+LIB_DEPENDS=	swfdec-0.8:${PORTSDIR}/graphics/swfdec
 
 USE_AUTOTOOLS=	libtool:15
+INSTALLS_ICONS=	yes
+USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--with-plugin-dir="${WEBPLUGINS_DIR}"
 
 USE_LDCONFIG=	yes
diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo
index 41b0a0096e9a..a2e080ce8c78 100644
--- a/www/swfdec-plugin/distinfo
+++ b/www/swfdec-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (swfdec-mozilla-0.6.0.tar.gz) = dc0fb84b5e5c7540ae1231eb04109f0e
-SHA256 (swfdec-mozilla-0.6.0.tar.gz) = 05e93b4343998afd24b0ba879e25ef4f08c87af6afb51fb0cc5a0362c3feff34
-SIZE (swfdec-mozilla-0.6.0.tar.gz) = 399937
+MD5 (swfdec-mozilla-0.8.2.tar.gz) = 716632e0d35b3c1582c180569ba30346
+SHA256 (swfdec-mozilla-0.8.2.tar.gz) = 49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5
+SIZE (swfdec-mozilla-0.8.2.tar.gz) = 381148
diff --git a/www/swfdec-plugin/pkg-plist b/www/swfdec-plugin/pkg-plist
index ffed0eed5a40..02ca9225c4cb 100644
--- a/www/swfdec-plugin/pkg-plist
+++ b/www/swfdec-plugin/pkg-plist
@@ -1,4 +1,10 @@
 %%WEBPLUGINS_DIR%%/libswfdecmozilla.a
 %%WEBPLUGINS_DIR%%/libswfdecmozilla.la
 %%WEBPLUGINS_DIR%%/libswfdecmozilla.so
+share/icons/hicolor/16x16/apps/swfdec-mozilla.png
+share/icons/hicolor/22x22/apps/swfdec-mozilla.png
+share/icons/hicolor/24x24/apps/swfdec-mozilla.png
+share/icons/hicolor/32x32/apps/swfdec-mozilla.png
+share/icons/hicolor/48x48/apps/swfdec-mozilla.png
+share/icons/hicolor/scalable/apps/swfdec-mozilla.svg
 @dirrmtry %%WEBPLUGINS_DIR%%
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index f57de73b67aa..e703e03cbde4 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,16 +3,15 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.5 2008/03/24 01:51:52 mezz Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.23 2008/10/23 02:41:54 mezz Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	0.0.30549
-PORTREVISION=	1
+PORTVERSION=	1.0.1
+PORTREVISION=	4
 CATEGORIES=	www
-MASTER_SITES=	http://nightly.webkit.org/files/trunk/src/
+MASTER_SITES=	http://people.freedesktop.org/~alp/webkit/gtk/
 PKGNAMESUFFIX=	-gtk2
-DISTNAME=	WebKit-r${PORTVERSION:S/0.0.//}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An opensource browser engine
@@ -21,29 +20,38 @@ LIB_DEPENDS=	icutu.38:${PORTSDIR}/devel/icu \
 		curl.4:${PORTSDIR}/ftp/curl \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
+WANT_GSTREAMER=	yes
+USE_XORG=	xt
 USE_BISON=	build
-USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 libxslt
+USE_GNOME=	gtk20 libxslt
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf:262 automake:110 libtool:15
-USE_GSTREAMER=	gnomevfs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-webkit-target=x11 \
 		--enable-icon-database \
 		--enable-svg \
-		--enable-video
+		--enable-svg-fonts \
+		--enable-svg-experimental
 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
+
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
+.if defined(WITH_VIDEO)
+USE_GSTREAMER+=	gnomevfs
+CONFIGURE_ARGS+=--enable-video
 .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 ; \
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index b91ff2311761..b36c0f022f15 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (WebKit-r30549.tar.bz2) = 081ce2cb23cf564454bfc5a3d627a4bb
-SHA256 (WebKit-r30549.tar.bz2) = 7c9b9607fcb0909298c5d4c3ec47040082db139a28aca2547b2f657afe98b6cd
-SIZE (WebKit-r30549.tar.bz2) = 8573000
+MD5 (webkit-1.0.1.tar.gz) = 4de68a5773998bea14e8939aa341c466
+SHA256 (webkit-1.0.1.tar.gz) = 9601ed57978e7f1221f770c24933d2037fdb93e4b412716d842b993507f0b856
+SIZE (webkit-1.0.1.tar.gz) = 13418752
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
new file mode 100644
index 000000000000..006b49709b38
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
@@ -0,0 +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 @@
+ Version: @VERSION@
+ Requires: gtk+-2.0
+ 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
new file mode 100644
index 000000000000..ed0a5895fca9
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
@@ -0,0 +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 @@
+     userPluginPath.append(String("/.netscape/plugins"));
+     paths.append(userPluginPath);
+ 
++    paths.append("%%BROWSER_PLUGINS%%");
+     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
new file mode 100644
index 000000000000..4bba0cc2a860
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-cairo
@@ -0,0 +1,31 @@
+--- 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)
+ {
+     if (index >= frameCount())
+-        return 0;
++        return true;
+ 
+     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/pkg-plist b/www/webkit-gtk2/pkg-plist
index 71b65eff0f6a..85d72c47fc5b 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -1,26 +1,28 @@
-include/WebKit/JavaScriptCore/JSBase.h
-include/WebKit/JavaScriptCore/JSContextRef.h
-include/WebKit/JavaScriptCore/JSObjectRef.h
-include/WebKit/JavaScriptCore/JSStringRef.h
-include/WebKit/JavaScriptCore/JSStringRefBSTR.h
-include/WebKit/JavaScriptCore/JSStringRefCF.h
-include/WebKit/JavaScriptCore/JSValueRef.h
-include/WebKit/JavaScriptCore/JavaScript.h
-include/WebKit/JavaScriptCore/JavaScriptCore.h
-include/WebKit/webkit/webkit.h
-include/WebKit/webkit/webkitdefines.h
-include/WebKit/webkit/webkitnetworkrequest.h
-include/WebKit/webkit/webkitwebbackforwardlist.h
-include/WebKit/webkit/webkitwebframe.h
-include/WebKit/webkit/webkitwebhistoryitem.h
-include/WebKit/webkit/webkitwebsettings.h
-include/WebKit/webkit/webkitwebview.h
-lib/libWebKitGtk.a
-lib/libWebKitGtk.la
-lib/libWebKitGtk.so
-lib/libWebKitGtk.so.1
+bin/jsc
+include/webkit-1.0/JavaScriptCore/JSBase.h
+include/webkit-1.0/JavaScriptCore/JSContextRef.h
+include/webkit-1.0/JavaScriptCore/JSObjectRef.h
+include/webkit-1.0/JavaScriptCore/JSStringRef.h
+include/webkit-1.0/JavaScriptCore/JSStringRefBSTR.h
+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/webkit/webkit.h
+include/webkit-1.0/webkit/webkitdefines.h
+include/webkit-1.0/webkit/webkitnetworkrequest.h
+include/webkit-1.0/webkit/webkitversion.h
+include/webkit-1.0/webkit/webkitwebbackforwardlist.h
+include/webkit-1.0/webkit/webkitwebframe.h
+include/webkit-1.0/webkit/webkitwebhistoryitem.h
+include/webkit-1.0/webkit/webkitwebsettings.h
+include/webkit-1.0/webkit/webkitwebview.h
+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
 libdata/pkgconfig/webkit-1.0.pc
-@dirrm include/WebKit/webkit
-@dirrm include/WebKit/JavaScriptCore
-@dirrm include/WebKit
+@dirrm include/webkit-1.0/webkit
+@dirrm include/webkit-1.0/JavaScriptCore
+@dirrm include/webkit-1.0