[med-svn] [hisat2] 02/05: fix build on kFreeBSD

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository hisat2.

commit fae0164d45b03cbd6170dd6c06015e78c9251b6a
Author: Sascha Steinbiss <satta at debian.org>
Date:   Thu Aug 25 15:52:26 2016 +0000

    fix build on kFreeBSD
---
 debian/changelog           |  2 ++
 debian/patches/fix-freebsd | 16 ++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a62d3c6..9ead53d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ hisat2 (2.0.4-2) unstable; urgency=medium
 
   * Team upload.
   * Fix Vcs-Git.
+  * Fix build on kFreeBSD. Thanks to Steven Chamberlain for the patch.
+    Closes: #834864
 
  -- Sascha Steinbiss <satta at debian.org>  Thu, 25 Aug 2016 15:46:42 +0000
 
diff --git a/debian/patches/fix-freebsd b/debian/patches/fix-freebsd
new file mode 100644
index 0000000..7f80bc0
--- /dev/null
+++ b/debian/patches/fix-freebsd
@@ -0,0 +1,16 @@
+Description: Identify *freebsd as a UNIX-like OS
+ Match "gnukfreebsd" or "freebsd", when assigning $os_is_nix. Fixes
+ build on *FreeBSD.
+Author: Steven Chamberlain <stevenc at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=834864
+--- a/hisat2
++++ b/hisat2
+@@ -45,7 +45,7 @@
+ 
+ ($vol,$script_path,$prog) 
+                 = File::Spec->splitpath($prog);
+-my $os_is_nix   = ($^O eq "linux") || ($^O eq "darwin");
++my $os_is_nix   = ($^O eq "linux") || ($^O eq "darwin") || ($^O =~ /freebsd$/);
+ my $align_bin_s = $os_is_nix ? 'hisat2-align-s' : 'hisat2-align-s.exe'; 
+ my $build_bin   = $os_is_nix ? 'hisat2-build' : 'hisat2-build.exe';               
+ my $align_bin_l = $os_is_nix ? 'hisat2-align-l' : 'hisat2-align-l.exe'; 
diff --git a/debian/patches/series b/debian/patches/series
index 7b63eaf..1582912 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardening
 reproducibile
+fix-freebsd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hisat2.git