4 files changed, 22 insertions, 25 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index feedbd4d0363..e37ac630dc79 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	midori
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	www xfce
 MASTER_SITES=	http://www.midori-browser.org/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_all_
@@ -12,15 +13,13 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Lightweight web browser using WebKit browser engine
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
 		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	webkitgtk-1:${PORTSDIR}/www/webkit-gtk2 \
-		sqlite3:${PORTSDIR}/databases/sqlite3 \
-		notify:${PORTSDIR}/devel/libnotify \
-		soup-gnome-2:${PORTSDIR}/devel/libsoup-gnome \
-		execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
+		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+		libnotify.so:${PORTSDIR}/devel/libnotify \
+		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/midori/files/patch-extensions__wscript_build b/www/midori/files/patch-extensions__wscript_build
new file mode 100644
index 000000000000..4d4e628cbc63
--- /dev/null
+++ b/www/midori/files/patch-extensions__wscript_build
@@ -0,0 +1,15 @@
+--- ./extensions/wscript_build.orig	2013-08-14 18:32:02.000000000 +0000
++++ ./extensions/wscript_build	2013-09-17 17:55:12.000000000 +0000
+@@ -4,8 +4,12 @@
+ 
+ import Options
+ import os
++import sys
+ 
+ extensions = os.listdir ('extensions')
++if 'bsd' in sys.platform:
++    if 'devpet.vala' in extensions:
++        extensions.remove('devpet.vala')
+ for extension in extensions:
+     # FIXME In the absense of a proper mechanism, transfers is a stock extension
+     if not bld.env['addons'] and extension != 'transfers.vala':
diff --git a/www/midori/files/patch-wscript b/www/midori/files/patch-wscript
index a2f2f5a5f99b..c6e25929e1df 100644
--- a/www/midori/files/patch-wscript
+++ b/www/midori/files/patch-wscript
@@ -1,9 +1,5 @@
-- Fix PACKAGE_VERSION in gtk_about_dialog_widget (bug #1200903).
-- Check if execinfo.h header is found (bug #1212761).
-- Add test to avoid installing .orig files (for config/search).
-
 --- ./wscript.orig	2013-08-14 18:32:02.000000000 +0000
-+++ ./wscript	2013-08-15 19:05:48.000000000 +0000
++++ ./wscript	2013-09-17 19:23:37.000000000 +0000
 @@ -29,7 +29,6 @@
  
  APPNAME = 'midori'
@@ -25,16 +21,7 @@
  except:
      pass
  
-@@ -234,6 +235,8 @@
-         conf.check (header_name='X11/extensions/scrnsaver.h',
-                     includes='/usr/X11R6/include', mandatory=False)
-         conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False)
-+        # Check if execinfo.h header is found
-+        conf.check (header_name='execinfo.h', mandatory=True)
- 
-     have_gtk3 = option_enabled ('gtk3') or option_enabled ('webkit2') or option_enabled ('granite')
-     if have_gtk3:
-@@ -530,15 +533,16 @@
+@@ -530,15 +531,16 @@
  
      for config_file in os.listdir ('config'):
          dest = '${SYSCONFDIR}/xdg/' + APPNAME
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index 2b047058c1fa..80f52708b205 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -3,7 +3,6 @@ etc/xdg/midori/extensions/adblock/config
 etc/xdg/midori/search
 include/midori-%%VERSION%%/extensions/apps.h
 include/midori-%%VERSION%%/extensions/delayed-load.h
-include/midori-%%VERSION%%/extensions/devpet.h
 include/midori-%%VERSION%%/extensions/external-download-manager.h
 include/midori-%%VERSION%%/extensions/history-list.h
 include/midori-%%VERSION%%/extensions/nsplugin-manager.h
@@ -16,7 +15,6 @@ lib/midori/libcookie-manager.so
 lib/midori/libcookie-permissions.so
 lib/midori/libcopy-tabs.so
 lib/midori/libdelayed-load.so
-lib/midori/libdevpet.so
 lib/midori/libexternal-download-manager.so
 lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
@@ -183,8 +181,6 @@ share/vala/vapi/apps.deps
 share/vala/vapi/apps.vapi
 share/vala/vapi/delayed-load.deps
 share/vala/vapi/delayed-load.vapi
-share/vala/vapi/devpet.deps
-share/vala/vapi/devpet.vapi
 share/vala/vapi/external-download-manager.deps
 share/vala/vapi/external-download-manager.vapi
 share/vala/vapi/history-list.deps