Attachment #232700 for bug #262791

View | Details | Raw Unified | Return to bug 262791
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/devel/ocaml-findlib/Makefile (-1 / +2 lines)
1	# Created by: ijliao	1	# Created by: ijliao
2		2
3	PORTNAME= findlib	3	PORTNAME= findlib
4	PORTVERSION= 1.7.3	4	PORTVERSION= 1.8.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= http://download.camlcity.org/download/	6	MASTER_SITES= http://download.camlcity.org/download/
7	PKGNAMEPREFIX= ocaml-	7	PKGNAMEPREFIX= ocaml-
Lines 12-17 COMMENT= OCaml package manager Link Here
12	LICENSE= MIT	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
		15	BUILD_DEPENDS= ocaml-ocamlbuild>0:devel/ocaml-ocamlbuild
15	USES= gmake	16	USES= gmake
16	USE_OCAML= yes	17	USE_OCAML= yes
17	USE_OCAML_CAMLP4=yes	18	USE_OCAML_CAMLP4=yes

Lines 1-3 Link Here

(-)b/devel/ocaml-findlib/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496673173	1	TIMESTAMP = 1646505555
2	SHA256 (findlib-1.7.3.tar.gz) = d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b	2	SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
3	SIZE (findlib-1.7.3.tar.gz) = 257703	3	SIZE (findlib-1.8.1.tar.gz) = 261544




--- configure.orig	2016-11-18 13:04:45 UTC
+++ configure
@@ -516,7 +516,8 @@ fi
 
 # bytes?
 
-if [ -f "${ocaml_core_stdlib}/bytes.cmi" ]; then
+if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \
+     -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" ]; then
     echo "bytes: found, installing fake library"
     lbytes="bytes"
     cbytes=0




--- src/findlib/Makefile.orig	2019-07-29 12:06:35 UTC
+++ src/findlib/Makefile
@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
 OCAMLLEX = ocamllex

 
 
 OBJECTS        = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
@@ -118,23 +119,23 @@ clean:
 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
 
 install: all

+	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
 	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
-	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+	cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \

 	if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
 	    cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
-	    cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
+	    cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 	fi
 
 install-num-top:




%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern
%%OCAML_SITELIBDIR%%/findlib/topfind.cmi
%%OCAML_SITELIBDIR%%/findlib/topfind.mli
%%OCAML_SITELIBDIR%%/graphics/META
%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
%%OCAML_SITELIBDIR%%/ocamlbuild/META
%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cma
%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
%%NUM%%%%OCAML_SITELIBDIR%%/num/META
%%OCAML_SITELIBDIR%%/ocamldoc/META
%%OCAML_SITELIBDIR%%/raw_spacetime/META
%%OCAML_SITELIBDIR%%/stdlib/META
%%OCAML_SITELIBDIR%%/str/META
%%OCAML_SITELIBDIR%%/threads/META
- 

Return to bug 262791

Removed Link Here

(-)a/devel/ocaml-findlib/files/patch-configure (-12 lines)
1	--- configure.orig 2016-11-18 13:04:45 UTC
2	+++ configure
3	@@ -516,7 +516,8 @@ fi
4
5	# bytes?
6
7	-if [ -f "${ocaml_core_stdlib}/bytes.cmi" ]; then
8	+if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \
9	+ -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" ]; then
10	echo "bytes: found, installing fake library"
11	lbytes="bytes"
12	cbytes=0

Lines 1-4 Link Here

(-)b/devel/ocaml-findlib/files/patch-src_findlib_Makefile (-4 / +4 lines)
1	--- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC	1	--- src/findlib/Makefile.orig 2019-07-29 12:06:35 UTC
2	+++ src/findlib/Makefile	2	+++ src/findlib/Makefile
3	@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep	3	@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
4	OCAMLLEX = ocamllex	4	OCAMLLEX = ocamllex
Lines 8-14 Link Here
8		8
9		9
10	OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \	10	OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
11	@@ -119,23 +120,23 @@ clean:	11	@@ -118,23 +119,23 @@ clean:
12	ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)	12	ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
13		13
14	install: all	14	install: all
Lines 18-24 Link Here
18	+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"	18	+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
19	+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"	19	+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
20	+ test $(INSTALL_TOPFIND) -eq 0 \|\| cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"	20	+ test $(INSTALL_TOPFIND) -eq 0 \|\| cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
21	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \	21	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
22	- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"	22	- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
23	+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"	23	+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
24	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \	24	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
Lines 28-34 Link Here
28	if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \	28	if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
29	cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \	29	cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
30	- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \	30	- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
31	+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \	31	+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
32	fi	32	fi
33		33
34	install-num-top:	34	install-num-top:

Lines 33-47 bin/safe_camlp4 Link Here

(-)b/devel/ocaml-findlib/pkg-plist (-8 / +1 lines)
33	%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern	33	%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern
34	%%OCAML_SITELIBDIR%%/findlib/topfind.cmi	34	%%OCAML_SITELIBDIR%%/findlib/topfind.cmi
35	%%OCAML_SITELIBDIR%%/findlib/topfind.mli	35	%%OCAML_SITELIBDIR%%/findlib/topfind.mli
36	%%OCAML_SITELIBDIR%%/graphics/META
37	%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META	36	%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
38	%%NUM%%%%OCAML_SITELIBDIR%%/num-top/META	37	%%OCAML_SITELIBDIR%%/ocamlbuild/META
39	%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cma
40	%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
41	%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
42	%%NUM%%%%OCAML_SITELIBDIR%%/num/META
43	%%OCAML_SITELIBDIR%%/ocamldoc/META	38	%%OCAML_SITELIBDIR%%/ocamldoc/META
44	%%OCAML_SITELIBDIR%%/raw_spacetime/META
45	%%OCAML_SITELIBDIR%%/stdlib/META	39	%%OCAML_SITELIBDIR%%/stdlib/META
46	%%OCAML_SITELIBDIR%%/str/META	40	%%OCAML_SITELIBDIR%%/str/META
47	%%OCAML_SITELIBDIR%%/threads/META	41	%%OCAML_SITELIBDIR%%/threads/META
48	-