Attachment #233068 for bug #262793




# Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>

PORTNAME=	parmap
DISTVERSION=	1.2.4
CATEGORIES=	devel
PKGNAMEPREFIX=	ocaml-


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	dune:devel/ocaml-dune	\
		ocaml-dune-configurator>0:devel/ocaml-dune-configurator
RUN_DEPENDS=	ocaml-dune-configurator>0:devel/ocaml-dune-configurator

USE_GITHUB=	yes
GH_ACCOUNT=	rdicosmo

USES=			gmake
GNU_CONFIGURE=		yes
USE_OCAML=		yes
USE_OCAML_FINDLIB=	yes
USE_OCAML_LDCONFIG=	yes
OCAML_LDLIBS=		${OCAML_SITELIBDIR}/stublibs

INSTALL_ARGS=	--destdir=${STAGEDIR} --libdir=${OCAML_SITELIBDIR}
DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}

OPTIONS_DEFINE=	DOCS

do-build:
	(cd ${WRKSRC} && ${LOCALBASE}/bin/dune build --release)

do-install:
	(cd ${WRKSRC} && ${LOCALBASE}/bin/dune install ${INSTALL_ARGS})

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/*.cmxs
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/stublibs/*.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/ocaml-parmap/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519649954	1	TIMESTAMP = 1647975744
2	SHA256 (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 8bccdb269e955b7ae6ab981117bfe64abf0f832788e4138c79b83385c9c9e16a	2	SHA256 (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 3c8835dc6dfc74bc9ad9b68ba5b3e6287434555bb09a27b3910c73f9b70ce140
3	SIZE (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 99394	3	SIZE (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 47584




--- Makefile.in.orig	2015-02-09 10:42:28 UTC
+++ Makefile.in
@@ -20,9 +20,9 @@ INSTALL = $(OCAMLFIND) install
 UNINSTALL = $(OCAMLFIND) remove
 else
 export OCAMLLIBDIR := lib/ocaml
-LIBDIR=$(DESTDIR)/$(OCAMLLIBDIR)
-BINDIR=$(DESTDIR)/bin
-MANDIR=$(DESTDIR)/man/man3
+LIBDIR=$(DESTDIR)$(prefix)/$(OCAMLLIBDIR)
+BINDIR=$(DESTDIR)$(exec_prefix)/bin
+MANDIR=$(DESTDIR)$(prefix)/man/man3
 INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
 UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
 endif




%%OCAML_SITELIBDIR%%/parmap/META
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmi
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmt
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmti
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmx
%%OCAML_SITELIBDIR%%/parmap/bytearray.ml
%%OCAML_SITELIBDIR%%/parmap/bytearray.mli
%%OCAML_SITELIBDIR%%/parmap/dune-package
%%OCAML_SITELIBDIR%%/parmap/libparmap_stubs.a
%%OCAML_SITELIBDIR%%/parmap/opam
%%OCAML_SITELIBDIR%%/parmap/parmap.a
%%OCAML_SITELIBDIR%%/parmap/parmap.cma
%%OCAML_SITELIBDIR%%/parmap/parmap.cmi
%%OCAML_SITELIBDIR%%/parmap/parmap.cmt
%%OCAML_SITELIBDIR%%/parmap/parmap.cmti
%%OCAML_SITELIBDIR%%/parmap/parmap.cmx
%%OCAML_SITELIBDIR%%/parmap/parmap.cmxa
%%OCAML_SITELIBDIR%%/parmap/parmap.cmxs
%%OCAML_SITELIBDIR%%/parmap/parmap.ml
%%OCAML_SITELIBDIR%%/parmap/parmap.mli
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmi
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmt
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmx
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.ml
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmi
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmt
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmti
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmx
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.ml
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.mli
%%OCAML_SITELIBDIR%%/parmap/setcore.cmi
%%OCAML_SITELIBDIR%%/parmap/setcore.cmt
%%OCAML_SITELIBDIR%%/parmap/setcore.cmx
%%OCAML_SITELIBDIR%%/parmap/setcore.ml
%%OCAML_SITELIBDIR%%/stublibs/dllparmap_stubs.so
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/odoc-pages/index.mld
- 

Return to bug 262793

Lines 1-7 Link Here

(-)b/devel/ocaml-parmap/Makefile (-7 / +18 lines)
1	# Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>	1	# Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
2		2
3	PORTNAME= parmap	3	PORTNAME= parmap
4	DISTVERSION= 1.0-rc9	4	DISTVERSION= 1.2.4
5	CATEGORIES= devel	5	CATEGORIES= devel
6	PKGNAMEPREFIX= ocaml-	6	PKGNAMEPREFIX= ocaml-
7		7
Lines 11-29 COMMENT= Minimalistic library allowing to exploit multicore architecture Link Here
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild	14	BUILD_DEPENDS= dune:devel/ocaml-dune \
		15	ocaml-dune-configurator>0:devel/ocaml-dune-configurator
		16	RUN_DEPENDS= ocaml-dune-configurator>0:devel/ocaml-dune-configurator
15		17
16	USE_GITHUB= yes	18	USE_GITHUB= yes
17	GH_ACCOUNT= rdicosmo	19	GH_ACCOUNT= rdicosmo
18		20
19	USES= gmake
20	GNU_CONFIGURE= yes
21	USE_OCAML= yes	21	USE_OCAML= yes
22	USE_OCAML_FINDLIB= yes
23	USE_OCAML_LDCONFIG= yes	22	USE_OCAML_LDCONFIG= yes
		23	OCAML_LDLIBS= ${OCAML_SITELIBDIR}/stublibs
		24
		25	INSTALL_ARGS= --destdir=${STAGEDIR} --libdir=${OCAML_SITELIBDIR}
		26	DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
		27
		28	OPTIONS_DEFINE= DOCS
		29
		30	do-build:
		31	(cd ${WRKSRC} && ${LOCALBASE}/bin/dune build --release)
		32
		33	do-install:
		34	(cd ${WRKSRC} && ${LOCALBASE}/bin/dune install ${INSTALL_ARGS})
24		35
25	post-install:	36	post-install:
26	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/parmap/*.cmxs	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/*.cmxs
27	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/*.so	38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/stublibs/*.so
28		39
29	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Removed Link Here

(-)a/devel/ocaml-parmap/files/patch-Makefile.in (-15 lines)
1	--- Makefile.in.orig 2015-02-09 10:42:28 UTC
2	+++ Makefile.in
3	@@ -20,9 +20,9 @@ INSTALL = $(OCAMLFIND) install
4	UNINSTALL = $(OCAMLFIND) remove
5	else
6	export OCAMLLIBDIR := lib/ocaml
7	-LIBDIR=$(DESTDIR)/$(OCAMLLIBDIR)
8	-BINDIR=$(DESTDIR)/bin
9	-MANDIR=$(DESTDIR)/man/man3
10	+LIBDIR=$(DESTDIR)$(prefix)/$(OCAMLLIBDIR)
11	+BINDIR=$(DESTDIR)$(exec_prefix)/bin
12	+MANDIR=$(DESTDIR)$(prefix)/man/man3
13	INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
14	UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
15	endif

Lines 1-22 Link Here

(-)b/devel/ocaml-parmap/pkg-plist (-23 / +39 lines)
1	lib/ocaml/parmap/META	1	%%OCAML_SITELIBDIR%%/parmap/META
2	lib/ocaml/parmap/bytearray.cmi	2	%%OCAML_SITELIBDIR%%/parmap/bytearray.cmi
3	lib/ocaml/parmap/bytearray.cmx	3	%%OCAML_SITELIBDIR%%/parmap/bytearray.cmt
4	lib/ocaml/parmap/bytearray.mli	4	%%OCAML_SITELIBDIR%%/parmap/bytearray.cmti
5	lib/ocaml/parmap/libparmap_stubs.a	5	%%OCAML_SITELIBDIR%%/parmap/bytearray.cmx
6	lib/ocaml/parmap/myocamlbuild.cmx	6	%%OCAML_SITELIBDIR%%/parmap/bytearray.ml
7	lib/ocaml/parmap/parmap_utils.cmi	7	%%OCAML_SITELIBDIR%%/parmap/bytearray.mli
8	lib/ocaml/parmap/parmap_utils.cmx	8	%%OCAML_SITELIBDIR%%/parmap/dune-package
9	lib/ocaml/parmap/parmap_utils.mli	9	%%OCAML_SITELIBDIR%%/parmap/libparmap_stubs.a
10	lib/ocaml/parmap/parmap.a	10	%%OCAML_SITELIBDIR%%/parmap/opam
11	lib/ocaml/parmap/parmap.cma	11	%%OCAML_SITELIBDIR%%/parmap/parmap.a
12	lib/ocaml/parmap/parmap.cmi	12	%%OCAML_SITELIBDIR%%/parmap/parmap.cma
13	lib/ocaml/parmap/parmap.cmx	13	%%OCAML_SITELIBDIR%%/parmap/parmap.cmi
14	lib/ocaml/parmap/parmap.cmxa	14	%%OCAML_SITELIBDIR%%/parmap/parmap.cmt
15	lib/ocaml/parmap/parmap.cmxs	15	%%OCAML_SITELIBDIR%%/parmap/parmap.cmti
16	lib/ocaml/parmap/parmap.mli	16	%%OCAML_SITELIBDIR%%/parmap/parmap.cmx
17	lib/ocaml/parmap/setcore.cmi	17	%%OCAML_SITELIBDIR%%/parmap/parmap.cmxa
18	lib/ocaml/parmap/setcore.cmx	18	%%OCAML_SITELIBDIR%%/parmap/parmap.cmxs
19	lib/ocaml/stublibs/dllparmap_stubs.so	19	%%OCAML_SITELIBDIR%%/parmap/parmap.ml
20	lib/ocaml/stublibs/dllparmap_stubs.so.owner	20	%%OCAML_SITELIBDIR%%/parmap/parmap.mli
21	man/man3/Parmap.3o.gz	21	%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmi
22	@dir %%OCAML_SITELIBDIR%%	22	%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmt
		23	%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmx
		24	%%OCAML_SITELIBDIR%%/parmap/parmap_compat.ml
		25	%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmi
		26	%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmt
		27	%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmti
		28	%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmx
		29	%%OCAML_SITELIBDIR%%/parmap/parmap_utils.ml
		30	%%OCAML_SITELIBDIR%%/parmap/parmap_utils.mli
		31	%%OCAML_SITELIBDIR%%/parmap/setcore.cmi
		32	%%OCAML_SITELIBDIR%%/parmap/setcore.cmt
		33	%%OCAML_SITELIBDIR%%/parmap/setcore.cmx
		34	%%OCAML_SITELIBDIR%%/parmap/setcore.ml
		35	%%OCAML_SITELIBDIR%%/stublibs/dllparmap_stubs.so
		36	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
		37	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
		38	%%PORTDOCS%%%%DOCSDIR%%/README.md
		39	%%PORTDOCS%%%%DOCSDIR%%/odoc-pages/index.mld
23	-