Update to 1.3.13.

webkit-gtk2 is a dry commit. Lets cross my fingers that it will work :)


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

8 files changed, 124 insertions, 18 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 41d06a108..ec0db729d 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.72 2011/03/06 18:55:36 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index c63ef21d1..a59a85dd2 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.3.12.tar.gz) = 5ce06f50e99c2ad1b7061cdbf66ee7dabce580f3013686397ff903fa3562dd22
-SIZE (webkit-1.3.12.tar.gz) = 8291843
+SHA256 (webkit-1.3.13.tar.gz) = a35e8b69c9acb94c4d5d4bdd5b92ae3d3255b7f60ed785ac7cdf325a15197f89
+SIZE (webkit-1.3.13.tar.gz) = 8471864
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
index 6825e7054..e981f9712 100644
--- a/www/webkit-gtk2/files/patch-configure
+++ b/www/webkit-gtk2/files/patch-configure
@@ -1,6 +1,17 @@
---- configure.orig	2010-11-29 22:57:13.000000000 +0000
-+++ configure	2010-12-16 16:38:32.000000000 +0000
-@@ -19795,7 +19795,7 @@
+--- configure.orig	2011-03-22 15:43:40.000000000 +0100
++++ configure	2011-03-22 15:44:04.000000000 +0100
+@@ -18331,8 +18331,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+ 
+ gsettings__base_list = \
+-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++  sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++  sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)
+@@ -20131,7 +20131,7 @@
  $as_echo "#define ENABLE_YARR_JIT 1" >>confdefs.h
  
          ;;
@@ -9,7 +20,7 @@
  
  $as_echo "#define ENABLE_JIT 1" >>confdefs.h
  
-@@ -19820,7 +19820,7 @@
+@@ -20156,7 +20156,7 @@
  $as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1" >>confdefs.h
  
                  ;;
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 9a4a7f2a4..10b27b659 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -136,10 +136,14 @@ include/webkit-1.0/webkit/WebKitDOMTreeWalker.h
 include/webkit-1.0/webkit/WebKitDOMUIEvent.h
 include/webkit-1.0/webkit/WebKitDOMValidityState.h
 include/webkit-1.0/webkit/WebKitDOMWebKitPoint.h
+include/webkit-1.0/webkit/WebKitDOMWebKitAnimation.h
+include/webkit-1.0/webkit/WebKitDOMWebKitAnimationList.h
 include/webkit-1.0/webkit/WebKitDOMXPathExpression.h
 include/webkit-1.0/webkit/WebKitDOMXPathNSResolver.h
 include/webkit-1.0/webkit/WebKitDOMXPathResult.h
 include/webkit-1.0/webkit/webkit.h
+include/webkit-1.0/webkit/webkitapplicationcache.h
+include/webkit-1.0/webkit/webkiticondatabase.h
 include/webkit-1.0/webkit/webkitdefines.h
 include/webkit-1.0/webkit/webkitdom.h
 include/webkit-1.0/webkit/webkitdomdefines.h
@@ -177,6 +181,39 @@ lib/libwebkitgtk-1.0.so.0
 libdata/pkgconfig/webkit-1.0.pc
 share/gir-1.0/JSCore-1.0.gir
 share/gir-1.0/WebKit-1.0.gir
+share/locale/ar/LC_MESSAGES/webkit-1.0.mo
+share/locale/bg/LC_MESSAGES/webkit-1.0.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/eu/LC_MESSAGES/webkit-1.0.mo
+share/locale/fr/LC_MESSAGES/webkit-1.0.mo
+share/locale/gl/LC_MESSAGES/webkit-1.0.mo
+share/locale/gr/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/hu/LC_MESSAGES/webkit-1.0.mo
+share/locale/id/LC_MESSAGES/webkit-1.0.mo
+share/locale/it/LC_MESSAGES/webkit-1.0.mo
+share/locale/ko/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/nb/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/pl/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/resources/error.html
 share/webkitgtk-1.0/images/deleteButton.png
 share/webkitgtk-1.0/images/inputSpeech.png
@@ -279,6 +316,7 @@ share/webkitgtk-1.0/webinspector/Images/excludeButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/focusButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/forward.png
 share/webkitgtk-1.0/webinspector/Images/frame.png
+share/webkitgtk-1.0/webinspector/Images/garbageCollectButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/gearButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/glossyHeader.png
 share/webkitgtk-1.0/webinspector/Images/glossyHeaderPressed.png
@@ -287,6 +325,7 @@ share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
 share/webkitgtk-1.0/webinspector/Images/goArrow.png
 share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutLeft.png
 share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkitgtk-1.0/webinspector/Images/helpButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/largerResourcesButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/localStorage.png
 share/webkitgtk-1.0/webinspector/Images/networkIcon.png
