diff --git a/www/midori/Makefile b/www/midori/Makefile index 90ab54c3c2d..ce6a5371037 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.47 2012/04/16 10:08:43 landry Exp $ +# $OpenBSD: Makefile,v 1.48 2012/04/16 21:10:06 landry Exp $ COMMENT = lightweight web browser XFCE_VERSION = 0.4.5 XFCE_GOODIE = midori +REVISION = 0 MAINTAINER = Landry Breuil CATEGORIES = www diff --git a/www/midori/patches/patch-wscript b/www/midori/patches/patch-wscript index 4978a5da762..a30cd93d3ac 100644 --- a/www/midori/patches/patch-wscript +++ b/www/midori/patches/patch-wscript @@ -1,9 +1,11 @@ -$OpenBSD: patch-wscript,v 1.20 2012/04/16 10:08:43 landry Exp $ +$OpenBSD: patch-wscript,v 1.21 2012/04/16 21:10:06 landry Exp $ Fix paths to config files. +chunk 2 : fix libsoup detection defines +http://git.xfce.org/apps/midori/commit/?id=c7c172f7ffc9316be5954c920654e1deb9f470b7 --- wscript.orig Sat Apr 14 21:17:35 2012 -+++ wscript Sun Apr 15 11:43:17 2012 ++++ wscript Mon Apr 16 23:01:15 2012 @@ -73,7 +73,7 @@ def rc_file(self, node): self.compiled_tasks.append (rctask) rc_file = extension ('.rc')(rc_file) @@ -13,6 +15,21 @@ Fix paths to config files. def configure (conf): def option_checkfatal (option, desc): +@@ -260,11 +260,11 @@ def configure (conf): + check_pkg ('libsoup-2.4', '2.27.90') + conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): +- conf.define ('LIBSOUP_2_29_3', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_3', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): +- conf.define ('LIBSOUP_2_29_91', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_91', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): +- conf.define ('LIBSOUP_2_37_1', 1) ++ conf.define ('HAVE_LIBSOUP_2_37_1', 1) + check_pkg ('libxml-2.0', '2.6') + check_pkg ('sqlite3', '3.0', True, var='SQLITE') + @@ -459,7 +459,7 @@ def build (bld): 'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')