diff options
author | drochner <drochner@pkgsrc.org> | 2012-07-06 14:03:50 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2012-07-06 14:03:50 +0000 |
commit | 13506494953dd5a7e2325dac95eea86fbe5b5fde (patch) | |
tree | dad338e96ac1de3fcecbfb732a23bd7746bd8e0e /www/webkit-gtk | |
parent | e31d20edcbb99ba5b232a5c67ffd398f7fe6b4c3 (diff) | |
download | pkgsrc-13506494953dd5a7e2325dac95eea86fbe5b5fde.tar.gz |
don't install gtk-doc documentation, to avoid conflict between the
two webkit-gtk versions
bump PKGREVs
Diffstat (limited to 'www/webkit-gtk')
-rw-r--r-- | www/webkit-gtk/Makefile | 4 | ||||
-rw-r--r-- | www/webkit-gtk/PLIST | 69 | ||||
-rw-r--r-- | www/webkit-gtk/distinfo | 4 | ||||
-rw-r--r-- | www/webkit-gtk/patches/patch-al | 15 |
4 files changed, 17 insertions, 75 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index f5732c106dc..1b310e28693 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.55 2012/06/14 07:43:29 sbd Exp $ +# $NetBSD: Makefile,v 1.56 2012/07/06 14:03:50 drochner 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/PLIST b/www/webkit-gtk/PLIST index bc4fc5a8f2d..cb653d2a308 100644 --- a/www/webkit-gtk/PLIST +++ b/www/webkit-gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2012/04/28 14:12:16 drochner Exp $ +@comment $NetBSD: PLIST,v 1.19 2012/07/06 14:03:50 drochner Exp $ bin/jsc-1 include/webkitgtk-1.0/JavaScriptCore/JSBase.h include/webkitgtk-1.0/JavaScriptCore/JSContextRef.h @@ -279,73 +279,6 @@ lib/libjavascriptcoregtk-1.0.la lib/libwebkitgtk-1.0.la lib/pkgconfig/javascriptcoregtk-1.0.pc lib/pkgconfig/webkit-1.0.pc -share/gtk-doc/html/webkitgtk/WebKitFaviconDatabase.html -share/gtk-doc/html/webkitgtk/WebKitGeolocationPolicyDecision.html -share/gtk-doc/html/webkitgtk/WebKitHitTestResult.html -share/gtk-doc/html/webkitgtk/WebKitIconDatabase.html -share/gtk-doc/html/webkitgtk/WebKitNetworkRequest.html -share/gtk-doc/html/webkitgtk/WebKitNetworkResponse.html -share/gtk-doc/html/webkitgtk/WebKitSecurityOrigin.html -share/gtk-doc/html/webkitgtk/WebKitSoupAuthDialog.html -share/gtk-doc/html/webkitgtk/WebKitSpellChecker.html -share/gtk-doc/html/webkitgtk/WebKitViewportAttributes.html -share/gtk-doc/html/webkitgtk/WebKitWebBackForwardList.html -share/gtk-doc/html/webkitgtk/WebKitWebDataSource.html -share/gtk-doc/html/webkitgtk/WebKitWebDatabase.html -share/gtk-doc/html/webkitgtk/WebKitWebFrame.html -share/gtk-doc/html/webkitgtk/WebKitWebHistoryItem.html -share/gtk-doc/html/webkitgtk/WebKitWebInspector.html -share/gtk-doc/html/webkitgtk/WebKitWebNavigationAction.html -share/gtk-doc/html/webkitgtk/WebKitWebPlugin.html -share/gtk-doc/html/webkitgtk/WebKitWebPluginDatabase.html -share/gtk-doc/html/webkitgtk/WebKitWebPolicyDecision.html -share/gtk-doc/html/webkitgtk/WebKitWebResource.html -share/gtk-doc/html/webkitgtk/WebKitWebSettings.html -share/gtk-doc/html/webkitgtk/WebKitWebWindowFeatures.html -share/gtk-doc/html/webkitgtk/annotation-glossary.html -share/gtk-doc/html/webkitgtk/ch01.html -share/gtk-doc/html/webkitgtk/ch02.html -share/gtk-doc/html/webkitgtk/ch03.html -share/gtk-doc/html/webkitgtk/home.png -share/gtk-doc/html/webkitgtk/index-1.0.1.html -share/gtk-doc/html/webkitgtk/index-1.0.2.html -share/gtk-doc/html/webkitgtk/index-1.0.3.html -share/gtk-doc/html/webkitgtk/index-1.1.1.html -share/gtk-doc/html/webkitgtk/index-1.1.10.html -share/gtk-doc/html/webkitgtk/index-1.1.11.html -share/gtk-doc/html/webkitgtk/index-1.1.13.html -share/gtk-doc/html/webkitgtk/index-1.1.14.html -share/gtk-doc/html/webkitgtk/index-1.1.15.html -share/gtk-doc/html/webkitgtk/index-1.1.16.html -share/gtk-doc/html/webkitgtk/index-1.1.17.html -share/gtk-doc/html/webkitgtk/index-1.1.18.html -share/gtk-doc/html/webkitgtk/index-1.1.2.html -share/gtk-doc/html/webkitgtk/index-1.1.20.html -share/gtk-doc/html/webkitgtk/index-1.1.23.html -share/gtk-doc/html/webkitgtk/index-1.1.3.html -share/gtk-doc/html/webkitgtk/index-1.1.4.html -share/gtk-doc/html/webkitgtk/index-1.1.5.html -share/gtk-doc/html/webkitgtk/index-1.1.6.html -share/gtk-doc/html/webkitgtk/index-1.1.7.html -share/gtk-doc/html/webkitgtk/index-1.1.8.html -share/gtk-doc/html/webkitgtk/index-1.3.1.html -share/gtk-doc/html/webkitgtk/index-1.3.2.html -share/gtk-doc/html/webkitgtk/index-1.3.3.html -share/gtk-doc/html/webkitgtk/index-1.3.4.html -share/gtk-doc/html/webkitgtk/index-1.3.8.html -share/gtk-doc/html/webkitgtk/index-all.html -share/gtk-doc/html/webkitgtk/index-deprecated.html -share/gtk-doc/html/webkitgtk/index.html -share/gtk-doc/html/webkitgtk/index.sgml -share/gtk-doc/html/webkitgtk/left.png -share/gtk-doc/html/webkitgtk/right.png -share/gtk-doc/html/webkitgtk/style.css -share/gtk-doc/html/webkitgtk/up.png -share/gtk-doc/html/webkitgtk/webkit-environment.html -share/gtk-doc/html/webkitgtk/webkitgtk-Global-functions.html -share/gtk-doc/html/webkitgtk/webkitgtk-webkitdownload.html -share/gtk-doc/html/webkitgtk/webkitgtk-webkitwebview.html -share/gtk-doc/html/webkitgtk/webkitgtk.devhelp2 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 diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 27353b9b722..38e750d0a8d 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2012/05/06 17:06:37 marino Exp $ +$NetBSD: distinfo,v 1.50 2012/07/06 14:03:50 drochner Exp $ SHA1 (webkit-1.8.1.tar.xz) = d26543baace03c31aa3de82bc24f06f14c6b3052 RMD160 (webkit-1.8.1.tar.xz) = ebe10f63e2c514be13c7b61172b11c418d0ca0ff @@ -9,5 +9,5 @@ SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f056b8f08c68d44e1b9dfd2bcf6 SHA1 (patch-ai) = 7b94becb603b88c66d8d8f1619d90dc6553d970c SHA1 (patch-aj) = 857bd0111fc6dee35dcf83523ff2438ed71981b7 SHA1 (patch-ak) = 62135a6e242c2e9c2e8be2d2d00fa1021f9c9525 -SHA1 (patch-al) = 3c9749547acd59e42b0390e9a94fd4484d2af7f4 +SHA1 (patch-al) = 47a931be9ccd0669d77b6e60d5fd098c8d3667ab SHA1 (patch-configure) = 5f805583b6292d61a7b13cbf6d35d864774e4cd8 diff --git a/www/webkit-gtk/patches/patch-al b/www/webkit-gtk/patches/patch-al index f2f4744c759..e97eeebe292 100644 --- a/www/webkit-gtk/patches/patch-al +++ b/www/webkit-gtk/patches/patch-al @@ -1,8 +1,17 @@ -$NetBSD: patch-al,v 1.1 2012/04/28 14:12:16 drochner Exp $ +$NetBSD: patch-al,v 1.2 2012/07/06 14:03:50 drochner Exp $ ---- GNUmakefile.in.orig 2012-04-26 18:01:39.000000000 +0000 +--- GNUmakefile.in.orig 2012-04-24 05:17:27.000000000 +0000 +++ GNUmakefile.in -@@ -74082,7 +74082,7 @@ install-data-local: +@@ -74042,6 +74042,8 @@ doc-maintainer-clean-local: clean + -@rmdir Documentation + + install-data-local: ++ ++xinstall-data-local: + @installfiles=`echo ./Documentation/webkitgtk/html/*`; \ + if test "$$installfiles" = './Documentation/webkitgtk/html/*'; \ + then echo 1>&2 'No documentation to install' ; \ +@@ -74082,7 +74084,7 @@ install-data-local: @ENABLE_WEBKIT2_TRUE@ $${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \ @ENABLE_WEBKIT2_TRUE@ fi; \ @ENABLE_WEBKIT2_TRUE@ fi |