Update to 1.3.2.

Gtk2 version and a Gtk3 version. Only thing I changed is a local patch
to the locale files so they are parrallel installable. So if you notice
problems with translation, let me know.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14294 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 48 insertions, 41 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index a54c72562..a8c6ec199 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.62 2010/05/29 15:58:17 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
@@ -16,13 +16,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An opensource browser engine
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
+		${LOCALBASE}/bin/gperf:${PORSTDIR}/devel/gperf
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
 		curl.6:${PORTSDIR}/ftp/curl \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
 
 WANT_GSTREAMER=	yes
 MAKE_JOBS_SAFE=	yes
@@ -37,11 +35,12 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
+		ac_cv_path_GPERF="${LOCALBASE}/bin/gperf" \
 		ac_cv_path_DOLT_BASH=""
 CONFIGURE_ARGS=	--enable-icon-database \
 		--enable-svg \
 		--enable-svg-fonts \
-		--enable-introspection
+		--with-gtk=2.0
 MAKEFILE=	GNUmakefile
 
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
@@ -89,6 +88,12 @@ BROKEN=		does not compile on 6.X
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
 		${WRKSRC}/WebCore/plugins/PluginDatabase.cpp
+	@${REINPLACE_CMD} -e 's|"gperf|"${LOCALBASE}/bin/gperf|g' \
+		${WRKSRC}/WebCore/make-hash-tools.pl \
+		${WRKSRC}/WebCore/css/makevalues.pl \
+		${WRKSRC}/WebCore/css/makeprop.pl
+	@${REINPLACE_CMD} -e 's|GETTEXT_PACKAGE=$$PACKAGE|GETTEXT_PACKAGE=$$PACKAGE-1.0|g' \
+		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 .if !defined(WITH_STATIC)
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 13b446d59..6d4c1dca0 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.3.1.tar.gz) = 14839906068ae173c0f89b44779f18e1
-SHA256 (webkit-1.3.1.tar.gz) = 982e2dcc73c1f68f2bf88f5e4f2f88ad2e9e9eea3c12cc7019f081cab28bcbe9
-SIZE (webkit-1.3.1.tar.gz) = 7463827
+MD5 (webkit-1.3.2.tar.gz) = 8736b933d059288cdff9f9be64358954
+SHA256 (webkit-1.3.2.tar.gz) = b0f265a1f339f19855572ac6e18a2c1f6aee596cf7c5f70fd3ea00b8e86901a6
+SIZE (webkit-1.3.2.tar.gz) = 7804332
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 95ac724e3..127024e5e 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -1,4 +1,4 @@
-bin/jsc
+bin/jsc-1
 include/webkit-1.0/JavaScriptCore/JSBase.h
 include/webkit-1.0/JavaScriptCore/JSContextRef.h
 include/webkit-1.0/JavaScriptCore/JSObjectRef.h
@@ -100,6 +100,7 @@ include/webkit-1.0/webkit/WebKitDOMHTMLUListElement.h
 include/webkit-1.0/webkit/WebKitDOMHistory.h
 include/webkit-1.0/webkit/WebKitDOMLocation.h
 include/webkit-1.0/webkit/WebKitDOMMediaList.h
+include/webkit-1.0/webkit/WebKitDOMMemoryInfo.h
 include/webkit-1.0/webkit/WebKitDOMMessagePort.h
 include/webkit-1.0/webkit/WebKitDOMMimeType.h
 include/webkit-1.0/webkit/WebKitDOMMimeTypeArray.h
@@ -152,37 +153,34 @@ include/webkit-1.0/webkit/webkitwebresource.h
 include/webkit-1.0/webkit/webkitwebsettings.h
 include/webkit-1.0/webkit/webkitwebview.h
 include/webkit-1.0/webkit/webkitwebwindowfeatures.h
-%%STATIC%%lib/libwebkit-1.0.a
-lib/girepository-1.0/JSCore-1.0.typelib
-lib/girepository-1.0/WebKit-1.0.typelib
-lib/libwebkit-1.0.la
-lib/libwebkit-1.0.so
-lib/libwebkit-1.0.so.13
+%%STATIC%%lib/libwebkitgtk-1.0.a
+lib/libwebkitgtk-1.0.la
+lib/libwebkitgtk-1.0.so
+lib/libwebkitgtk-1.0.so.13
 libdata/pkgconfig/webkit-1.0.pc
