diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
| commit | 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch) | |
| tree | 4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6 /biology | |
| parent | 063580a062ba10ffba035c8d96b541b5ce7a426d (diff) | |
| download | pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz | |
*: Move SUBST_STAGE from post-patch to pre-configure
Performing substitutions during post-patch breaks tools such as mkpatches,
making it very difficult to regenerate correct patches after making changes,
and often leading to substituted string replacements being committed.
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/cdhit/Makefile | 6 | ||||
| -rw-r--r-- | biology/htslib/Makefile | 4 | ||||
| -rw-r--r-- | biology/ncbi-blast+/Makefile | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/biology/cdhit/Makefile b/biology/cdhit/Makefile index 28a0f599daf..a851d1f2d04 100644 --- a/biology/cdhit/Makefile +++ b/biology/cdhit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/07/09 06:37:51 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:09 jperkin Exp $ # ########################################################### # Generated by fbsd2pkg # @@ -23,13 +23,13 @@ REPLACE_PERL= *.pl WRKSRC= ${WRKDIR}/${DISTNAME} SUBST_CLASSES+= compiler -SUBST_STAGE.compiler= post-patch +SUBST_STAGE.compiler= pre-configure SUBST_MESSAGE.compiler= Fixing hardcoded compiler name SUBST_FILES.compiler= ${MAKE_FILE} SUBST_SED.compiler= -e 's|g++|${CXX:Q}|g' SUBST_CLASSES+= bash -SUBST_STAGE.bash= post-patch +SUBST_STAGE.bash= pre-configure SUBST_MESSAGE.bash= Fixing bash path SUBST_FILES.bash= cd-hit-2d-para.pl cd-hit-para.pl SUBST_SED.bash= -e 's|/bin/bash|${PREFIX}/bin/bash|g' diff --git a/biology/htslib/Makefile b/biology/htslib/Makefile index 19525f4b265..2c20fc95652 100644 --- a/biology/htslib/Makefile +++ b/biology/htslib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/04/30 16:51:54 bacon Exp $ +# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:09 jperkin Exp $ DISTNAME= htslib-1.8 CATEGORIES= biology @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes REPLACE_PERL= test/compare_sam.pl test/test.pl SUBST_CLASSES+= version -SUBST_STAGE.version= post-patch +SUBST_STAGE.version= pre-configure SUBST_SED.version= -e "s|m4_esyscmd_s(\[make print-version\])|[${PKGVERSION_NOREV}]|" SUBST_FILES.version= ${WRKSRC}/configure.ac diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile index 84edbc1649a..9407aa6417c 100644 --- a/biology/ncbi-blast+/Makefile +++ b/biology/ncbi-blast+/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/05/22 21:37:29 bacon Exp $ +# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:10 jperkin Exp $ DISTNAME= ncbi-blast-${PV}+-src PKGNAME= ncbi-blast+-${PV} @@ -15,7 +15,7 @@ LICENSE= public-domain # Fix "undefined _ThreadRuneLocale" error on FreeBSD 10.0 # Fix "unknown options" in configure SUBST_CLASSES+= configure -SUBST_STAGE.configure= post-patch +SUBST_STAGE.configure= pre-configure SUBST_SED.configure+= -e 's|-D_THREAD_SAFE|-D_THREAD_SAFE -D__RUNETYPE_INTERNAL|' SUBST_SED.configure+= -e '/--infodir=DIR/d' SUBST_SED.configure+= -e '/--mandir=DIR/d' |