1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

biology/ncbi-blast+: Upgrade to 2.7.1

Patch Makefile.in.top to cleanly support DESTDIR

Also resolves 225002, conflict with libproj

PR:             226037
Reported by:    wen
Reviewed by:    mat rene
Approved by:    jrm
Differential Revision:  https://reviews.freebsd.org/D14854
This commit is contained in:
Jason W. Bacon 2018-03-27 18:04:21 +00:00
parent 099e97d4b1
commit 9053d41234
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465726
6 changed files with 409 additions and 377 deletions

View File

@ -1,12 +1,10 @@
# $FreeBSD$
PORTNAME= blast+
PORTVERSION= 2.5.0
PORTREVISION= 3
CATEGORIES= biology
MASTER_SITES= http://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/ \
http://acadix.biz/Ports/distfiles/
PKGNAMEPREFIX= ncbi-
PORTNAME= ncbi-blast+
DISTVERSION= 2.7.1
CATEGORIES= biology perl5 python
MASTER_SITES= https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
DISTNAME= ncbi-blast-${PORTVERSION}+-src
MAINTAINER= jwb@FreeBSD.org
@ -15,43 +13,55 @@ COMMENT= NCBI implementation of Basic Local Alignment Search Tool
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/scripts/projects/blast/LICENSE
LIB_DEPENDS= libpcre.so:devel/pcre
LIB_DEPENDS= libpcre.so:devel/pcre \
liblmdb.so:databases/lmdb \
liblzo2.so:archivers/lzo2 \
libgnutls.so:security/gnutls \
libtspi.so:security/trousers \
libgmp.so:math/gmp \
libidn2.so:dns/libidn2 \
libnettle.so:security/nettle \
libhogweed.so:security/nettle \
libtasn1.so:security/libtasn1 \
libp11-kit.so:security/p11-kit \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
libsqlite3.so:databases/sqlite3
RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
WRKSRC= ${WRKDIR}/${DISTNAME}/c++
GNU_CONFIGURE= yes
USES= gmake shebangfix perl5 python
USES= compiler:openmp gmake shebangfix perl5 python
SHEBANG_FILES= src/app/blast/legacy_blast.pl \
src/app/blast/update_blastdb.pl \
src/app/winmasker/windowmasker_2.2.22_adapter.py
MAKE_JOBS_UNSAFE= yes
# Requires openmp
USE_GCC= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
# The test for amq can hang, but amq is not needed so just avoid the test
CONFIGURE_ENV= ncbi_cv_prog_amq_w=no
# configure chooses /usr/local/bin/ar with no flags
# FreeBSD boost port flagged by configure as untested version
CONFIGURE_ARGS+=AR="ar cr" --without-boost
# --libdir=${PREFIX}/lib/ncbi-tools++ doesn't respect DESTDIR, so do
# a postinstall mv.
CONFIGURE_ARGS+= AR="ar cr" --without-boost --libdir=${PREFIX}/lib/ncbi-tools++
WRKSRC_SUBDIR= c++
MAKE_JOBS_UNSAFE= yes
# Fix "undefined _ThreadRuneLocale" error on 10.0
# Fix unknown options in configure
# Add staging support to configure-generated Makefile
post-patch:
${REINPLACE_CMD} \
@${REINPLACE_CMD} \
-e 's|-D_THREAD_SAFE|-D_THREAD_SAFE -D__RUNETYPE_INTERNAL|' \
-e '/--infodir=DIR/d' \
-e '/--mandir=DIR/d' \
${WRKSRC}/src/build-system/configure
${REINPLACE_CMD} -e 's|@prefix@|${STAGEDIR}@prefix@|g' \
${WRKSRC}/src/build-system/Makefile.in.top
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
@${RM} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/*/*/.cvsignore.extra
@${RM} -rf ${STAGEDIR}${PREFIX}/lib/X11
@${RMDIR} ${STAGEDIR}${PREFIX}/lib/debug
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ncbi-tools++/*.so
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1480648908
SHA256 (ncbi-blast-2.5.0+-src.tar.gz) = cce122a29d309127a478353856b351914232e78a9546941781ff0a4c18ec9c54
SIZE (ncbi-blast-2.5.0+-src.tar.gz) = 19938544
TIMESTAMP = 1518995346
SHA256 (ncbi-blast-2.7.1+-src.tar.gz) = 10a78d3007413a6d4c983d2acbf03ef84b622b82bd9a59c6bd9fbdde9d0298ca
SIZE (ncbi-blast-2.7.1+-src.tar.gz) = 23254824

View File

@ -1,11 +1,32 @@
--- src/build-system/Makefile.in.top.orig 2014-11-13 01:41:55.000000000 +0900
+++ src/build-system/Makefile.in.top 2016-12-02 16:39:58.415910000 +0900
@@ -51,7 +51,7 @@
--- src/build-system/Makefile.in.top.orig 2018-03-27 03:40:40 UTC
+++ src/build-system/Makefile.in.top
@@ -37,21 +37,21 @@ check: $(PROJECTS)
fi
install-toolkit:
- -$(RMDIR) $(pincludedir)
- $(INSTALL) -d $(bindir) $(libdir) $(pincludedir)
- $(INSTALL) $(lbindir)/* $(bindir)
- $(INSTALL) -m 644 $(llibdir)/*.* $(libdir)
+ -$(RMDIR) $(DESTDIR)$(pincludedir)
+ $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(pincludedir)
+ $(INSTALL) $(lbindir)/* $(DESTDIR)$(bindir)
+ $(INSTALL) -m 644 $(llibdir)/*.* $(DESTDIR)$(libdir)
if test -d $(llibdir)/ncbi; then \
- cp -pPR $(llibdir)/ncbi $(libdir)/; \
+ cp -pPR $(llibdir)/ncbi $(DESTDIR)$(libdir)/; \
fi
- -rm -f $(libdir)/lib*-static.a
- cd $(libdir) && \
+ -rm -f $(DESTDIR)$(libdir)/lib*-static.a
+ cd $(DESTDIR)$(libdir) && \
for x in *.a; do \
$(LN_S) "$$x" "`$(BASENAME) \"$$x\" .a`-static.a"; \
done
cd $(includedir0) && find * -name CVS -prune -o -print |\
cpio -pd $(pincludedir)
- $(INSTALL) -m 644 $(incdir)/* $(pincludedir)
+ cd $(incdir) && find * | cpio -pd $(pincludedir)
for d in $(includedir0) $(incdir); do \
cd $$d && find * -name .svn -prune -o -print | \
- cpio -pd $(pincludedir) ; \
+ cpio -pd $(DESTDIR)$(pincludedir) ; \
done
## set up appropriate build and status directories somewhere under $(libdir)?
install-gbench:

View File

@ -1,11 +1,30 @@
--- src/build-system/configure.orig 2016-09-09 21:04:16.000000000 +0900
+++ src/build-system/configure 2016-12-02 15:04:04.258800000 +0900
@@ -1715,7 +1715,7 @@
| --silent | --cache-file=* | -C | --config-cache | -n | --no-create \
| --no-recursion | --prefix=* | --exec-prefix=* | --bindir=* \
--- src/build-system/configure.orig 2017-10-18 15:21:39 UTC
+++ src/build-system/configure
@@ -1755,7 +1755,7 @@ for x_arg in "$@" ; do
| --libdir=* | --includedir=* | --build=* | --host=* | --target=* \
| --mandir=* | --infodir=* | --docdir=* | --htmldir=* \
| --datadir=* | --sysconfdir=* | --localstatedir=* \
- | --with-runpath=* | --with-relative-runpath=* \
+ | --with-runpath=* | --with-relative-runpath=* | --localstatedir=* \
| --with-experimental=* | --with-extra-action=* | --with-build-root=* \
| --with-fake-root=* | --with-build-root-sfx=* | --with-check=* \
| --with-check-tools=* | --with-ftds=[0-9]* | --with-fastcgi=[0-9]* \
@@ -1828,9 +1828,7 @@ Fine tuning of the installation director
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/ncbi-tools--]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
@@ -8086,7 +8084,7 @@ case "$host_os:$compiler" in
esac
if test "$with_mt" != "no" ; then
- CPPFLAGS="$CPPFLAGS -D_MT -D_REENTRANT -D_THREAD_SAFE"
+ CPPFLAGS="$CPPFLAGS -D_MT -D_REENTRANT -D_THREAD_SAFE -D__RUNETYPE_INTERNAL -D__RUNETYPE_INTERNAL"
LIBS="$LIBS $THREAD_LIBS"
case "$host_os:$compiler" in
solaris2.??:* | solaris*:GCC | *:Compaq | irix* | aix* | darwin* | cygwin*)

View File

@ -1,8 +1,7 @@
The Basic Local Alignment Search Tool (BLAST) finds regions of local
similarity between sequences. The program compares nucleotide or protein
sequences to sequence databases and calculates the statistical
significance of matches. BLAST can be used to infer functional and
evolutionary relationships between sequences as well as help identify
members of gene families.
The Basic Local Alignment Search Tool (BLAST) finds regions of local similarity
between sequences. The program compares nucleotide or protein sequences to
sequence databases and calculates the statistical significance of matches.
BLAST can be used to infer functional and evolutionary relationships between
sequences as well as help identify members of gene families.
WWW: http://blast.ncbi.nlm.nih.gov

File diff suppressed because it is too large Load Diff