diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-26 17:44:16 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-26 17:44:16 +0800 |
| commit | d65aa5b20ecf9d085edd5f95a97fab05b8daec24 (patch) | |
| tree | fdcb69c8a037255d8c6d45d4d067cd5d4c93c892 | |
| parent | 4da51062d79b3994f33d2b47288c9a615d4f8d6d (diff) | |
| download | marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.gz marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.bz2 marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.lz marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.xz marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.zst marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.zip | |
Update to 34130
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10981 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | www/webkit-gtk2/Makefile | 10 | ||||
| -rw-r--r-- | www/webkit-gtk2/distinfo | 6 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp | 11 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp | 10 |
4 files changed, 18 insertions, 19 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index b02670148..c1bad5846 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD: ports/www/webkit-gtk2/Makefile,v 1.2 2008/03/31 10:33:05 ahze Exp $ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.12 2008/04/07 23:08:03 ahze Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.13 2008/04/21 13:47:47 ahze Exp $ # PORTNAME= webkit -PORTVERSION= 0.0.32284 +PORTVERSION= 0.0.34130 CATEGORIES= www MASTER_SITES= http://nightly.webkit.org/files/trunk/src/ PKGNAMESUFFIX= -gtk2 @@ -39,7 +39,7 @@ CONFIGURE_ARGS= --with-webkit-target=x11 \ MAKEFILE= GNUmakefile BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins -_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", +#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", .include <bsd.port.pre.mk> @@ -48,8 +48,8 @@ IGNORE= Does not build .endif post-patch: - @${REINPLACE_CMD} -e 's|%%_BROWSER_PLUGINS_DIR%%|${_BROWSER_PLUGINS_DIR}|' \ - ${WRKSRC}/WebCore/plugins/gtk/PluginDatabaseGtk.cpp + @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ + ${WRKSRC}/WebCore/plugins/PluginDatabase.cpp @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \ s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \ s|autoheader|${AUTOHEADER}|g ; \ diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index 9aec3fa95..6318cfdef 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (WebKit-r32284.tar.bz2) = 2fc44fa78bd7becd6688550a260f78f7 -SHA256 (WebKit-r32284.tar.bz2) = e96a58c5947af01c15f7a1fde032efd8d5d585ed3c7d16f5c9c1f8a50eb83ceb -SIZE (WebKit-r32284.tar.bz2) = 9993218 +MD5 (WebKit-r34130.tar.bz2) = f5fb96a2ac7ee381a7dd895d055bd3a1 +SHA256 (WebKit-r34130.tar.bz2) = df9a97db802b5d62bfd6ced9cd0bbca41c51e477e181c3fe103e85181c580386 +SIZE (WebKit-r34130.tar.bz2) = 9207920 diff --git a/www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp b/www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp deleted file mode 100644 index c27e6365a..000000000 --- a/www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- WebCore/plugins/gtk/PluginDatabaseGtk.cpp.orig 2008-04-18 04:00:55.000000000 -0400 -+++ WebCore/plugins/gtk/PluginDatabaseGtk.cpp 2008-04-21 08:15:45.665667131 -0400 -@@ -75,7 +75,7 @@ - g_strfreev(pluginPaths); - } - -- directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", NULL); -+ directory = g_build_filename(G_DIR_SEPARATOR_S %%_BROWSER_PLUGINS_DIR%% NULL); - directories.append(directory); - g_free(directory); - directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "local", "lib", "mozilla", "plugins", NULL); diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp new file mode 100644 index 000000000..8dddf2475 --- /dev/null +++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp @@ -0,0 +1,10 @@ +--- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700 ++++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700 +@@ -281,6 +281,7 @@ + userPluginPath.append(String("/.netscape/plugins")); + paths.append(userPluginPath); + ++ paths.append("%%BROWSER_PLUGINS"); + paths.append("/usr/lib/browser/plugins"); + paths.append("/usr/local/lib/mozilla/plugins"); + paths.append("/usr/lib/firefox/plugins"); |