@@ -424,6 +463,7 @@ share/webkitgtk-1.0/webinspector/Script.js
 share/webkitgtk-1.0/webinspector/ScriptFormatter.js
 share/webkitgtk-1.0/webinspector/ScriptFormatterWorker.js
 share/webkitgtk-1.0/webinspector/ScriptsPanel.js
+share/webkitgtk-1.0/webinspector/SearchController.js
 share/webkitgtk-1.0/webinspector/Section.js
 share/webkitgtk-1.0/webinspector/Settings.js
 share/webkitgtk-1.0/webinspector/ShortcutsHelp.js
@@ -478,5 +518,7 @@ share/webkitgtk-1.0/webinspector/utilities.js
 @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
 @dirrmtry share/locale/gr/LC_MESSAGES
 @dirrmtry share/locale/gr
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 4285fa7df..61026d2ba 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.10 2011/02/03 04:38:26 avl Exp $
+#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.11 2011/02/24 15:26:05 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk3
@@ -35,8 +35,8 @@ USE_GNOME=	gtk30 libxslt ltverhack
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS=	"-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
 		ac_cv_path_DOLT_BASH=""
 CONFIGURE_ARGS=	--enable-icon-database \
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index c63ef21d1..a59a85dd2 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.3.12.tar.gz) = 5ce06f50e99c2ad1b7061cdbf66ee7dabce580f3013686397ff903fa3562dd22
-SIZE (webkit-1.3.12.tar.gz) = 8291843
+SHA256 (webkit-1.3.13.tar.gz) = a35e8b69c9acb94c4d5d4bdd5b92ae3d3255b7f60ed785ac7cdf325a15197f89
+SIZE (webkit-1.3.13.tar.gz) = 8471864
diff --git a/www/webkit-gtk3/files/patch-configure b/www/webkit-gtk3/files/patch-configure
index 6825e7054..e981f9712 100644
--- a/www/webkit-gtk3/files/patch-configure
+++ b/www/webkit-gtk3/files/patch-configure
@@ -1,6 +1,17 @@
---- configure.orig	2010-11-29 22:57:13.000000000 +0000
-+++ configure	2010-12-16 16:38:32.000000000 +0000
-@@ -19795,7 +19795,7 @@
+--- configure.orig	2011-03-22 15:43:40.000000000 +0100
++++ configure	2011-03-22 15:44:04.000000000 +0100
+@@ -18331,8 +18331,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+ 
+ gsettings__base_list = \
+-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++  sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++  sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)
+@@ -20131,7 +20131,7 @@
  $as_echo "#define ENABLE_YARR_JIT 1" >>confdefs.h
  
          ;;
@@ -9,7 +20,7 @@
  
  $as_echo "#define ENABLE_JIT 1" >>confdefs.h
  
-@@ -19820,7 +19820,7 @@
+@@ -20156,7 +20156,7 @@
  $as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1" >>confdefs.h
  
                  ;;
diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist
index 9fb225f12..26a636627 100644
--- a/www/webkit-gtk3/pkg-plist
+++ b/www/webkit-gtk3/pkg-plist
@@ -135,11 +135,15 @@ include/webkit-3.0/webkit/WebKitDOMTimeRanges.h
 include/webkit-3.0/webkit/WebKitDOMTreeWalker.h
 include/webkit-3.0/webkit/WebKitDOMUIEvent.h
 include/webkit-3.0/webkit/WebKitDOMValidityState.h
+include/webkit-3.0/webkit/WebKitDOMWebKitAnimation.h
+include/webkit-3.0/webkit/WebKitDOMWebKitAnimationList.h
 include/webkit-3.0/webkit/WebKitDOMWebKitPoint.h
 include/webkit-3.0/webkit/WebKitDOMXPathExpression.h
 include/webkit-3.0/webkit/WebKitDOMXPathNSResolver.h
 include/webkit-3.0/webkit/WebKitDOMXPathResult.h
 include/webkit-3.0/webkit/webkit.h
+include/webkit-3.0/webkit/webkitapplicationcache.h
+include/webkit-3.0/webkit/webkiticondatabase.h
 include/webkit-3.0/webkit/webkitdefines.h
 include/webkit-3.0/webkit/webkitdom.h
 include/webkit-3.0/webkit/webkitdomdefines.h
@@ -177,6 +181,39 @@ lib/libwebkitgtk-3.0.so.0
 libdata/pkgconfig/webkitgtk-3.0.pc
 share/gir-1.0/JSCore-3.0.gir
 share/gir-1.0/WebKit-3.0.gir
