Re: [Update] sysutils/findlib 1.9.6

2023-01-07 Thread Daniel Dickman 
This diff looks good to me so ok daniel@ for it to be committed. But a few 
notes online below.

> On Jan 7, 2023, at 8:11 AM, Volker Schlecht  
> wrote:
> 
> Updates findlib to 1.9.6 in preparation for an eventual / possible / future 
> update of OCaml.

Please make sure to send diff to maintainer so they can have a chance to weigh 
in.

In the future I think you should say what testing was done. I built all the 
reverse dependencies on my end and also checked the two ports that have runtime 
deps on findlib.

> 
> * Does not add a build dependency on ocamlbuild - it took me a while to 
> figure out where I screwed up there ...

I think this deserves an explanation in the commit of why we need to do an 
update of findlib in order to support ocaml 4.13 or later.

> * The FAKE_FLAGS lead to fake installing into the wrong directory with 1.9.6

This is mentioned in the changes for findlib 1.9.4 that proper DESTDIR support 
was added. I think this should be mentioned in the commit. Your explanation 
above is not complete.

> * update-plist removed the @bin markers from PFRAG.dynlink-native, and I'm 
> not sure why they used to be there in the first place.
> 

Fine with me.

Re: [Update] sysutils/findlib 1.9.6

2023-01-07 Thread Daniel Dickman 



> On Jan 7, 2023, at 8:11 AM, Volker Schlecht  
> wrote:
> 
> Updates findlib to 1.9.6 in preparation for an eventual / possible / future 
> update of OCaml.

I’ll take a look but ocaml cannot be updated until ocaml-camlp5 is updated.

I suggest you target that port next and that we aim to move to ocaml 4.13.1 not 
the 4.14 series.


> 
> * Does not add a build dependency on ocamlbuild - it took me a while to 
> figure out where I screwed up there ...
> * The FAKE_FLAGS lead to fake installing into the wrong directory with 1.9.6
> * update-plist removed the @bin markers from PFRAG.dynlink-native, and I'm 
> not sure why they used to be there in the first place.
>

[Update] sysutils/findlib 1.9.6

2023-01-07 Thread Volker Schlecht 
Updates findlib to 1.9.6 in preparation for an eventual / possible / 
future update of OCaml.


* Does not add a build dependency on ocamlbuild - it took me a while to 
figure out where I screwed up there ...

* The FAKE_FLAGS lead to fake installing into the wrong directory with 1.9.6
* update-plist removed the @bin markers from PFRAG.dynlink-native, and 
I'm not sure why they used to be there in the first place.Index: Makefile
===
RCS file: /cvs/ports/sysutils/findlib/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile	11 Mar 2022 19:57:25 -	1.43
+++ Makefile	7 Jan 2023 11:07:42 -
@@ -1,7 +1,6 @@
 COMMENT=	OCaml package manager
 CATEGORIES=	sysutils
-DISTNAME=	findlib-1.8.1
-REVISION=	4
+DISTNAME=	findlib-1.9.6
 
 MASTER_SITES=	http://download.camlcity.org/download/
 
@@ -23,7 +22,6 @@ CONFIGURE_ARGS= -no-custom \
 		-config ${SYSCONFDIR}/findlib.conf
 
 USE_GMAKE=	Yes
-FAKE_FLAGS=	prefix=${DESTDIR}
 NO_TEST=	Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/findlib/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo	7 Sep 2019 18:45:02 -	1.13
+++ distinfo	7 Jan 2023 11:07:42 -
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.8.1.tar.gz) = joXPpX6HRXFUMt8xFml8j0HLJLXsFtHVrNJeAZbTQwM=
-SIZE (findlib-1.8.1.tar.gz) = 261544
+SHA256 (findlib-1.9.6.tar.gz) = LfmWJ5rha2Bttf9Yefk9v63giY258aPoL3+EX6opMKI=
+SIZE (findlib-1.9.6.tar.gz) = 271246
Index: pkg/PFRAG.dynlink-native
===
RCS file: /cvs/ports/sysutils/findlib/pkg/PFRAG.dynlink-native,v
retrieving revision 1.6
diff -u -p -r1.6 PFRAG.dynlink-native
--- pkg/PFRAG.dynlink-native	11 Mar 2022 19:57:25 -	1.6
+++ pkg/PFRAG.dynlink-native	7 Jan 2023 11:07:42 -
@@ -1,3 +1,3 @@
-@bin lib/ocaml/findlib/findlib.cmxs
-@bin lib/ocaml/findlib/findlib_dynload.cmxs
-@bin lib/ocaml/findlib/findlib_top.cmxs
+lib/ocaml/findlib/findlib.cmxs
+lib/ocaml/findlib/findlib_dynload.cmxs
+lib/ocaml/findlib/findlib_top.cmxs
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/findlib/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST	11 Mar 2022 19:57:25 -	1.20
+++ pkg/PLIST	7 Jan 2023 11:07:42 -
@@ -13,18 +13,27 @@ lib/ocaml/dynlink/META
 lib/ocaml/findlib/
 lib/ocaml/findlib/META
 lib/ocaml/findlib/Makefile.config
+lib/ocaml/findlib/Makefile.packages
 lib/ocaml/findlib/findlib.cma
 lib/ocaml/findlib/findlib.cmi
 lib/ocaml/findlib/findlib.mli
+lib/ocaml/findlib/findlib_config.cmi
+lib/ocaml/findlib/findlib_config.ml
 lib/ocaml/findlib/findlib_dynload.cma
 lib/ocaml/findlib/findlib_top.cma
+lib/ocaml/findlib/fl_args.cmi
 lib/ocaml/findlib/fl_dynload.cmi
 lib/ocaml/findlib/fl_dynload.mli
+lib/ocaml/findlib/fl_lint.cmi
+lib/ocaml/findlib/fl_meta.cmi
 lib/ocaml/findlib/fl_metascanner.cmi
 lib/ocaml/findlib/fl_metascanner.mli
 lib/ocaml/findlib/fl_metatoken.cmi
 lib/ocaml/findlib/fl_package_base.cmi
 lib/ocaml/findlib/fl_package_base.mli
+lib/ocaml/findlib/fl_split.cmi
+lib/ocaml/findlib/fl_topo.cmi
+lib/ocaml/findlib/ocaml_args.cmi
 lib/ocaml/findlib/topfind.cmi
 lib/ocaml/findlib/topfind.mli
 @comment will be installed by graphics/ocaml-graphics