There is a gsed specific expression used in the install-gsettings-schemas

target (that install org.webkitgtk-1.0.gschema.xml) so use gsed.

Bump PKGREVISION

5 files changed, 42 insertions, 5 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 1bee4c6e5b3..9f5dd40c717 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2011/11/01 06:02:47 sbd Exp $
+# $NetBSD: Makefile,v 1.48 2011/12/27 03:54:36 sbd Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	GTK2 port of the WebKit browser engine
 
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index 0564e3fa418..51a6775523a 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2011/10/07 12:17:25 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2011/12/27 03:54:36 sbd Exp $
 # used by www/webkit-gtk/Makefile
 # used by www/webkit-gtk3/Makefile
 
@@ -14,7 +14,7 @@ PATCHDIR=		${.CURDIR}/../../www/webkit-gtk/patches
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt
+USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt gsed
 
 PKGCONFIG_OVERRIDE=	Source/WebKit/gtk/webkit.pc.in
 
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 14e7718c90a..ccbc64d1101 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.39 2011/10/07 12:17:25 drochner Exp $
+$NetBSD: distinfo,v 1.40 2011/12/27 03:54:36 sbd Exp $
 
 SHA1 (webkit-1.6.1.tar.gz) = dab3bda0708a5e0595584ca5aa33ea6bfd24ffd3
 RMD160 (webkit-1.6.1.tar.gz) = 08c6bc3f40c6a3d9fa5997bb750845e99cdb5643
 Size (webkit-1.6.1.tar.gz) = 10129874 bytes
 SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 37d860bad704ab6920881c0401f657e49084f833
+SHA1 (patch-Source_autotools_gsettings.m4) = b9babd19808bdce325fc17d432a1bb5ec04cecae
 SHA1 (patch-ag) = 220a9925ba1eb4288d334997fda24f41595de1c8
 SHA1 (patch-ah) = de2e719f67534bf64fb5968b457888e9bd824a3d
 SHA1 (patch-ai) = 8998dbb783922a866dcd00e14f33086d7edecdef
+SHA1 (patch-configure) = d1d50d4bfe98fbce454c8bd246410b1b2e91a289
+SHA1 (patch-configure.bak) = e3771d98e8589f8a9db987b099bd80cbfa5127a3
diff --git a/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4 b/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4
new file mode 100644
index 00000000000..1cd7a3d2e4e
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4
@@ -0,0 +1,17 @@
+$NetBSD: patch-Source_autotools_gsettings.m4,v 1.1 2011/12/27 03:54:36 sbd Exp $
+
+${gsettings__base_list} has gsed specific expressions.
+
+--- Source/autotools/gsettings.m4.orig	2011-09-26 20:55:03.000000000 +0000
++++ Source/autotools/gsettings.m4
+@@ -46,8 +46,8 @@ install-data-am: install-gsettings-schem
+ .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"
++  gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
++  gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)
diff --git a/www/webkit-gtk/patches/patch-configure b/www/webkit-gtk/patches/patch-configure
new file mode 100644
index 00000000000..8ad5a9ad124
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2011/12/27 03:54:36 sbd Exp $
+
+${gsettings__base_list} has gsed specific expressions.
+
+--- configure.orig	2011-09-27 10:41:23.000000000 +0000
++++ configure
+@@ -19062,8 +19062,8 @@ install-data-am: install-gsettings-schem
+ .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"
++  gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
++  gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)