-share/gir-1.0/JSCore-1.0.gir
-share/gir-1.0/WebKit-1.0.gir
-share/locale/cs/LC_MESSAGES/webkit.mo
-share/locale/de/LC_MESSAGES/webkit.mo
-share/locale/en_GB/LC_MESSAGES/webkit.mo
-share/locale/es/LC_MESSAGES/webkit.mo
-share/locale/et/LC_MESSAGES/webkit.mo
-share/locale/gu/LC_MESSAGES/webkit.mo
-share/locale/he/LC_MESSAGES/webkit.mo
-share/locale/it/LC_MESSAGES/webkit.mo
-share/locale/lt/LC_MESSAGES/webkit.mo
-share/locale/lv/LC_MESSAGES/webkit.mo
-share/locale/nl/LC_MESSAGES/webkit.mo
-share/locale/pa/LC_MESSAGES/webkit.mo
-share/locale/pt/LC_MESSAGES/webkit.mo
-share/locale/pt_BR/LC_MESSAGES/webkit.mo
-share/locale/ru/LC_MESSAGES/webkit.mo
-share/locale/sl/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/uk/LC_MESSAGES/webkit.mo
-share/locale/vi/LC_MESSAGES/webkit.mo
-share/locale/zh_CN/LC_MESSAGES/webkit.mo
+share/locale/cs/LC_MESSAGES/webkit-1.0.mo
+share/locale/de/LC_MESSAGES/webkit-1.0.mo
+share/locale/en_GB/LC_MESSAGES/webkit-1.0.mo
+share/locale/es/LC_MESSAGES/webkit-1.0.mo
+share/locale/et/LC_MESSAGES/webkit-1.0.mo
+share/locale/gl/LC_MESSAGES/webkit-1.0.mo
+share/locale/gu/LC_MESSAGES/webkit-1.0.mo
+share/locale/he/LC_MESSAGES/webkit-1.0.mo
+share/locale/it/LC_MESSAGES/webkit-1.0.mo
+share/locale/lt/LC_MESSAGES/webkit-1.0.mo
+share/locale/lv/LC_MESSAGES/webkit-1.0.mo
+share/locale/nl/LC_MESSAGES/webkit-1.0.mo
+share/locale/pa/LC_MESSAGES/webkit-1.0.mo
+share/locale/pt/LC_MESSAGES/webkit-1.0.mo
+share/locale/pt_BR/LC_MESSAGES/webkit-1.0.mo
+share/locale/ru/LC_MESSAGES/webkit-1.0.mo
+share/locale/sl/LC_MESSAGES/webkit-1.0.mo
+share/locale/sr/LC_MESSAGES/webkit-1.0.mo
+share/locale/sr@latin/LC_MESSAGES/webkit-1.0.mo
+share/locale/sv/LC_MESSAGES/webkit-1.0.mo
+share/locale/uk/LC_MESSAGES/webkit-1.0.mo
+share/locale/vi/LC_MESSAGES/webkit-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/webkit-1.0.mo
 share/webkit-1.0/images/deleteButton.png
 share/webkit-1.0/images/missingImage.png
 share/webkit-1.0/images/nullPlugin.png
@@ -197,8 +195,10 @@ share/webkit-1.0/webinspector/AuditResultView.js
 share/webkit-1.0/webinspector/AuditRules.js
 share/webkit-1.0/webinspector/AuditsPanel.js
 share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
-share/webkit-1.0/webinspector/Breakpoint.js
+share/webkit-1.0/webinspector/BreakpointManager.js
 share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
+share/webkit-1.0/webinspector/CSSCompletions.js
+share/webkit-1.0/webinspector/CSSStyleModel.js
 share/webkit-1.0/webinspector/CallStackSidebarPane.js
 share/webkit-1.0/webinspector/Callback.js
 share/webkit-1.0/webinspector/ChangesView.js
@@ -221,6 +221,7 @@ share/webkit-1.0/webinspector/ElementsPanel.js
 share/webkit-1.0/webinspector/ElementsTreeOutline.js
 share/webkit-1.0/webinspector/EventListenersSidebarPane.js
 share/webkit-1.0/webinspector/FontView.js
+share/webkit-1.0/webinspector/HAREntry.js
 share/webkit-1.0/webinspector/HelpScreen.js
 share/webkit-1.0/webinspector/ImageView.js
 share/webkit-1.0/webinspector/Images/auditsIcon.png
@@ -418,6 +419,7 @@ 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/TabbedPane.js
 share/webkit-1.0/webinspector/TestController.js
 share/webkit-1.0/webinspector/TextEditorHighlighter.js
 share/webkit-1.0/webinspector/TextEditorModel.js