diff options
author | sbd <sbd@pkgsrc.org> | 2011-12-28 04:22:15 +0000 |
---|---|---|
committer | sbd <sbd@pkgsrc.org> | 2011-12-28 04:22:15 +0000 |
commit | 0b764a78d57b03ec3cf2eee88d4b3722e89508a3 (patch) | |
tree | 0dc6447d50146bc75a8f4d26a2ea61bf6678a087 | |
parent | 633b4f389f04fee7ebf5aa2e2703a14659ac59b2 (diff) | |
download | pkgsrc-0b764a78d57b03ec3cf2eee88d4b3722e89508a3.tar.gz |
Include devel/glib2/schemas.mk (obache@ suggestion).
Regen PLIST
Remove patch-Source_autotools_gsettings.m4 and patch-configure
(They are redundaent when adding gsed to USE_TOOLS)
Bump PKGREVISION
-rw-r--r-- | www/webkit-gtk/Makefile | 4 | ||||
-rw-r--r-- | www/webkit-gtk/Makefile.common | 3 | ||||
-rw-r--r-- | www/webkit-gtk/PLIST | 5 | ||||
-rw-r--r-- | www/webkit-gtk/distinfo | 4 | ||||
-rw-r--r-- | www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4 | 17 | ||||
-rw-r--r-- | www/webkit-gtk/patches/patch-configure | 17 |
6 files changed, 7 insertions, 43 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 9f5dd40c717..6c5362c55fc 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.48 2011/12/27 03:54:36 sbd Exp $ +# $NetBSD: Makefile,v 1.49 2011/12/28 04:22:15 sbd Exp $ .include "Makefile.common" PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= GTK2 port of the WebKit browser engine diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common index 51a6775523a..5037ffc6145 100644 --- a/www/webkit-gtk/Makefile.common +++ b/www/webkit-gtk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2011/12/27 03:54:36 sbd Exp $ +# $NetBSD: Makefile.common,v 1.5 2011/12/28 04:22:15 sbd Exp $ # used by www/webkit-gtk/Makefile # used by www/webkit-gtk3/Makefile @@ -44,6 +44,7 @@ BUILDLINK_DEPMETHOD.python= build .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +.include "../../devel/glib2/schemas.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/flex/buildlink3.mk" diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST index 9b3ff8995cc..9817fa55379 100644 --- a/www/webkit-gtk/PLIST +++ b/www/webkit-gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2011/12/26 09:01:39 sbd Exp $ +@comment $NetBSD: PLIST,v 1.17 2011/12/28 04:22:15 sbd Exp $ bin/jsc-1 include/webkit-1.0/JavaScriptCore/JSBase.h include/webkit-1.0/JavaScriptCore/JSContextRef.h @@ -179,6 +179,7 @@ lib/libjavascriptcoregtk-1.0.la lib/libwebkitgtk-1.0.la lib/pkgconfig/javascriptcoregtk-1.0.pc lib/pkgconfig/webkit-1.0.pc +share/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml share/locale/ar/LC_MESSAGES/webkit-2.0.mo share/locale/bg/LC_MESSAGES/webkit-2.0.mo share/locale/cs/LC_MESSAGES/webkit-2.0.mo @@ -516,5 +517,3 @@ share/webkitgtk-1.0/webinspector/popover.css share/webkitgtk-1.0/webinspector/textViewer.css share/webkitgtk-1.0/webinspector/treeoutline.js share/webkitgtk-1.0/webinspector/utilities.js -share/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml -@pkgdir share/glib-2.0/schemas diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 6e8edfe3a30..1976d458a29 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,11 +1,9 @@ -$NetBSD: distinfo,v 1.41 2011/12/27 03:58:24 sbd Exp $ +$NetBSD: distinfo,v 1.42 2011/12/28 04:22:15 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 diff --git a/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4 b/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4 deleted file mode 100644 index 1cd7a3d2e4e..00000000000 --- a/www/webkit-gtk/patches/patch-Source_autotools_gsettings.m4 +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 8ad5a9ad124..00000000000 --- a/www/webkit-gtk/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ -$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) |