Attachment #156707 for bug #199226




# $FreeBSD: head/devel/ocaml-lacaml/Makefile 385521 2015-05-06 15:16:53Z mat $

PORTNAME=	lacaml
PORTVERSION=	7.2.1
DISTVERSIONPREFIX=	v
CATEGORIES=	devel
MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTVERSION:S/^/v/}
PKGNAMEPREFIX=	ocaml-

MAINTAINER=	ports@FreeBSD.org


LICENSE=	LGPL21

USE_GITHUB=	yes
GH_ACCOUNT=	mmottl

USE_OCAML=	yes
USE_OCAML_FINDLIB=yes
USE_OCAMLFIND_PLIST=yes

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples \
		--override conf_ccopt "${CFLAGS}" \
		--override conf_cclib "${LDFLAGS}"
MAKE_JOBS_UNSAFE=yes

CFLAGS+=	-fPIC -DEXTERNAL_EXP10
LDFLAGS+=	-L${LOCALBASE}/lib

DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}


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

Lines 1-2 Link Here

(-)devel/ocaml-lacaml/distinfo (-2 / +2 lines)
1	SHA256 (mmottl-lacaml-v7.1.5_GH0.tar.gz) = bbb3f44c004d7eb1f1b462836929cc87148ea218122e9bece22ab05dc471cf4e	1	SHA256 (lacaml-7.2.1.tar.gz) = 791cd5b3c2a8f3252dfcc5460867a5e2bb4fae902013543184ed6a80fbfafecc
2	SIZE (mmottl-lacaml-v7.1.5_GH0.tar.gz) = 162972	2	SIZE (lacaml-7.2.1.tar.gz) = 170623




--- 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"])
             ])

Return to bug 199226

Lines 2-11 Link Here

(-)devel/ocaml-lacaml/Makefile (-8 / +11 lines)
2	# $FreeBSD: head/devel/ocaml-lacaml/Makefile 385521 2015-05-06 15:16:53Z mat $	2	# $FreeBSD: head/devel/ocaml-lacaml/Makefile 385521 2015-05-06 15:16:53Z mat $
3		3
4	PORTNAME= lacaml	4	PORTNAME= lacaml
5	PORTVERSION= 7.1.5	5	PORTVERSION= 7.2.1
6	DISTVERSIONPREFIX= v
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= GH	7	MASTER_SITES= https://github.com/mmottl/lacaml/releases/download/%SUBDIR%/
		8	MASTER_SITE_SUBDIR= ${PORTVERSION:S/^/v/}
9	PKGNAMEPREFIX= ocaml-	9	PKGNAMEPREFIX= ocaml-
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
Lines 13-21 Link Here
13		13
14	LICENSE= LGPL21	14	LICENSE= LGPL21
15		15
16	USE_GITHUB= yes
17	GH_ACCOUNT= mmottl
18
19	USE_OCAML= yes	16	USE_OCAML= yes
20	USE_OCAML_FINDLIB=yes	17	USE_OCAML_FINDLIB=yes
21	USE_OCAMLFIND_PLIST=yes	18	USE_OCAMLFIND_PLIST=yes
Lines 27-37 Link Here
27	HAS_CONFIGURE= yes	24	HAS_CONFIGURE= yes
28	CONFIGURE_ARGS= --prefix ${PREFIX} --disable-docs --disable-examples \	25	CONFIGURE_ARGS= --prefix ${PREFIX} --disable-docs --disable-examples \
29	--override conf_ccopt "${CFLAGS}" \	26	--override conf_ccopt "${CFLAGS}" \
30	--override conf_cclib "${LDFLAGS:S,^.*[[:space:]],,}"	27	--override conf_cclib "${LDFLAGS}"
31	MAKE_JOBS_UNSAFE=yes	28	MAKE_JOBS_UNSAFE=yes
32		29
33	CFLAGS+= -fPIC -DEXTERNAL_EXP10	30	CFLAGS+= -fPIC -DEXTERNAL_EXP10
34	LDFLAGS+= -L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}	31	LDFLAGS+= -L${LOCALBASE}/lib
35		32
36	DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}	33	DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
37	EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME}	34	EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME}
Lines 41-46 Link Here
41		38
42	OPTIONS_DEFINE= DOCS EXAMPLES	39	OPTIONS_DEFINE= DOCS EXAMPLES
43		40
		41	post-patch:
		42	@${REINPLACE_CMD} -e \
		43	's\|%%BLASLIB%%\|${BLASLIB}\| ; \
		44	s\|%%LAPACKLIB%%\|${LAPACKLIB}\| ; \
		45	s\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/myocamlbuild.ml
		46
44	post-install:	47	post-install:
45	@${MKDIR} ${STAGEDIR}${DOCSDIR}	48	@${MKDIR} ${STAGEDIR}${DOCSDIR}
46	.for i in AUTHORS.txt CHANGES.txt README.md TODO.md	49	.for i in AUTHORS.txt CHANGES.txt README.md TODO.md

Line 0 Link Here

(-)devel/ocaml-lacaml/files/patch-myocamlbuild.ml (+18 lines)
	1	--- myocamlbuild.ml.orig 2015-03-17 03:34:14 UTC
	2	+++ myocamlbuild.ml
	3	@@ -1118,13 +1118,13 @@ let package_default =
	4	(["oasis_library_lacaml_cclib"; "link"],
	5	[
	6	(OASISExpr.EBool true,
	7	- S [A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]);
	8	+ S [A "-cclib"; A "-L/usr/local/lib"; A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]);
	9	(OASISExpr.ETest ("system", "macosx"),
	10	S [A "-cclib"; A "-framework"; A "-cclib"; A "Accelerate"])
	11	]);
	12	(["oasis_library_lacaml_cclib"; "ocamlmklib"; "c"],
	13	[
	14	- (OASISExpr.EBool true, S [A "-lblas"; A "-llapack"]);
	15	+ (OASISExpr.EBool true, S [A "-L/usr/local/lib"; A "-lblas"; A "-llapack"]);
	16	(OASISExpr.ETest ("system", "macosx"),
	17	S [A "-framework"; A "Accelerate"])
	18	])