Attachment #146060 for bug #192841




#
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}






PORTNAME=	equeue
PORTVERSION=	2.1.4
PORTREVISION=	4
CATEGORIES=	devel
MASTER_SITES=	http://www.ocaml-programming.de/packages/
PKGNAMEPREFIX=	ocaml-

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
USE_OCAML=		YES
USE_OCAML_FINDLIB=	YES
USE_OCAML_LDCONFIG=	YES
MAKE_FLAGS=		PACKAGES=	# If defined, would be used by ocamlfind
HAS_CONFIGURE=		YES

OCAML_LDLIBS=		${OCAML_SITELIBDIR}/${PORTNAME}
OCAML_LDLIBS+=		${OCAML_SITELIBDIR}/shell

ALL_TARGET=		all opt
MAKE_JOBS_UNSAFE=	yes

OPTIONS_DEFINE=		DOCS EQUEUE_TCL

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:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${COPYTREE_SHARE} ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR}
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${COPYTREE_SHARE} ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
.endif

.include <bsd.port.mk>




# Created by: Klaus T. Aehlig <aehlig@linta.de>
# $FreeBSD$

PORTNAME=	gsl
PORTVERSION=	1.15.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

MAKE_JOBS_UNSAFE=	yes
WRKSRC=			${WRKDIR}/gsl-ocaml-${PORTVERSION}


OPTIONS_DEFINE=	DOCS

post-configure:

Lines 1-5 Link Here

(-)math/ocamlgsl/files/patch-setup.ml (-2 / +11 lines)
1	--- setup.ml.orig 2014-04-26 21:42:25.000000000 +0200	1	--- setup.ml.orig 2014-04-16 20:59:19.000000000 +0000
2	+++ setup.ml 2014-04-26 21:42:34.000000000 +0200	2	+++ setup.ml 2014-08-19 21:24:53.000000000 +0000
		3	@@ -5752,7 +5752,7 @@
		4	(* The first command does not use -add: *)
		5	split first_args files
		6	else
		7	- ["install" :: findlib_name :: meta :: files]
		8	+ ["install" :: "-ldconf" :: "ignore" :: findlib_name :: meta :: files]
		9
		10
		11	let install pkg argv =
