Index: head/devel/ocaml-lacaml/Makefile =================================================================== --- head/devel/ocaml-lacaml/Makefile (revision 394405) +++ head/devel/ocaml-lacaml/Makefile (revision 394406) @@ -1,55 +1,61 @@ # Created by: Stanislav Sedov # $FreeBSD$ PORTNAME= lacaml -PORTVERSION= 7.1.5 +PORTVERSION= 7.2.6 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= OCaml interface to BLAS and LAPACK libraries LICENSE= LGPL21 USE_GITHUB= yes GH_ACCOUNT= mmottl USE_OCAML= yes USE_OCAML_FINDLIB=yes USE_OCAMLFIND_PLIST=yes USE_OCAML_LDCONFIG=yes USE_OCAML_WASH= yes OCAMLFIND_LDCONF=ignore 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} PORTDOCS= * 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 (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${DOCSDIR}) .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.cmxs @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.so .include Index: head/devel/ocaml-lacaml/distinfo =================================================================== --- head/devel/ocaml-lacaml/distinfo (revision 394405) +++ head/devel/ocaml-lacaml/distinfo (revision 394406) @@ -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 Index: head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml =================================================================== --- head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml (nonexistent) +++ head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml (revision 394406) @@ -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"]) + ]) Property changes on: head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property