Attachment 128357 Details for Bug 172229 – devel_ocaml-lacaml.diff

[patch] devel_ocaml-lacaml.diff

devel_ocaml-lacaml.diff (text/x-diff), 4.37 KB, created by tkato432 on 2012-10-26 18:46:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-10-26 18:46:51 UTC

Size: 4.37 KB

patch

obsolete

>diff -urN /usr/ports/devel/ocaml-lacaml/Makefile devel/ocaml-lacaml/Makefile
>--- /usr/ports/devel/ocaml-lacaml/Makefile	2012-10-26 23:57:50.000000000 +0900
>+++ devel/ocaml-lacaml/Makefile	2012-10-27 01:48:31.000000000 +0900
>@@ -2,77 +2,62 @@
> # $FreeBSD: ports/devel/ocaml-lacaml/Makefile,v 1.21 2012/10/26 14:57:50 bapt Exp $
> 
> PORTNAME=	lacaml
>-PORTVERSION=	5.4.7
>-PORTREVISION=	1
>+PORTVERSION=	7.0.3
> CATEGORIES=	devel
>-MASTER_SITES=	http://hg.ocaml.info/release/lacaml/archive/
>-DISTNAME=	release-${PORTVERSION}
>+MASTER_SITES=	http://cdn.bitbucket.org/mmottl/lacaml/downloads/
> PKGNAMEPREFIX=	ocaml-
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	OCaml interface to BLAS and LAPACK libraries
> 
>-DEPRECATED=	No more public distfiles
>-EXPIRATION_DATE=	2012-11-26
>+LICENSE=	LGPL21
> 
>-LIB_DEPENDS=	blas.2:${PORTSDIR}/math/blas \
>-		lapack.4:${PORTSDIR}/math/lapack
>+LIB_DEPENDS=	blas:${PORTSDIR}/math/blas \
>+		lapack:${PORTSDIR}/math/lapack
>+
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-USE_BZIP2=	yes
>-USE_GMAKE=	yes
> USE_OCAML=	yes
> USE_OCAML_FINDLIB=yes
>+USE_OCAMLFIND_PLIST=yes
> USE_OCAML_LDCONFIG=yes
> USE_OCAML_WASH=	yes
>-WRKSRC=		${WRKDIR}/lacaml-${DISTNAME}
>+
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples \
>+		--override conf_ccopt "${CFLAGS}" \
>+		--override conf_cclib "${LDFLAGS:S,^.*[[:space:]],,}"
>+MAKE_JOBS_UNSAFE=yes
> 
> CFLAGS+=	-fPIC
>-MAKE_ENV+=	OCAMLMKLIB_FLAGS="-L${LOCALBASE}/lib"
>-MAKE_JOBS_UNSAFE=	yes
>+LDFLAGS+=	-L${LOCALBASE}/lib -lblas -llapack
>+
>+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>+EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>+
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
> 
>-DOCS=		README.txt TODO
>-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
>-EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
>-
>-.include <bsd.port.pre.mk>
>-
>-post-extract:
>-#
>-# CFLAGS safety
>-#
>-	@${REINPLACE_CMD} -E \
>-		-e 's,^(CFLAGS[[:space:]]*:=[[:space:]]*).*,\1${CFLAGS},' \
>-		${WRKSRC}/lib/Makefile
>-
>-# For nonstandard prefixes
>-.if !exists(${OCAMLFIND_DESTDIR})
>-	${MKDIR} ${OCAMLFIND_DESTDIR}
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+PLIST_DIRSTRY+=	${OCAML_DOCSDIR:S,^${PREFIX}/,,}
> .endif
>-.if !exists(${OCAMLFIND_LDCONF})
>-	${TOUCH} ${OCAMLFIND_LDCONF}
>+
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+PLIST_DIRSTRY+=	${OCAML_EXAMPLESDIR:S,^${PREFIX}/,,}
> .endif
> 
> post-install:
>-	@${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
>-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
>+.for i in AUTHORS.txt CHANGES.txt README.md TODO.md
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
>+.endfor
>+.endif
>+.if ${PORT_OPTIONS:MEXAMPLES}
> 	@${MKDIR} ${EXAMPLESDIR}
>-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
>-	@${FIND} ${EXAMPLESDIR}/ ! -type d | \
>-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
>-	@${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \
>-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
>-	@${FIND} ${DOCSDIR}/ ! -type d | \
>-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
>-	@${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \
>-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
>-# XXX: temporary workaround for non-standard PREFIX
>-	@${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \
>-		>> ${TMPPLIST}
>-	@${ECHO_CMD} "@unexec rmdir %D/share/examples/ocaml 2>/dev/null||true" \
>-		>> ${TMPPLIST}
>+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/devel/ocaml-lacaml/distinfo devel/ocaml-lacaml/distinfo
>--- /usr/ports/devel/ocaml-lacaml/distinfo	2011-07-03 23:56:33.000000000 +0900
>+++ devel/ocaml-lacaml/distinfo	2012-09-27 15:08:38.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (release-5.4.7.tar.bz2) = 87a833aa88c22accbf340a61dcf21f542def8d401be14df67ab4390f15cf8460
>-SIZE (release-5.4.7.tar.bz2) = 86427
>+SHA256 (lacaml-7.0.3.tar.gz) = 3ebd0b35ae0e4fe5cc5483e61a8bf1fb46ef8fed60f5c89a09e589b91b7ec982
>+SIZE (lacaml-7.0.3.tar.gz) = 151742
>diff -urN /usr/ports/devel/ocaml-lacaml/pkg-descr devel/ocaml-lacaml/pkg-descr
>--- /usr/ports/devel/ocaml-lacaml/pkg-descr	2006-08-20 15:49:11.000000000 +0900
>+++ devel/ocaml-lacaml/pkg-descr	2012-09-27 15:01:29.000000000 +0900
>@@ -6,4 +6,4 @@
> applications that need linear algebra.
> 
> Author:	Markus Mottl <markus.mottl@gmail.com>
>-WWW:	http://www.ocaml.info/home/ocaml_sources.html
>+WWW:	https://bitbucket.org/mmottl/lacaml

Actions: View | Diff

Attachments on bug 172229: 128356 | 128357