bolt-lmm: Patch path to tables

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri May 24 13:39:29 2019 -0500
Changeset:	30f4298b04753ef6d674e56f1851466c409bfed8

Modified Files:
	bolt-lmm/Makefile
	bolt-lmm/distinfo
	bolt-lmm/patches/patch-src_Makefile

Log Message:
bolt-lmm: Patch path to tables

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

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

diffstat:
 bolt-lmm/Makefile                   | 16 +++++++++++++---
 bolt-lmm/distinfo                   |  2 +-
 bolt-lmm/patches/patch-src_Makefile |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs:
diff --git a/bolt-lmm/Makefile b/bolt-lmm/Makefile
index 9053557556..6eaa3d6273 100644
--- a/bolt-lmm/Makefile
+++ b/bolt-lmm/Makefile
@@ -20,7 +20,7 @@ USE_LANGUAGES=	c c++ fortran
 USE_TOOLS+=	gmake pax
 
 MAKE_FILE=	${FILESDIR}/Makefile
-MAKE_ENV+=	BLAS_LIBS=${BLAS_LIBS} LAPACK_LIBS=${LAPACK_LIBS}
+MAKE_ENV+=	LAPACK_LIBS="${LAPACK_LIBS}"
 CXXFLAGS+=	-fopenmp
 
 DATADIR=	share/bolt-lmm
@@ -28,11 +28,21 @@ EXAMPLESDIR=	share/examples/bolt-lmm
 
 INSTALLATION_DIRS=	bin ${DATADIR} ${EXAMPLESDIR}
 
+SUBST_CLASSES+=		data
+SUBST_STAGE.data=	pre-configure
+SUBST_FILES.data=	src/BoltParams.cpp
+SUBST_SED.data=		-e 's|tables/|${PREFIX}/${DATADIR}/tables|g'
+
+SUBST_CLASSES+=		example
+SUBST_STAGE.example=	pre-configure
+SUBST_FILES.example=	example/run_example.sh
+SUBST_SED.example=	-e 's|../tables/|${PREFIX}/${DATADIR}/tables/|g'
+
 post-patch:
-	${RM} ${WRKSRC}/example/*.orig
+	${RM} ${WRKSRC}/example/*.orig ${WRKSRC}/bolt
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bolt ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/bolt ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC} && pax -rw tables ${DESTDIR}${PREFIX}/${DATADIR}
 	cd ${WRKSRC}/example && pax -rw * ${DESTDIR}${PREFIX}/${EXAMPLESDIR}
 	${CHMOD} a+x ${DESTDIR}${PREFIX}/${EXAMPLESDIR}/*.sh
diff --git a/bolt-lmm/distinfo b/bolt-lmm/distinfo
index 00735ac506..424f4e59ce 100644
--- a/bolt-lmm/distinfo
+++ b/bolt-lmm/distinfo
@@ -6,5 +6,5 @@ SHA512 (BOLT-LMM_v2.3.2.tar.gz) = 07364e9664c51c866f5c17158a3dd6518fb4063831b54f
 Size (BOLT-LMM_v2.3.2.tar.gz) = 335057533 bytes
 SHA1 (patch-example_run__example.sh) = e75940a782efd6003a21df0ac2f33a87e6fd18e0
 SHA1 (patch-example_run__example__reml2.sh) = 38295a174999b4be946efd9a97a3be06c5564cee
-SHA1 (patch-src_Makefile) = 84826dcdb8baaca8bd80fa2ad3eb11b19a75d7cf
+SHA1 (patch-src_Makefile) = d614675bd8eb6fdfbee7d45278ded4aed79f0e92
 SHA1 (patch-src_StringUtils.cpp) = 619a74c6f6b54fde58c8adeff6229d5155827e7f
diff --git a/bolt-lmm/patches/patch-src_Makefile b/bolt-lmm/patches/patch-src_Makefile
index 86b1df84ad..a451b2fa3b 100644
--- a/bolt-lmm/patches/patch-src_Makefile
+++ b/bolt-lmm/patches/patch-src_Makefile
@@ -70,7 +70,7 @@ $NetBSD$
 +ifeq (${CXX},${CXX})
 +	CXXFLAGS += -fopenmp
 +	LDFLAGS += -fopenmp
-+	LLAPACK = ${BLAS_LIBS} ${LAPACK_LIBS} -lgfortran
++	LLAPACK = ${LAPACK_LIBS} -lgfortran
  	ifeq (${linking},static)
 -		LFLAGS += -static
 +		LDFLAGS += -static