+share/locale/ar/LC_MESSAGES/webkit-3.0.mo
+share/locale/bg/LC_MESSAGES/webkit-3.0.mo
+share/locale/cs/LC_MESSAGES/webkit-3.0.mo
+share/locale/de/LC_MESSAGES/webkit-3.0.mo
+share/locale/en_GB/LC_MESSAGES/webkit-3.0.mo
+share/locale/es/LC_MESSAGES/webkit-3.0.mo
+share/locale/et/LC_MESSAGES/webkit-3.0.mo
+share/locale/eu/LC_MESSAGES/webkit-3.0.mo
+share/locale/fr/LC_MESSAGES/webkit-3.0.mo
+share/locale/gl/LC_MESSAGES/webkit-3.0.mo
+share/locale/gr/LC_MESSAGES/webkit-3.0.mo
+share/locale/gu/LC_MESSAGES/webkit-3.0.mo
+share/locale/he/LC_MESSAGES/webkit-3.0.mo
+share/locale/hu/LC_MESSAGES/webkit-3.0.mo
+share/locale/id/LC_MESSAGES/webkit-3.0.mo
+share/locale/it/LC_MESSAGES/webkit-3.0.mo
+share/locale/ko/LC_MESSAGES/webkit-3.0.mo
+share/locale/lt/LC_MESSAGES/webkit-3.0.mo
+share/locale/lv/LC_MESSAGES/webkit-3.0.mo
+share/locale/nb/LC_MESSAGES/webkit-3.0.mo
+share/locale/nl/LC_MESSAGES/webkit-3.0.mo
+share/locale/pa/LC_MESSAGES/webkit-3.0.mo
+share/locale/pl/LC_MESSAGES/webkit-3.0.mo
+share/locale/pt/LC_MESSAGES/webkit-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/webkit-3.0.mo
+share/locale/ru/LC_MESSAGES/webkit-3.0.mo
+share/locale/sl/LC_MESSAGES/webkit-3.0.mo
+share/locale/sr/LC_MESSAGES/webkit-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/webkit-3.0.mo
+share/locale/sv/LC_MESSAGES/webkit-3.0.mo
+share/locale/uk/LC_MESSAGES/webkit-3.0.mo
+share/locale/vi/LC_MESSAGES/webkit-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/webkit-3.0.mo
 share/webkit-3.0/resources/error.html
 share/webkitgtk-3.0/images/deleteButton.png
 share/webkitgtk-3.0/images/inputSpeech.png
@@ -279,6 +316,7 @@ share/webkitgtk-3.0/webinspector/Images/excludeButtonGlyph.png
 share/webkitgtk-3.0/webinspector/Images/focusButtonGlyph.png
 share/webkitgtk-3.0/webinspector/Images/forward.png
 share/webkitgtk-3.0/webinspector/Images/frame.png
+share/webkitgtk-3.0/webinspector/Images/garbageCollectButtonGlyph.png
 share/webkitgtk-3.0/webinspector/Images/gearButtonGlyph.png
 share/webkitgtk-3.0/webinspector/Images/glossyHeader.png
 share/webkitgtk-3.0/webinspector/Images/glossyHeaderPressed.png
@@ -287,6 +325,7 @@ share/webkitgtk-3.0/webinspector/Images/glossyHeaderSelectedPressed.png
 share/webkitgtk-3.0/webinspector/Images/goArrow.png
 share/webkitgtk-3.0/webinspector/Images/graphLabelCalloutLeft.png
 share/webkitgtk-3.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkitgtk-3.0/webinspector/Images/helpButtonGlyph.png
 share/webkitgtk-3.0/webinspector/Images/largerResourcesButtonGlyph.png
 share/webkitgtk-3.0/webinspector/Images/localStorage.png
 share/webkitgtk-3.0/webinspector/Images/networkIcon.png
@@ -424,6 +463,7 @@ share/webkitgtk-3.0/webinspector/Script.js
 share/webkitgtk-3.0/webinspector/ScriptFormatter.js
 share/webkitgtk-3.0/webinspector/ScriptFormatterWorker.js
 share/webkitgtk-3.0/webinspector/ScriptsPanel.js
+share/webkitgtk-3.0/webinspector/SearchController.js
 share/webkitgtk-3.0/webinspector/Section.js
 share/webkitgtk-3.0/webinspector/Settings.js
 share/webkitgtk-3.0/webinspector/ShortcutsHelp.js
@@ -478,5 +518,7 @@ share/webkitgtk-3.0/webinspector/utilities.js
 @dirrm include/webkit-3.0/webkit
 @dirrm include/webkit-3.0/JavaScriptCore
 @dirrm include/webkit-3.0
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/gr/LC_MESSAGES
 @dirrmtry share/locale/gr