From 3990db515ab66d435490fd88d1bbdbe87b1db8a6 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 16 Nov 2011 19:56:36 +0000 Subject: update to 0.4.2 changes: -bookmark dialog crashes are fixed -faster, base64-based CSS support -Speed dial received a makeover -Cookies are stored in an sqlite3 database -more of subtle tweaks and improvements --- www/midori/Makefile | 11 +++++------ www/midori/PLIST | 7 ++++--- www/midori/distinfo | 10 +++++----- www/midori/patches/patch-aa | 17 +++++------------ 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/www/midori/Makefile b/www/midori/Makefile index 62a505bc311..861a2745178 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2011/11/01 06:02:47 sbd Exp $ +# $NetBSD: Makefile,v 1.35 2011/11/16 19:56:36 drochner Exp $ -DISTNAME= midori-0.4.1 -PKGREVISION= 1 +DISTNAME= midori-0.4.2 CATEGORIES= www MASTER_SITES= http://archive.xfce.org/src/apps/midori/0.4/ @@ -34,9 +33,9 @@ CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search .include "../../mk/bsd.prefs.mk" -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so -CONF_FILES+= ${EGDIR}/extensions/libadblock.so/config \ - ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config +OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock +CONF_FILES+= ${EGDIR}/extensions/adblock/config \ + ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config # XXX stupid hack. python has a marshal.h that gets included before # the local marshal.h diff --git a/www/midori/PLIST b/www/midori/PLIST index b2449e83c4f..781ccc4a112 100644 --- a/www/midori/PLIST +++ b/www/midori/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2011/10/18 16:14:44 drochner Exp $ +@comment $NetBSD: PLIST,v 1.20 2011/11/16 19:56:36 drochner Exp $ bin/midori include/midori-0.4/extensions/history-list.h lib/midori/libadblock.so @@ -26,7 +26,7 @@ share/doc/midori/EXPAT share/doc/midori/README share/doc/midori/faq.css share/doc/midori/faq.html -share/examples/midori/extensions/libadblock.so/config +share/examples/midori/extensions/adblock/config share/examples/midori/search share/icons/hicolor/16x16/apps/midori.png share/icons/hicolor/16x16/categories/extension.png @@ -86,8 +86,9 @@ share/locale/zh_CN/LC_MESSAGES/midori.mo share/locale/zh_TW/LC_MESSAGES/midori.mo share/midori/res/autosuggestcontrol.css share/midori/res/autosuggestcontrol.js +share/midori/res/close.png share/midori/res/error.html share/midori/res/logo-shade.png -share/midori/res/speeddial-head.html +share/midori/res/speeddial-head-0.4.2.html share/vala/vapi/history-list.deps share/vala/vapi/history-list.vapi diff --git a/www/midori/distinfo b/www/midori/distinfo index a080e1e73c0..1248f8da75e 100644 --- a/www/midori/distinfo +++ b/www/midori/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.16 2011/10/18 16:14:44 drochner Exp $ +$NetBSD: distinfo,v 1.17 2011/11/16 19:56:36 drochner Exp $ -SHA1 (midori-0.4.1.tar.bz2) = 0c499459b1049feabf86dce89f49020139a9efd9 -RMD160 (midori-0.4.1.tar.bz2) = 5eb2f8007d616f468517a6ca4acc3a3878e961b2 -Size (midori-0.4.1.tar.bz2) = 905412 bytes -SHA1 (patch-aa) = 4c3f5f1c248a871e73c6eaf51f9d9259e02d1e6a +SHA1 (midori-0.4.2.tar.bz2) = fac3dc4bb8935f35b38ffc4d6c7a5daba9dc52f1 +RMD160 (midori-0.4.2.tar.bz2) = ca16f66bafa4dcb49b0cfbcef9900cee94a0066b +Size (midori-0.4.2.tar.bz2) = 923897 bytes +SHA1 (patch-aa) = e776d3d8199441b42fd13e1b90072387b44ac8a5 diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa index edc6e350ae7..fbc4f548cf7 100644 --- a/www/midori/patches/patch-aa +++ b/www/midori/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2011/04/08 20:02:13 drochner Exp $ +$NetBSD: patch-aa,v 1.7 2011/11/16 19:56:36 drochner Exp $ ---- wscript.orig 2011-03-13 22:03:35.000000000 +0000 +--- wscript.orig 2011-11-10 23:21:06.000000000 +0000 +++ wscript -@@ -407,7 +407,7 @@ def build (bld): +@@ -439,7 +439,7 @@ def build (bld): 'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css') # Install default configuration @@ -11,19 +11,12 @@ $NetBSD: patch-aa,v 1.6 2011/04/08 20:02:13 drochner Exp $ if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_po') -@@ -481,13 +481,13 @@ def build (bld): - if os.path.exists (source): - bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \ - '/extensions/' + folder, source) -- elif Options.platform == 'linux': -+ elif 1: - extensions = os.listdir ('data/extensions') +@@ -511,7 +511,7 @@ def build (bld): for extension in extensions: - folder = 'lib' + extension + '.so' source = 'data/extensions/' + extension + '/config' if os.path.exists (source): - bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \ + bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + \ - '/extensions/' + folder, source) + '/extensions/' + extension, source) if Options.commands['check'] or bld.env['tests']: -- cgit v1.2.3