Merge lp:~midori/midori/dragonFlySupport into lp:midori

[Cris Dywan]

Add support of DragonFlyBSD

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-15 19:12:32 +0000
+++ CMakeLists.txt	2014-02-18 21:17:51 +0000
@@ -89,6 +89,11 @@
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_FREEBSD)
 endif ()
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_DRAGONFLY)
+    set(DFLY 1)
+endif ()
+
 if (APPLE)
     add_definitions("-DHAVE_OSX=1")
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_OSX)
@@ -103,7 +108,7 @@
 else()
     set(BSD 0)
 endif()
-if (UNIX AND NOT BSD)
+if (UNIX AND NOT BSD AND NOT DFLY)
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_EXECINFO_H)
 endif ()
 

=== modified file 'extensions/external-download-manager.vala'
--- extensions/external-download-manager.vala	2013-05-26 18:18:40 +0000
+++ extensions/external-download-manager.vala	2014-02-18 21:17:51 +0000
@@ -311,7 +311,7 @@
         internal CommandLine () {
 #if HAVE_WIN32
             string default_commandline = "\"%s\\FlashGet\\flashget.exe\" {URL}".printf (Environment.get_variable ("ProgramFiles"));
-#elif HAVE_FREEBSD
+#elif HAVE_FREEBSD || HAVE_DRAGONFLY
             string default_commandline = "fetch HTTP_REFERER={REFERER} {URL}";
 #else
             string default_commandline = "wget --no-check-certificate --referer={REFERER} --header={COOKIES} {URL}";