pkgsrc-WIP-changes archive

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

blasr_libcpp: bash:run instead of DEPENDS on bash



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Mon Oct 19 22:34:26 2015 +0200
Changeset:	a695052a2b8fecb6e0a3b5462be3fdc444a46e8c

Modified Files:
	blasr_libcpp/Makefile

Log Message:
blasr_libcpp: bash:run instead of DEPENDS on bash

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

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

diffstat:
 blasr_libcpp/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diffs:
diff --git a/blasr_libcpp/Makefile b/blasr_libcpp/Makefile
index 06c59b2..d4319ea 100644
--- a/blasr_libcpp/Makefile
+++ b/blasr_libcpp/Makefile
@@ -12,7 +12,7 @@
 
 DISTNAME=	blasr_libcpp-${PORTVERSION}
 CATEGORIES=	biology
-# FreeBSD MASTER_SITE_SUBDIR: 
+# FreeBSD MASTER_SITE_SUBDIR:
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
 EXTRACT_SUFX=	.tar.xz
@@ -31,15 +31,14 @@ LICENSE=	modified-bsd
 # MAKE_JOBS_SAFE=	no
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake bash:run
 
 # Broken: hdf5-c++>=1.8:../../devel/hdf5-c++
-DEPENDS+=		bash:../../shells/bash
 
 SUBST_CLASSES+=		bash
 SUBST_STAGE.bash=	post-patch
 SUBST_FILES.bash=	${WRKSRC}/makefile
-SUBST_SED.bash=		-e 's|/bin/bash|${LOCALBASE}/bin/bash|g'
+SUBST_SED.bash=		-e 's|/bin/bash|${TOOLS_BASH}|g'
 
 SUBST_CLASSES+=		pbbam
 SUBST_STAGE.pbbam=	post-configure
@@ -65,7 +64,8 @@ SUBST_FILES.uintmax=	${WRKSRC}/alignment/suffixarray/SuffixArray.hpp
 SUBST_SED.uintmax=	-e 's|UINT_MAX|INT_MAX|g'
 .endif
 
-CXXFLAGS+=	-I${LOCALBASE}/include -O
+# XXX buildlink should take care of this for you
+CXXFLAGS+=	-I${PREFIX}/include -O
 MAKE_FILE=	makefile
 
 PORTNAME=	blasr_libcpp
@@ -77,9 +77,10 @@ PORTVERSION=	2015.08.17
 
 do-configure:
 	cd ${WRKSRC} && ./configure.py --no-pbbam \
-		HDF5_INCLUDE=${LOCALBASE}/include HDF5_LIB=${LOCALBASE}/lib
+		HDF5_INCLUDE=${PREFIX}/include HDF5_LIB=${PREFIX}/lib
 
 do-install:
+# XXX I suggest using pax(1) instead of this
 	${MKDIR} ${DESTDIR}${PREFIX}/include ${DESTDIR}${PREFIX}/lib
 	cd ${WRKSRC} && for fn in `find . -name '*.h' -o -name '*.hpp'`; do \
 		dir=`dirname $$fn | cut -d / -f 2-`; \


Home | Main Index | Thread Index | Old Index