Index: branches/2014Q1/www/midori/Makefile
===================================================================
--- branches/2014Q1/www/midori/Makefile	(revision 342577)
+++ branches/2014Q1/www/midori/Makefile	(revision 342578)
@@ -1,87 +1,87 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	midori
 PORTVERSION=	0.5.6
 CATEGORIES=	www xfce
-MASTER_SITES=	http://www.midori-browser.org/downloads/
-DISTNAME=	${PORTNAME}_${PORTVERSION}_all_
+MASTER_SITES=	https://launchpadlibrarian.net/156972992/ \
+	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Lightweight web browser using WebKit browser engine
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
 		valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	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
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS=	-DUSE_GRANITE:BOOL=OFF \
 	-DUSE_GCR:BOOL=OFF
 
 WRKSRC=	${WRKDIR}/${DISTNAME:C/([a-z]*)_([0-9\.]*)(_all_)/\1-\2/}
 USE_BZIP2=	yes
 USE_GNOME=	glib20 intltool libxml2
 USE_XORG=	xscrnsaver
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USES=		desktop-file-utils pkgconfig cmake gettext
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
 OPTIONS_DEFINE=	DOCS ZEITGEIST
 OPTIONS_SINGLE=	GTK
 OPTIONS_SINGLE_GTK=	GTK2 GTK3
 OPTIONS_DEFAULT=	GTK2
 ZEITGEIST_DESC=	User logs activities
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
 LIB_DEPENDS+=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 USE_GNOME+=	gtk20
 CMAKE_ARGS+=	-DUSE_GTK3:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
 LIB_DEPENDS+=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
 USE_GNOME+=	gtk30
 CMAKE_ARGS+=	-DUSE_GTK3:BOOL=ON
 
 # Support the new WebKit2 API (>= 1.11.91)
 .if exists(${LOCALBASE}/libdata/pkgconfig/webkit2gtk-3.0.pc)
 CMAKE_ARGS+=	-DHALF_BRO_INCOM_WEBKIT2:BOOL=ON
 .else
 CMAKE_ARGS+=	-DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc
 CMAKE_ARGS+=	-DUSE_APIDOCS:BOOL=ON
 PLIST_SUB+=	APIDOCS=""
 .else
 CMAKE_ARGS+=	-DUSE_APIDOCS:BOOL=OFF
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MZEITGEIST}
 LIB_DEPENDS+=	libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist
 CMAKE_ARGS+=	-DUSE_ZEITGEIST:BOOL=ON
 .else
 CMAKE_ARGS+=	-DUSE_ZEITGEIST:BOOL=OFF
 .endif
 
 post-patch:
 # Avoid errors with CMake
 .for dir in config extensions
 	@cd ${WRKSRC} && ${RM} ${dir}/*.orig
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2014Q1/www/midori/distinfo
===================================================================
--- branches/2014Q1/www/midori/distinfo	(revision 342577)
+++ branches/2014Q1/www/midori/distinfo	(revision 342578)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori_0.5.6_all_.tar.bz2) = c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
-SIZE (xfce4/midori_0.5.6_all_.tar.bz2) = 1194529
+SHA256 (xfce4/midori-0.5.6.tar.bz2) = c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
+SIZE (xfce4/midori-0.5.6.tar.bz2) = 1194529
Index: branches/2014Q1/www/midori/files/patch-extensions__CMakeLists.txt
===================================================================
--- branches/2014Q1/www/midori/files/patch-extensions__CMakeLists.txt	(revision 342577)
+++ branches/2014Q1/www/midori/files/patch-extensions__CMakeLists.txt	(revision 342578)
@@ -1,16 +1,18 @@
---- ./extensions/CMakeLists.txt.orig	2013-09-17 10:59:53.000000000 +0000
-+++ ./extensions/CMakeLists.txt	2013-09-17 14:46:05.000000000 +0000
-@@ -24,6 +24,13 @@
+--- ./extensions/CMakeLists.txt.orig	2013-11-20 01:26:52.000000000 +0000
++++ ./extensions/CMakeLists.txt	2014-01-02 16:00:24.000000000 +0000
+@@ -24,6 +24,15 @@
           "nsplugin-manager.vala"
           )
  endif ()
 +string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
-+string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
++if (${BEGIN} GREATER 0)
++    string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
++endif ()
 +if (BSD)
 +    list(REMOVE_ITEM EXTENSIONS
 +         "devpet.vala"
 +         )
 +endif ()
  
  foreach(UNIT_SRC ${EXTENSIONS})
      string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)