Update to 1.1.7.

Submitted by:	Eric L. Chen <d9364104@mail.nchu.edu.tw>


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

8 files changed, 51 insertions, 17 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 634c580b2..e8878490b 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.27 2009/05/11 15:25:58 kwm Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.28 2009/05/13 22:43:01 marcus Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	1.1.7
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index 3adcf0217..c5184d503 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.1.6.tar.gz) = b311337561507b485fc2172cec7c2266
-SHA256 (webkit-1.1.6.tar.gz) = 7cec3bd99fb66f434bbe6dd3a17acfcaf9bef1aac10dc833877f66443abb05ce
-SIZE (webkit-1.1.6.tar.gz) = 6068467
+MD5 (webkit-1.1.7.tar.gz) = f681773e29898509741cd3bc293816f4
+SHA256 (webkit-1.1.7.tar.gz) = 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
+SIZE (webkit-1.1.7.tar.gz) = 6205024
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 006b49709..1d41c7c8d 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 ed0a5895f..2670c229d 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
new file mode 100644
index 000000000..2c4293af5
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-cairo
@@ -0,0 +1,11 @@
+--- 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 NULL;
+ 
+     if (index >= m_frames.size() || !m_frames[index].m_frame)
+         cacheFrame(index);
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
new file mode 100644
index 000000000..a022f4df1
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2009-05-19 15:17:51.000000000 +0800
++++ configure	2009-05-19 15:18:21.000000000 +0800
+@@ -20986,7 +20986,7 @@
+ 
+ if test "$enable_jit" = "yes"; then
+     case "$target_cpu" in
+-        i*86|x86_64)
++        i*86|x86_64|amd64)
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_JIT 1
+@@ -21020,7 +21020,7 @@
+ _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-descr b/www/webkit-gtk2/pkg-descr
index adfbb90c9..40ef1e3ef 100644
--- a/www/webkit-gtk2/pkg-descr
+++ b/www/webkit-gtk2/pkg-descr
@@ -2,5 +2,4 @@ WebKit is an open source web browser engine. It is able to display content
 such as HTML, SVG, XML, and others. It also supports DOM, XMLHttpRequest,
 XSLT, CSS, Javascript/ECMAscript and more.
 
-Main webkit website: http://webkit.org/ Below is the offical WebKitGTK+ website.
-WWW: http://webkitgtk.org/
+WWW: http://webkit.org/
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 75c985dd6..5f3ccc1b4 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -29,11 +29,14 @@ 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.6
+lib/libwebkit-1.0.so.7
 libdata/pkgconfig/WebKitGtk.pc
 libdata/pkgconfig/webkit-1.0.pc
 share/locale/de/LC_MESSAGES/webkit.mo
+share/locale/it/LC_MESSAGES/webkit.mo
 share/locale/pt_BR/LC_MESSAGES/webkit.mo
+share/locale/ru/LC_MESSAGES/webkit.mo
+share/locale/sv/LC_MESSAGES/webkit.mo
 share/webkit-1.0/resources/error.html
 share/webkit-1.0/webinspector/Images/back.png
 share/webkit-1.0/webinspector/Images/checker.png
@@ -148,6 +151,7 @@ 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/localizedStrings.js
 @dirrm share/webkit-1.0/webinspector/Images
 @dirrm share/webkit-1.0/webinspector
 @dirrm share/webkit-1.0/resources