pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ncbi-blast+: Fix configure patch, disable REPLACE_BASH



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Apr 27 09:21:26 2018 -0500
Changeset:	b11800446011a9a2681e737b0e96e89a2b53deac

Modified Files:
	ncbi-blast+/Makefile
	ncbi-blast+/distinfo
	ncbi-blast+/patches/patch-compilers_xcode30__prj_configure

Log Message:
ncbi-blast+: Fix configure patch, disable REPLACE_BASH

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b11800446011a9a2681e737b0e96e89a2b53deac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ncbi-blast+/Makefile                                       |  2 +-
 ncbi-blast+/distinfo                                       |  2 +-
 ncbi-blast+/patches/patch-compilers_xcode30__prj_configure | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/ncbi-blast+/Makefile b/ncbi-blast+/Makefile
index 2e243d716b..6495f4ab9d 100644
--- a/ncbi-blast+/Makefile
+++ b/ncbi-blast+/Makefile
@@ -23,7 +23,7 @@ SUBST_FILES.configure+=	${WRKSRC}/src/build-system/configure
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
-REPLACE_BASH=	compilers/xcode30_prj/configure
+# REPLACE_BASH=	compilers/xcode30_prj/configure
 REPLACE_PERL=	src/app/blast/legacy_blast.pl src/app/blast/update_blastdb.pl
 REPLACE_PYTHON=	src/app/winmasker/windowmasker_2.2.22_adapter.py
 
diff --git a/ncbi-blast+/distinfo b/ncbi-blast+/distinfo
index 2f28dd2490..cafc10e425 100644
--- a/ncbi-blast+/distinfo
+++ b/ncbi-blast+/distinfo
@@ -4,7 +4,7 @@ SHA1 (ncbi-blast-2.7.1+-src.tar.gz) = d04a25f01c386abd8515957a2ce1dabf376743f8
 RMD160 (ncbi-blast-2.7.1+-src.tar.gz) = 7277419e16fb215aae4136a16e13bec963b70cbd
 SHA512 (ncbi-blast-2.7.1+-src.tar.gz) = e4b3914f51165ae4c82051068ed9d3470687a4e0f1df6274018c0ba14b241666a570d72265c7d167b8ce2a9075652744244a00e3e95c00c4252da0fbd80d17c6
 Size (ncbi-blast-2.7.1+-src.tar.gz) = 23254824 bytes
-SHA1 (patch-compilers_xcode30__prj_configure) = c7d1a489176853663ccc7354796fb490d69ead91
+SHA1 (patch-compilers_xcode30__prj_configure) = b89b3be8671c6c692ba474476879ee67a76fdbe5
 SHA1 (patch-src_algo_blast_core_blast__kappa.c) = a580a5fb2d5a3af04c27dd63a7edd349b7ae1be7
 SHA1 (patch-src_build-system_Makefile.in.top) = 71d5246867a8c985c1175c338fb0af664094ca01
 SHA1 (patch-src_build-system_cmake_cmake-configure) = 7b9a10447b1dd665200ee73a2180b3210f586b97
diff --git a/ncbi-blast+/patches/patch-compilers_xcode30__prj_configure b/ncbi-blast+/patches/patch-compilers_xcode30__prj_configure
index 0d69fa8b8c..7697a06653 100644
--- a/ncbi-blast+/patches/patch-compilers_xcode30__prj_configure
+++ b/ncbi-blast+/patches/patch-compilers_xcode30__prj_configure
@@ -1,15 +1,15 @@
 $NetBSD$
 
-# Fix portibility
+# Nonportable extension
 
---- compilers/xcode30_prj/configure.orig	2018-03-26 14:12:13.368983690 +0000
+--- compilers/xcode30_prj/configure.orig	2018-04-27 14:19:43.000000000 +0000
 +++ compilers/xcode30_prj/configure
-@@ -1,2 +1,2 @@
--#!/bin/sh
-+/bin/bash: indent: command not found
+@@ -280,7 +280,7 @@ arch=`arch`
+ platform=`xcodebuild -version 2>/dev/null | grep 'Xcode [0-9][0-9]*' | sed -e 's/[ .]//g'`
  
-@@ -282,3 +282,3 @@ platform=`xcodebuild -version 2>/dev/nul
  # ------- target architecture
 -if test "$use_64" == "yes"; then
 +if test "$use_64" = "yes"; then
    use_arch="x86_64"
+ else
+   use_arch="i386"


Home | Main Index | Thread Index | Old Index