Tue Dec 27 03:54:36 2011 UTC ()
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


(sbd)
diff -r1.47 -r1.48 pkgsrc/www/webkit-gtk/Makefile
diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/Makefile.common
diff -r1.39 -r1.40 pkgsrc/www/webkit-gtk/distinfo
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-configure
cvs diff -r1.47 -r1.48 pkgsrc/www/webkit-gtk/Makefile (switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2011/11/01 06:02:47 1.47
+++ pkgsrc/www/webkit-gtk/Makefile 2011/12/27 03:54:36 1.48
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile,v 1.47 2011/11/01 06:02:47 sbd Exp $ 1# $NetBSD: Makefile,v 1.48 2011/12/27 03:54:36 sbd Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/} 5PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/}
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8COMMENT= GTK2 port of the WebKit browser engine 8COMMENT= GTK2 port of the WebKit browser engine
9 9
10CONFIGURE_ARGS+= --with-gtk=2.0 10CONFIGURE_ARGS+= --with-gtk=2.0
11 11
12.include "../../x11/gtk2/buildlink3.mk" 12.include "../../x11/gtk2/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/www/webkit-gtk/Attic/Makefile.common 2011/10/07 12:17:25 1.3
+++ pkgsrc/www/webkit-gtk/Attic/Makefile.common 2011/12/27 03:54:36 1.4
@@ -1,66 +1,66 @@ @@ -1,66 +1,66 @@
1# $NetBSD: Makefile.common,v 1.3 2011/10/07 12:17:25 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.4 2011/12/27 03:54:36 sbd Exp $
2# used by www/webkit-gtk/Makefile 2# used by www/webkit-gtk/Makefile
3# used by www/webkit-gtk3/Makefile 3# used by www/webkit-gtk3/Makefile
4 4
5DISTNAME= webkit-1.6.1 5DISTNAME= webkit-1.6.1
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.webkitgtk.org/ 7MASTER_SITES= http://www.webkitgtk.org/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.webkitgtk.org/ 10HOMEPAGE= http://www.webkitgtk.org/
11 11
12DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo
13PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches 13PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= bison gmake perl:build pkg-config msgfmt 17USE_TOOLS+= bison gmake perl:build pkg-config msgfmt gsed
18 18
19PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in 19PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in
20 20
21PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
22MAKE_JOBS_SAFE= no 22MAKE_JOBS_SAFE= no
23 23
24MAKE_FILE= GNUmakefile 24MAKE_FILE= GNUmakefile
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26 26
27CONFIGURE_ARGS+= --with-target=x11 \ 27CONFIGURE_ARGS+= --with-target=x11 \
28 --with-font-backend=freetype 28 --with-font-backend=freetype
29CONFIGURE_ENV+= ZLIB_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include ZLIB_LIBS=-lz 29CONFIGURE_ENV+= ZLIB_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include ZLIB_LIBS=-lz
30 30
31.include "options.mk" 31.include "options.mk"
32 32
33REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \ 33REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
34 Source/WebCore/bindings/scripts/generate-bindings.pl \ 34 Source/WebCore/bindings/scripts/generate-bindings.pl \
35 Source/WebCore/bindings/scripts/InFilesParser.pm \ 35 Source/WebCore/bindings/scripts/InFilesParser.pm \
36 Source/WebCore/platform/text/mac/make-charset-table.pl \ 36 Source/WebCore/platform/text/mac/make-charset-table.pl \
37 Source/WebCore/css/*.pl \ 37 Source/WebCore/css/*.pl \
38 Source/WebCore/dom/*.pl \ 38 Source/WebCore/dom/*.pl \
39 Source/WebCore/inspector/xxd.pl \ 39 Source/WebCore/inspector/xxd.pl \
40 Source/WebCore/make-hash-tools.pl \ 40 Source/WebCore/make-hash-tools.pl \
41 Source/WebCore/platform/text/mac/*.pl 41 Source/WebCore/platform/text/mac/*.pl
42 42
43BUILDLINK_DEPMETHOD.python= build 43BUILDLINK_DEPMETHOD.python= build
44.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
45CONFIGURE_ENV+= PYTHON=${PYTHONBIN} 45CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
46 46
47.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
48.include "../../databases/sqlite3/buildlink3.mk" 48.include "../../databases/sqlite3/buildlink3.mk"
49.include "../../devel/flex/buildlink3.mk" 49.include "../../devel/flex/buildlink3.mk"
50.include "../../devel/gperf/buildlink3.mk" 50.include "../../devel/gperf/buildlink3.mk"
51# This is optional, but needs testing. 51# This is optional, but needs testing.
52#.include "../../devel/pango/buildlink3.mk" 52#.include "../../devel/pango/buildlink3.mk"
53# A correct Webkit build requires flex 2.5.33 53# A correct Webkit build requires flex 2.5.33
54.include "../../graphics/freetype2/buildlink3.mk" 54.include "../../graphics/freetype2/buildlink3.mk"
55.include "../../mk/jpeg.buildlink3.mk" 55.include "../../mk/jpeg.buildlink3.mk"
56BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08 56BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
57.include "../../graphics/png/buildlink3.mk" 57.include "../../graphics/png/buildlink3.mk"
58.include "../../multimedia/gstreamer0.10/buildlink3.mk" 58.include "../../multimedia/gstreamer0.10/buildlink3.mk"
59.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 59.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
60BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.34.2 60BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.34.2
61.include "../../net/libsoup24/buildlink3.mk" 61.include "../../net/libsoup24/buildlink3.mk"
62.include "../../textproc/enchant/buildlink3.mk" 62.include "../../textproc/enchant/buildlink3.mk"
63.include "../../textproc/icu/buildlink3.mk" 63.include "../../textproc/icu/buildlink3.mk"
64.include "../../textproc/libxslt/buildlink3.mk" 64.include "../../textproc/libxslt/buildlink3.mk"
65.include "../../x11/libXt/buildlink3.mk" 65.include "../../x11/libXt/buildlink3.mk"
66.include "../../mk/pthread.buildlink3.mk" 66.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.39 -r1.40 pkgsrc/www/webkit-gtk/distinfo (switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2011/10/07 12:17:25 1.39
+++ pkgsrc/www/webkit-gtk/distinfo 2011/12/27 03:54:36 1.40
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
1$NetBSD: distinfo,v 1.39 2011/10/07 12:17:25 drochner Exp $ 1$NetBSD: distinfo,v 1.40 2011/12/27 03:54:36 sbd Exp $
2 2
3SHA1 (webkit-1.6.1.tar.gz) = dab3bda0708a5e0595584ca5aa33ea6bfd24ffd3 3SHA1 (webkit-1.6.1.tar.gz) = dab3bda0708a5e0595584ca5aa33ea6bfd24ffd3
4RMD160 (webkit-1.6.1.tar.gz) = 08c6bc3f40c6a3d9fa5997bb750845e99cdb5643 4RMD160 (webkit-1.6.1.tar.gz) = 08c6bc3f40c6a3d9fa5997bb750845e99cdb5643
5Size (webkit-1.6.1.tar.gz) = 10129874 bytes 5Size (webkit-1.6.1.tar.gz) = 10129874 bytes
6SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 37d860bad704ab6920881c0401f657e49084f833 6SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 37d860bad704ab6920881c0401f657e49084f833
 7SHA1 (patch-Source_autotools_gsettings.m4) = b9babd19808bdce325fc17d432a1bb5ec04cecae
7SHA1 (patch-ag) = 220a9925ba1eb4288d334997fda24f41595de1c8 8SHA1 (patch-ag) = 220a9925ba1eb4288d334997fda24f41595de1c8
8SHA1 (patch-ah) = de2e719f67534bf64fb5968b457888e9bd824a3d 9SHA1 (patch-ah) = de2e719f67534bf64fb5968b457888e9bd824a3d
9SHA1 (patch-ai) = 8998dbb783922a866dcd00e14f33086d7edecdef 10SHA1 (patch-ai) = 8998dbb783922a866dcd00e14f33086d7edecdef
 11SHA1 (patch-configure) = d1d50d4bfe98fbce454c8bd246410b1b2e91a289
 12SHA1 (patch-configure.bak) = e3771d98e8589f8a9db987b099bd80cbfa5127a3
File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_autotools_gsettings.m4
$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)
File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-configure
$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)