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 PKGREVISIONdiff -r1.47 -r1.48 pkgsrc/www/webkit-gtk/Makefile
(sbd)
@@ -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 | |||
5 | PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/} | 5 | PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/} | |
6 | PKGREVISION= 1 | 6 | PKGREVISION= 2 | |
7 | 7 | |||
8 | COMMENT= GTK2 port of the WebKit browser engine | 8 | COMMENT= GTK2 port of the WebKit browser engine | |
9 | 9 | |||
10 | CONFIGURE_ARGS+= --with-gtk=2.0 | 10 | CONFIGURE_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" |
@@ -1,30 +1,30 @@ | @@ -1,30 +1,30 @@ | |||
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 | |||
5 | DISTNAME= webkit-1.6.1 | 5 | DISTNAME= webkit-1.6.1 | |
6 | CATEGORIES= www | 6 | CATEGORIES= www | |
7 | MASTER_SITES= http://www.webkitgtk.org/ | 7 | MASTER_SITES= http://www.webkitgtk.org/ | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.webkitgtk.org/ | 10 | HOMEPAGE= http://www.webkitgtk.org/ | |
11 | 11 | |||
12 | DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo | 12 | DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo | |
13 | PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches | 13 | PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches | |
14 | 14 | |||
15 | USE_LANGUAGES= c c++ | 15 | USE_LANGUAGES= c c++ | |
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | USE_TOOLS+= bison gmake perl:build pkg-config msgfmt | 17 | USE_TOOLS+= bison gmake perl:build pkg-config msgfmt gsed | |
18 | 18 | |||
19 | PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in | 19 | PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in | |
20 | 20 | |||
21 | PKG_DESTDIR_SUPPORT= user-destdir | 21 | PKG_DESTDIR_SUPPORT= user-destdir | |
22 | MAKE_JOBS_SAFE= no | 22 | MAKE_JOBS_SAFE= no | |
23 | 23 | |||
24 | MAKE_FILE= GNUmakefile | 24 | MAKE_FILE= GNUmakefile | |
25 | GNU_CONFIGURE= yes | 25 | GNU_CONFIGURE= yes | |
26 | 26 | |||
27 | CONFIGURE_ARGS+= --with-target=x11 \ | 27 | CONFIGURE_ARGS+= --with-target=x11 \ | |
28 | --with-font-backend=freetype | 28 | --with-font-backend=freetype | |
29 | CONFIGURE_ENV+= ZLIB_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include ZLIB_LIBS=-lz | 29 | CONFIGURE_ENV+= ZLIB_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include ZLIB_LIBS=-lz | |
30 | 30 |
@@ -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 | |||
3 | SHA1 (webkit-1.6.1.tar.gz) = dab3bda0708a5e0595584ca5aa33ea6bfd24ffd3 | 3 | SHA1 (webkit-1.6.1.tar.gz) = dab3bda0708a5e0595584ca5aa33ea6bfd24ffd3 | |
4 | RMD160 (webkit-1.6.1.tar.gz) = 08c6bc3f40c6a3d9fa5997bb750845e99cdb5643 | 4 | RMD160 (webkit-1.6.1.tar.gz) = 08c6bc3f40c6a3d9fa5997bb750845e99cdb5643 | |
5 | Size (webkit-1.6.1.tar.gz) = 10129874 bytes | 5 | Size (webkit-1.6.1.tar.gz) = 10129874 bytes | |
6 | SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 37d860bad704ab6920881c0401f657e49084f833 | 6 | SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 37d860bad704ab6920881c0401f657e49084f833 | |
7 | SHA1 (patch-Source_autotools_gsettings.m4) = b9babd19808bdce325fc17d432a1bb5ec04cecae | |||
7 | SHA1 (patch-ag) = 220a9925ba1eb4288d334997fda24f41595de1c8 | 8 | SHA1 (patch-ag) = 220a9925ba1eb4288d334997fda24f41595de1c8 | |
8 | SHA1 (patch-ah) = de2e719f67534bf64fb5968b457888e9bd824a3d | 9 | SHA1 (patch-ah) = de2e719f67534bf64fb5968b457888e9bd824a3d | |
9 | SHA1 (patch-ai) = 8998dbb783922a866dcd00e14f33086d7edecdef | 10 | SHA1 (patch-ai) = 8998dbb783922a866dcd00e14f33086d7edecdef | |
11 | SHA1 (patch-configure) = d1d50d4bfe98fbce454c8bd246410b1b2e91a289 | |||
12 | SHA1 (patch-configure.bak) = e3771d98e8589f8a9db987b099bd80cbfa5127a3 |
$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)
$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)