Attachment 156707 Details for Bug 199226 – devel_ocaml-lacaml.diff

[patch] devel_ocaml-lacaml.diff

devel_ocaml-lacaml.diff (text/plain), 3.27 KB, created by tkato432 on 2015-05-12 15:31:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-05-12 15:31:33 UTC

Size: 3.27 KB

patch

obsolete

>diff -urN /usr/ports/devel/ocaml-lacaml/Makefile devel/ocaml-lacaml/Makefile
>--- /usr/ports/devel/ocaml-lacaml/Makefile	2015-05-07 05:09:10.445530000 +0900
>+++ devel/ocaml-lacaml/Makefile	2015-05-13 00:00:00.000000000 +0900
>@@ -2,10 +2,10 @@
> # $FreeBSD: head/devel/ocaml-lacaml/Makefile 385521 2015-05-06 15:16:53Z mat $
> 
> PORTNAME=	lacaml
>-PORTVERSION=	7.1.5
>-DISTVERSIONPREFIX=	v
>+PORTVERSION=	7.2.1
> CATEGORIES=	devel
>-MASTER_SITES=	GH
>+MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/%SUBDIR%/
>+MASTER_SITE_SUBDIR=	${PORTVERSION:S/^/v/}
> PKGNAMEPREFIX=	ocaml-
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -13,9 +13,6 @@
> 
> LICENSE=	LGPL21
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	mmottl
>-
> USE_OCAML=	yes
> USE_OCAML_FINDLIB=yes
> USE_OCAMLFIND_PLIST=yes
>@@ -27,11 +24,11 @@
> 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}
>@@ -41,6 +38,12 @@
> 
> 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 -urN /usr/ports/devel/ocaml-lacaml/distinfo devel/ocaml-lacaml/distinfo
>--- /usr/ports/devel/ocaml-lacaml/distinfo	2015-05-07 05:09:10.444022000 +0900
>+++ devel/ocaml-lacaml/distinfo	2015-05-13 00:00:00.000000000 +0900
>@@ -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 (lacaml-7.2.1.tar.gz) = 791cd5b3c2a8f3252dfcc5460867a5e2bb4fae902013543184ed6a80fbfafecc
>+SIZE (lacaml-7.2.1.tar.gz) = 170623
>diff -urN /usr/ports/devel/ocaml-lacaml/files/patch-myocamlbuild.ml devel/ocaml-lacaml/files/patch-myocamlbuild.ml
>--- /usr/ports/devel/ocaml-lacaml/files/patch-myocamlbuild.ml	1970-01-01 09:00:00.000000000 +0900
>+++ devel/ocaml-lacaml/files/patch-myocamlbuild.ml	2015-05-13 00:00:00.000000000 +0900
>@@ -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"])
>+             ])

Actions: View | Diff

Attachments on bug 199226: 155264 | 156707