3	@@ -6679,7 +6679,7 @@	12	@@ -6679,7 +6679,7 @@
4	{	13	{
5	pre_command = [(OASISExpr.EBool true, None)];	14	pre_command = [(OASISExpr.EBool true, None)];

Return to bug 192841

Lines 78-93 Link Here

(-)Mk/bsd.ocaml.mk (-10 lines)
78	#	78	#
79	OCAML_LDCONF?= ${OCAML_LIBDIR}/ld.conf	79	OCAML_LDCONF?= ${OCAML_LIBDIR}/ld.conf
80		80
81	# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
82	# work well with staging.
83	.if defined(USE_OCAML_LDCONFIG)
84	. if !target(ocaml-ldconfig)
85	. if !defined(NO_STAGE)
86	OCAMLFIND_LDCONF?= /dev/null
87	. endif
88	. endif
89	.endif
90
91	OCAMLFIND_DESTDIR?= ${PREFIX}/${OCAML_SITELIBDIR}	81	OCAMLFIND_DESTDIR?= ${PREFIX}/${OCAML_SITELIBDIR}
92	OCAMLFIND_LDCONF?= ${PREFIX}/${OCAML_LDCONF}	82	OCAMLFIND_LDCONF?= ${PREFIX}/${OCAML_LDCONF}
93		83

Lines 3-48 Link Here

(-)devel/ocaml-equeue/Makefile (-17 / +38 lines)
3		3
4	PORTNAME= equeue	4	PORTNAME= equeue
5	PORTVERSION= 2.1.4	5	PORTVERSION= 2.1.4
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://www.ocaml-programming.de/packages/	8	MASTER_SITES= http://www.ocaml-programming.de/packages/
9	PKGNAMEPREFIX= ocaml-	9	PKGNAMEPREFIX= ocaml-
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= michipili@gmail.com
12	COMMENT= The Equeue library for OCaml	12	COMMENT= The Equeue library for OCaml
13		13
		14	LICENSE= EULA
		15	LICENSE_NAME= End User License Agreement
		16	LICENSE_FILE= ${WRKSRC}/LICENSE
		17	LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
		18
14	BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \	19	BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
15	ocamlfind:${PORTSDIR}/devel/ocaml-findlib	20	ocamlfind:${PORTSDIR}/devel/ocaml-findlib
16	RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \	21	RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
17	ocamlfind:${PORTSDIR}/devel/ocaml-findlib	22	ocamlfind:${PORTSDIR}/devel/ocaml-findlib
18		23
		24	DEPRECATED= Superseded by www/ocaml-net
		25	EXPIRATION_DATE=2015-08-20
		26
19	WRKSRC= ${WRKDIR}/${DISTNAME}	27	WRKSRC= ${WRKDIR}/${DISTNAME}
20		28
21	USES= gmake	29	USES= gmake
22	MAKE_FLAGS= PACKAGES= # If defined, would be used by ocamlfind	30	USE_OCAML= YES
23	HAS_CONFIGURE= yes	31	USE_OCAML_FINDLIB= YES
		32	USE_OCAML_LDCONFIG= YES
		33	MAKE_FLAGS= PACKAGES= # If defined, would be used by ocamlfind
		34	HAS_CONFIGURE= YES
24		35
25	ALL_TARGET= all opt	36	OCAML_LDLIBS= ${OCAML_SITELIBDIR}/${PORTNAME}
		37	OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/shell
		38
		39	ALL_TARGET= all opt
26	MAKE_JOBS_UNSAFE= yes	40	MAKE_JOBS_UNSAFE= yes
27		41
28	PKGDEINSTALL= ${PKGINSTALL}	42	OPTIONS_DEFINE= DOCS EQUEUE_TCL
29		43
30	.if defined(WITH_EQUEUE_TCL)	44	EQUEUE_TCL_DESC= Integration with the labltk event system
31	USES+= tcl	45
32	CONFIGURE_ARGS+= -with-equeue-tcl -equeue-tcl-defs "-I${TCL_INCLUDEDIR}" -equeue-tcl-libs "-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}"	46	.include <bsd.port.options.mk>
		47
		48	.if ${PORT_OPTIONS:MEQUEUE_TCL}
		49	USES+= tcl
		50	CONFIGURE_ARGS+= -with-equeue-tcl
		51	CONFIGURE_ARGS+= -equeue-tcl-defs
		52	CONFIGURE_ARGS+= "-I${TCL_INCLUDEDIR}"
		53	CONFIGURE_ARGS+= -equeue-tcl-libs
		54	CONFIGURE_ARGS+= "-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}"
33	PLIST_SUB+= TCL=""	55	PLIST_SUB+= TCL=""
		56	OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/${PORTNAME}-tcl
34	.else	57	.else
35	PLIST_SUB+= TCL="@comment "	58	PLIST_SUB+= TCL="@comment "
36	.endif	59	.endif
37		60
38	NO_STAGE= yes
39	post-install:	61	post-install:
40	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	62	.if ${PORT_OPTIONS:MDOCS}
41	.if !defined(NOPORTDOCS)	63	@${MKDIR} ${STAGEDIR}${DOCSDIR}
42	@${MKDIR} ${DOCSDIR}	64	${COPYTREE_SHARE} ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR}
43	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}	65	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
44	@${MKDIR} ${EXAMPLESDIR}	66	${COPYTREE_SHARE} ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
45	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
46	.endif	67	.endif
47		68
48	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)math/ocamlgsl/Makefile (-2 / +4 lines)
1	# Created by: Klaus T. Aehlig <aehlig@linta.de>	1	# Created by: Klaus T. Aehlig <aehlig@linta.de>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ocaml-gsl	4	PORTNAME= gsl
5	PORTVERSION= 1.15.1	5	PORTVERSION= 1.15.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= http://bitbucket.org/mmottl/gsl-ocaml/downloads/	8	MASTER_SITES= http://bitbucket.org/mmottl/gsl-ocaml/downloads/
9	DISTNAME= gsl-ocaml-${PORTVERSION}	9	DISTNAME= gsl-ocaml-${PORTVERSION}
		10	PKGNAMEPREFIX= ocaml-
10		11
11	MAINTAINER= michipili@gmail.com	12	MAINTAINER= michipili@gmail.com
12	COMMENT= Interface to GSL for the Objective Caml language	13	COMMENT= Interface to GSL for the Objective Caml language
Lines 26-31 Link Here
26	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
27	WRKSRC= ${WRKDIR}/gsl-ocaml-${PORTVERSION}	28	WRKSRC= ${WRKDIR}/gsl-ocaml-${PORTVERSION}
28		29
		30
29	OPTIONS_DEFINE= DOCS	31	OPTIONS_DEFINE= DOCS
30		32
31	post-configure:	33	post-configure: