Attachment 146060 Details for Bug 192841 – All-in-one patch for ocamlgsl and ocaml-equeue

[patch] All-in-one patch for ocamlgsl and ocaml-equeue

patch-ocaml-1 (text/plain), 4.59 KB, created by Michael Grünewald on 2014-08-20 09:27:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Grünewald

Created: 2014-08-20 09:27:13 UTC

Size: 4.59 KB

patch

obsolete

>Index: Mk/bsd.ocaml.mk
>===================================================================
>--- Mk/bsd.ocaml.mk	(revision 365402)
>+++ Mk/bsd.ocaml.mk	(working copy)
>@@ -78,16 +78,6 @@
> #
> OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
> 
>-# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
>-# work well with staging.
>-.if defined(USE_OCAML_LDCONFIG)
>-. if !target(ocaml-ldconfig)
>-.  if !defined(NO_STAGE)
>-OCAMLFIND_LDCONF?=	/dev/null
>-.  endif
>-. endif
>-.endif
>-
> OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
> OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
> 
>Index: devel/ocaml-equeue/Makefile
>===================================================================
>--- devel/ocaml-equeue/Makefile	(revision 365402)
>+++ devel/ocaml-equeue/Makefile	(working copy)
>@@ -3,46 +3,67 @@
> 
> PORTNAME=	equeue
> PORTVERSION=	2.1.4
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> MASTER_SITES=	http://www.ocaml-programming.de/packages/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	michipili@gmail.com
> COMMENT=	The Equeue library for OCaml
> 
>+LICENSE=	EULA
>+LICENSE_NAME=	End User License Agreement
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
>+
> BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
> 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
> RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
> 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
> 
>+DEPRECATED=	Superseded by www/ocaml-net
>+EXPIRATION_DATE=2015-08-20
>+
> WRKSRC=		${WRKDIR}/${DISTNAME}
> 
>-USES=		gmake
>-MAKE_FLAGS=	PACKAGES=	# If defined, would be used by ocamlfind
>-HAS_CONFIGURE=	yes
>+USES=			gmake
>+USE_OCAML=		YES
>+USE_OCAML_FINDLIB=	YES
>+USE_OCAML_LDCONFIG=	YES
>+MAKE_FLAGS=		PACKAGES=	# If defined, would be used by ocamlfind
>+HAS_CONFIGURE=		YES
> 
>-ALL_TARGET=	all opt
>+OCAML_LDLIBS=		${OCAML_SITELIBDIR}/${PORTNAME}
>+OCAML_LDLIBS+=		${OCAML_SITELIBDIR}/shell
>+
>+ALL_TARGET=		all opt
> MAKE_JOBS_UNSAFE=	yes
> 
>-PKGDEINSTALL=	${PKGINSTALL}
>+OPTIONS_DEFINE=		DOCS EQUEUE_TCL
> 
>-.if defined(WITH_EQUEUE_TCL)
>-USES+=		tcl
>-CONFIGURE_ARGS+=	-with-equeue-tcl -equeue-tcl-defs "-I${TCL_INCLUDEDIR}" -equeue-tcl-libs "-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}"
>+EQUEUE_TCL_DESC=	Integration with the labltk event system
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MEQUEUE_TCL}
>+USES+=			tcl
>+CONFIGURE_ARGS+=	-with-equeue-tcl
>+CONFIGURE_ARGS+=	-equeue-tcl-defs
>+CONFIGURE_ARGS+=	"-I${TCL_INCLUDEDIR}"
>+CONFIGURE_ARGS+=	-equeue-tcl-libs
>+CONFIGURE_ARGS+=	"-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}"
> PLIST_SUB+=		TCL=""
>+OCAML_LDLIBS+=		${OCAML_SITELIBDIR}/${PORTNAME}-tcl
> .else
> PLIST_SUB+=		TCL="@comment "
> .endif
> 
>-NO_STAGE=	yes
> post-install:
>-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
>-	@${MKDIR} ${EXAMPLESDIR}
>-	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${COPYTREE_SHARE} ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${COPYTREE_SHARE} ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
> .endif
> 
> .include <bsd.port.mk>
>Index: math/ocamlgsl/Makefile
>===================================================================
>--- math/ocamlgsl/Makefile	(revision 365402)
>+++ math/ocamlgsl/Makefile	(working copy)
>@@ -1,12 +1,13 @@
> # Created by: Klaus T. Aehlig <aehlig@linta.de>
> # $FreeBSD$
> 
>-PORTNAME=	ocaml-gsl
>+PORTNAME=	gsl
> PORTVERSION=	1.15.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math
> MASTER_SITES=	http://bitbucket.org/mmottl/gsl-ocaml/downloads/
> DISTNAME=	gsl-ocaml-${PORTVERSION}
>+PKGNAMEPREFIX=	ocaml-
> 
> MAINTAINER=	michipili@gmail.com
> COMMENT=	Interface to GSL for the Objective Caml language
>@@ -26,6 +27,7 @@
> MAKE_JOBS_UNSAFE=	yes
> WRKSRC=			${WRKDIR}/gsl-ocaml-${PORTVERSION}
> 
>+
> OPTIONS_DEFINE=	DOCS
> 
> post-configure:
>Index: math/ocamlgsl/files/patch-setup.ml
>===================================================================
>--- math/ocamlgsl/files/patch-setup.ml	(revision 365402)
>+++ math/ocamlgsl/files/patch-setup.ml	(working copy)
>@@ -1,5 +1,14 @@
>---- setup.ml.orig	2014-04-26 21:42:25.000000000 +0200
>-+++ setup.ml	2014-04-26 21:42:34.000000000 +0200
>+--- setup.ml.orig	2014-04-16 20:59:19.000000000 +0000
>++++ setup.ml	2014-08-19 21:24:53.000000000 +0000
>+@@ -5752,7 +5752,7 @@
>+       (* The first command does not use -add: *)
>+       split first_args files
>+     else
>+-      ["install" :: findlib_name :: meta :: files]
>++      ["install" :: "-ldconf" :: "ignore" :: findlib_name :: meta :: files]
>+ 
>+ 
>+   let install pkg argv =
> @@ -6679,7 +6679,7 @@
>              {
>                 pre_command = [(OASISExpr.EBool true, None)];

Actions: View | Diff

Attachments on bug 192841: 146054 | 146059 | 146060 | 146165