diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile index b339f2bbd233..eed120ffe458 100644 --- a/devel/ocaml-lacaml/Makefile +++ b/devel/ocaml-lacaml/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lacaml -PORTVERSION= 7.1.5 +PORTVERSION= 7.2.6 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -26,11 +26,11 @@ USES= blaslapack fortran HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} --disable-docs --disable-examples \ --override conf_ccopt "${CFLAGS}" \ - --override conf_cclib "${LDFLAGS:S,^.*[[:space:]],,}" + --override conf_cclib "${LDFLAGS}" MAKE_JOBS_UNSAFE=yes CFLAGS+= -fPIC -DEXTERNAL_EXP10 -LDFLAGS+= -L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} +LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} @@ -40,6 +40,12 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES +post-patch: + @${REINPLACE_CMD} -e \ + 's|%%BLASLIB%%|${BLASLIB}| ; \ + s|%%LAPACKLIB%%|${LAPACKLIB}| ; \ + s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/myocamlbuild.ml + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS.txt CHANGES.txt README.md TODO.md diff --git a/devel/ocaml-lacaml/distinfo b/devel/ocaml-lacaml/distinfo index 21ecc36bb88c..9b066bb4f09e 100644 --- a/devel/ocaml-lacaml/distinfo +++ b/devel/ocaml-lacaml/distinfo @@ -1,2 +1,2 @@ -SHA256 (mmottl-lacaml-v7.1.5_GH0.tar.gz) = bbb3f44c004d7eb1f1b462836929cc87148ea218122e9bece22ab05dc471cf4e -SIZE (mmottl-lacaml-v7.1.5_GH0.tar.gz) = 162972 +SHA256 (mmottl-lacaml-v7.2.6_GH0.tar.gz) = ae525319ef146e6b661cde4442e188376982d6ca0767b228319129e4b0b7ab7c +SIZE (mmottl-lacaml-v7.2.6_GH0.tar.gz) = 171304 diff --git a/devel/ocaml-lacaml/files/patch-myocamlbuild.ml b/devel/ocaml-lacaml/files/patch-myocamlbuild.ml new file mode 100644 index 000000000000..87698789954d --- /dev/null +++ b/devel/ocaml-lacaml/files/patch-myocamlbuild.ml @@ -0,0 +1,18 @@ +--- myocamlbuild.ml.orig 2015-03-17 03:34:14 UTC ++++ myocamlbuild.ml +@@ -1118,13 +1118,13 @@ let package_default = + (["oasis_library_lacaml_cclib"; "link"], + [ + (OASISExpr.EBool true, +- S [A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]); ++ S [A "-cclib"; A "-L/usr/local/lib"; A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]); + (OASISExpr.ETest ("system", "macosx"), + S [A "-cclib"; A "-framework"; A "-cclib"; A "Accelerate"]) + ]); + (["oasis_library_lacaml_cclib"; "ocamlmklib"; "c"], + [ +- (OASISExpr.EBool true, S [A "-lblas"; A "-llapack"]); ++ (OASISExpr.EBool true, S [A "-L/usr/local/lib"; A "-lblas"; A "-llapack"]); + (OASISExpr.ETest ("system", "macosx"), + S [A "-framework"; A "Accelerate"]) + ])