Merge branch 'master' of github.com:OCamlPro/opam

OCamlPro · Feb 19, 2013 · 8a1ad9c · 8a1ad9c
2 parents cbe3ae2 + af597a5
commit 8a1ad9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/core/opamGlobals.ml b/src/core/opamGlobals.ml
@@ -108,6 +108,8 @@ type os =
   | Linux
   | FreeBSD
   | OpenBSD
+  | NetBSD
+  | DragonFly
   | Cygwin
   | Win32
   | Unix
@@ -125,6 +127,8 @@ let os () =
           | Some "Linux"   -> Linux
           | Some "FreeBSD" -> FreeBSD
           | Some "OpenBSD" -> OpenBSD
+          | Some "NetBSD" -> NetBSD
+          | Some "DragonFly" -> DragonFly
           | _              -> Unix
         end
       | "Win32"  -> Win32
@@ -138,7 +142,9 @@ let string_of_os = function
   | Darwin  -> "darwin"
   | Linux   -> "linux"
   | FreeBSD
-  | OpenBSD -> "bsd"
+  | OpenBSD
+  | NetBSD
+  | DragonFly -> "bsd"
   | Cygwin  -> "cygwin"
   | Win32   -> "win32"
   | Unix    -> "unix"
@@ -150,7 +156,9 @@ let os_string () =
 let makecmd = ref (fun () ->
   match os () with
   | FreeBSD
-  | OpenBSD -> "gmake"
+  | OpenBSD
+  | NetBSD
+  | DragonFly -> "gmake"
   | _ -> "make"
 )
 

diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
@@ -483,7 +483,7 @@ let patch p =
     let opts = if dryrun then
         let open OpamGlobals in
         match OpamGlobals.os () with
-        | FreeBSD | OpenBSD     -> [ "-t"; "-C" ]
+        | FreeBSD | OpenBSD | NetBSD | DragonFly -> [ "-t"; "-C" ]
         | Unix | Linux | Darwin -> [ "--dry-run" ]
         | Win32 | Cygwin (* this is probably broken *)
         | Other _               -> [ "--dry-run" ]