FreeBSD Bugzilla – Attachment 232700 Details for
Bug 262791
devel/ocaml-findlib: upgrade to 1.8.1 in order to chase the upgrade of OCaml
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Upgrade to 1.8.1
devel_ocaml-findlib.diff (text/plain), 5.69 KB, created by
Thierry Thomas
on 2022-03-25 11:16:22 UTC
(
hide
)
Description:
Upgrade to 1.8.1
Filename:
MIME Type:
Creator:
Thierry Thomas
Created:
2022-03-25 11:16:22 UTC
Size:
5.69 KB
patch
obsolete
>From a484100d63c93d975fb5a904c0afda13fb1bac03 Mon Sep 17 00:00:00 2001 >From: Thierry Thomas <thierry@FreeBSD.org> >Date: Sat, 5 Mar 2022 20:26:40 +0100 >Subject: [PATCH] devel/ocaml-findlib: upgrade to 1.8.1 > >Chasing the upgrade of lang/ocaml to 4.12.1. >--- > devel/ocaml-findlib/Makefile | 3 ++- > devel/ocaml-findlib/distinfo | 6 +++--- > devel/ocaml-findlib/files/patch-configure | 12 ------------ > devel/ocaml-findlib/files/patch-src_findlib_Makefile | 8 ++++---- > devel/ocaml-findlib/pkg-plist | 8 +------- > 5 files changed, 10 insertions(+), 27 deletions(-) > delete mode 100644 devel/ocaml-findlib/files/patch-configure > >diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile >index e9d8817fd437..5a3252bb051c 100644 >--- a/devel/ocaml-findlib/Makefile >+++ b/devel/ocaml-findlib/Makefile >@@ -1,7 +1,7 @@ > # Created by: ijliao > > PORTNAME= findlib >-PORTVERSION= 1.7.3 >+PORTVERSION= 1.8.1 > CATEGORIES= devel > MASTER_SITES= http://download.camlcity.org/download/ > PKGNAMEPREFIX= ocaml- >@@ -12,6 +12,7 @@ COMMENT= OCaml package manager > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >+BUILD_DEPENDS= ocaml-ocamlbuild>0:devel/ocaml-ocamlbuild > USES= gmake > USE_OCAML= yes > USE_OCAML_CAMLP4=yes >diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo >index 967f18478c77..23e35f51c89f 100644 >--- a/devel/ocaml-findlib/distinfo >+++ b/devel/ocaml-findlib/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1496673173 >-SHA256 (findlib-1.7.3.tar.gz) = d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b >-SIZE (findlib-1.7.3.tar.gz) = 257703 >+TIMESTAMP = 1646505555 >+SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303 >+SIZE (findlib-1.8.1.tar.gz) = 261544 >diff --git a/devel/ocaml-findlib/files/patch-configure b/devel/ocaml-findlib/files/patch-configure >deleted file mode 100644 >index 4b41a7aba575..000000000000 >--- a/devel/ocaml-findlib/files/patch-configure >+++ /dev/null >@@ -1,12 +0,0 @@ >---- 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 >diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile >index ed355991105d..2009039057e4 100644 >--- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile >+++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile >@@ -1,4 +1,4 @@ >---- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC >+--- src/findlib/Makefile.orig 2019-07-29 12:06:35 UTC > +++ src/findlib/Makefile > @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep > OCAMLLEX = ocamllex >@@ -8,7 +8,7 @@ > > > OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \ >-@@ -119,23 +120,23 @@ clean: >+@@ -118,23 +119,23 @@ clean: > ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) > > install: all >@@ -18,7 +18,7 @@ > + 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.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` && \ >+ 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)"; }; \ >@@ -28,7 +28,7 @@ > 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)/"; \ >++ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" > fi > > install-num-top: >diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist >index f9614c2d3703..9fb06d553047 100644 >--- a/devel/ocaml-findlib/pkg-plist >+++ b/devel/ocaml-findlib/pkg-plist >@@ -33,15 +33,9 @@ bin/safe_camlp4 > %%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 >-%%NUM%%%%OCAML_SITELIBDIR%%/num-top/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%%/ocamlbuild/META > %%OCAML_SITELIBDIR%%/ocamldoc/META >-%%OCAML_SITELIBDIR%%/raw_spacetime/META > %%OCAML_SITELIBDIR%%/stdlib/META > %%OCAML_SITELIBDIR%%/str/META > %%OCAML_SITELIBDIR%%/threads/META >-- >2.35.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 262791
: 232700