Re: [Update] sysutils/findlib 1.9.6
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
> 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
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
UPDATE: sysutils/findlib
Hi,
I'd like to update findlib to the latest upstream release. Tested by
bulk building all OCaml ports on amd64 with dynlink-native, without
dynlink and bytecode only. OK?
Christopher
diff -x CVS -Nru sysutils/findlib/Makefile
/usr/ports/mystuff/sysutils/findlib/Makefile
--- sysutils/findlib/Makefile Thu Aug 21 22:54:04 2014
+++ /usr/ports/mystuff/sysutils/findlib/MakefileMon Aug 25 14:28:55 2014
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2014/08/21 20:54:04 chrisz Exp $
+# $OpenBSD: Makefile,v 1.26 2013/03/11 11:41:30 espie Exp $
COMMENT= OCaml package manager
CATEGORIES=sysutils
-DISTNAME= findlib-1.3.3
-REVISION= 2
+DISTNAME= findlib-1.5.2
MASTER_SITES= http://download.camlcity.org/download/
MAINTAINER=Anil Madhavapeddy a...@openbsd.org
@@ -12,11 +11,11 @@
# MIT/X11
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB = c m
-MODULES+= lang/ocaml x11/tk
-BUILD_DEPENDS +=lang/ocaml,-labltk
-NO_TEST= Yes
+MODULES+= x11/tk
+RUN_DEPENDS += lang/ocaml
+BUILD_DEPENDS += lang/ocaml lang/ocaml,-labltk lang/ocaml,-camlp4
+
CONFIGURE_STYLE=simple
CONFIGURE_ARGS=-with-toolbox \
-no-custom \
@@ -25,12 +24,23 @@
USE_GMAKE= Yes
FAKE_FLAGS=prefix=${DESTDIR}
+NO_TEST= Yes
-ALL_TARGET=all
.include bsd.port.arch.mk
.if ${PROPERTIES:Mocaml_native}
-ALL_TARGET += opt
+PKG_ARGS+=-Dnative=1
+ALL_TARGET += all opt
+.else
+PKG_ARGS+=-Dnative=0
+ALL_TARGET = all
.endif
+
+.if ${PROPERTIES:Mocaml_native_dynlink}
+PKG_ARGS+=-Ddynlink=1
+.else
+PKG_ARGS+=-Ddynlink=0
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/findlib
diff -x CVS -Nru sysutils/findlib/distinfo
/usr/ports/mystuff/sysutils/findlib/distinfo
--- sysutils/findlib/distinfo Sun Aug 19 00:24:50 2012
+++ /usr/ports/mystuff/sysutils/findlib/distinfoFri Aug 22 12:50:01 2014
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.3.3.tar.gz) = mB9cZxGKK+AV76efOvPLAGM3a5MSO11pXny1xYax1Fw=
-SIZE (findlib-1.3.3.tar.gz) = 231414
+SHA256 (findlib-1.5.2.tar.gz) = cL4xFXF5K2zZI7z00qWBosw4Zc8Xvp/Ya8W0vR6HIv0=
+SIZE (findlib-1.5.2.tar.gz) = 235561
diff -x CVS -Nru sysutils/findlib/patches/patch-Makefile
/usr/ports/mystuff/sysutils/findlib/patches/patch-Makefile
--- sysutils/findlib/patches/patch-Makefile Thu Jan 3 15:30:57 2013
+++ /usr/ports/mystuff/sysutils/findlib/patches/patch-Makefile Thu Jan 1
01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2013/01/03 14:30:57 chrisz Exp $
Makefile.orig Mon Dec 31 12:38:03 2012
-+++ Makefile Mon Dec 31 12:38:58 2012
-@@ -63,6 +63,10 @@ findlib.conf: findlib.conf.in
- if ocamldep.opt /dev/null 21; then \
- echo 'ocamldep=ocamldep.opt' findlib.conf; \
- fi
-+ if ocamldoc.opt /dev/null 21; then \
-+ echo '#Please consider that ocamldoc plugins depend on
dynlink' findlib.conf; \
-+ echo '#ocamldoc=ocamldoc.opt' findlib.conf; \
-+ fi
-
- .PHONY: install-doc
- install-doc:
diff -x CVS -Nru sysutils/findlib/patches/patch-configure
/usr/ports/mystuff/sysutils/findlib/patches/patch-configure
--- sysutils/findlib/patches/patch-configureThu Jan 3 15:30:57 2013
+++ /usr/ports/mystuff/sysutils/findlib/patches/patch-configure Thu Jan 1
01:00:00 1970
@@ -1,50 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2013/01/03 14:30:57 chrisz Exp $
configure.orig Mon Jul 9 11:29:16 2012
-+++ configure Mon Dec 31 13:43:10 2012
-@@ -116,6 +116,7 @@ ocaml_sitelib=
- ocamlfind_config=
- with_toolbox=0
- with_topfind=1
-+custom=-custom
- system=
-
- while [ $# != 0 ]; do
-@@ -132,6 +133,9 @@ while [ $# != 0 ]; do
- -config) ocamlfind_config=$2
-shift 2
-;;
-+-no-custom) custom=
-+ shift
-+ ;;
- -cygpath) system=mingw
-shift
-;;
-@@ -153,6 +157,7 @@ while [ $# != 0 ]; do
- echo -mandir path where manual pages are
installed 12
- echo -sitelib pathset the location of the
site-specific packages 12
- echo -config path set the location of the
configuration file 12
-+echo -no-custom don't link in custom runtime
mode 12
- echo -system systypeoverride system type (esp. mingw
and win32) 12
- echo -with-toolboxalso build the toolbox 12
- echo -no-topfind don't install topfind script
into stdlib directory 12
-@@ -536,6 +541,7 @@ echo OCAMLFIND_CONF=${ocamlfind_config} Makefile.c
- echo OCAML_AUTOLINK=${ocaml_autolink} Makefile.config
- echo OCAML_REMOVE_DIRECTORY=${have_remdir} Makefile.config
- echo EXEC_SUFFIX=${exec_suffix} Makefile.config
-+echo CUSTOM=${custom} Makefile.config
- echo PARTS=${parts} Makefile.config
- echo INSTALL_TOPFIND=${with_topfind} Makefile.config
- echo USE_CYGPATH=${use_cygpath}
Re: UPDATE: sysutils/findlib
ok @avsm (this is needed for the 4.02 update as well, to support ppx)
-anil
On 25 Aug 2014, at 14:38, Christopher Zimmermann chr...@openbsd.org wrote:
Hi,
I'd like to update findlib to the latest upstream release. Tested by
bulk building all OCaml ports on amd64 with dynlink-native, without
dynlink and bytecode only. OK?
Christopher
diff -x CVS -Nru sysutils/findlib/Makefile
/usr/ports/mystuff/sysutils/findlib/Makefile
--- sysutils/findlib/Makefile Thu Aug 21 22:54:04 2014
+++ /usr/ports/mystuff/sysutils/findlib/Makefile Mon Aug 25 14:28:55 2014
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2014/08/21 20:54:04 chrisz Exp $
+# $OpenBSD: Makefile,v 1.26 2013/03/11 11:41:30 espie Exp $
COMMENT= OCaml package manager
CATEGORIES= sysutils
-DISTNAME=findlib-1.3.3
-REVISION=2
+DISTNAME=findlib-1.5.2
MASTER_SITES= http://download.camlcity.org/download/
MAINTAINER= Anil Madhavapeddy a...@openbsd.org
@@ -12,11 +11,11 @@
# MIT/X11
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB =c m
-MODULES+=lang/ocaml x11/tk
-BUILD_DEPENDS +=lang/ocaml,-labltk
-NO_TEST= Yes
+MODULES+=x11/tk
+RUN_DEPENDS += lang/ocaml
+BUILD_DEPENDS += lang/ocaml lang/ocaml,-labltk lang/ocaml,-camlp4
+
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= -with-toolbox \
-no-custom \
@@ -25,12 +24,23 @@
USE_GMAKE=Yes
FAKE_FLAGS= prefix=${DESTDIR}
+NO_TEST= Yes
-ALL_TARGET= all
.include bsd.port.arch.mk
.if ${PROPERTIES:Mocaml_native}
-ALL_TARGET +=opt
+PKG_ARGS+=-Dnative=1
+ALL_TARGET +=all opt
+.else
+PKG_ARGS+=-Dnative=0
+ALL_TARGET = all
.endif
+
+.if ${PROPERTIES:Mocaml_native_dynlink}
+PKG_ARGS+=-Ddynlink=1
+.else
+PKG_ARGS+=-Ddynlink=0
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/findlib
diff -x CVS -Nru sysutils/findlib/distinfo
/usr/ports/mystuff/sysutils/findlib/distinfo
--- sysutils/findlib/distinfo Sun Aug 19 00:24:50 2012
+++ /usr/ports/mystuff/sysutils/findlib/distinfo Fri Aug 22 12:50:01 2014
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.3.3.tar.gz) = mB9cZxGKK+AV76efOvPLAGM3a5MSO11pXny1xYax1Fw=
-SIZE (findlib-1.3.3.tar.gz) = 231414
+SHA256 (findlib-1.5.2.tar.gz) = cL4xFXF5K2zZI7z00qWBosw4Zc8Xvp/Ya8W0vR6HIv0=
+SIZE (findlib-1.5.2.tar.gz) = 235561
diff -x CVS -Nru sysutils/findlib/patches/patch-Makefile
/usr/ports/mystuff/sysutils/findlib/patches/patch-Makefile
--- sysutils/findlib/patches/patch-Makefile Thu Jan 3 15:30:57 2013
+++ /usr/ports/mystuff/sysutils/findlib/patches/patch-MakefileThu Jan
1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2013/01/03 14:30:57 chrisz Exp $
Makefile.origMon Dec 31 12:38:03 2012
-+++ Makefile Mon Dec 31 12:38:58 2012
-@@ -63,6 +63,10 @@ findlib.conf: findlib.conf.in
- if ocamldep.opt /dev/null 21; then \
- echo 'ocamldep=ocamldep.opt' findlib.conf; \
- fi
-+if ocamldoc.opt /dev/null 21; then \
-+echo '#Please consider that ocamldoc plugins depend on
dynlink' findlib.conf; \
-+echo '#ocamldoc=ocamldoc.opt' findlib.conf; \
-+fi
-
- .PHONY: install-doc
- install-doc:
diff -x CVS -Nru sysutils/findlib/patches/patch-configure
/usr/ports/mystuff/sysutils/findlib/patches/patch-configure
--- sysutils/findlib/patches/patch-configure Thu Jan 3 15:30:57 2013
+++ /usr/ports/mystuff/sysutils/findlib/patches/patch-configure Thu Jan
1 01:00:00 1970
@@ -1,50 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2013/01/03 14:30:57 chrisz Exp $
configure.orig Mon Jul 9 11:29:16 2012
-+++ configureMon Dec 31 13:43:10 2012
-@@ -116,6 +116,7 @@ ocaml_sitelib=
- ocamlfind_config=
- with_toolbox=0
- with_topfind=1
-+custom=-custom
- system=
-
- while [ $# != 0 ]; do
-@@ -132,6 +133,9 @@ while [ $# != 0 ]; do
- -config) ocamlfind_config=$2
- shift 2
- ;;
-+-no-custom) custom=
-+ shift
-+ ;;
- -cygpath) system=mingw
- shift
- ;;
-@@ -153,6 +157,7 @@ while [ $# != 0 ]; do
- echo -mandir path where manual pages are
installed 12
- echo -sitelib pathset the location of the
site-specific packages 12
- echo -config path set the location of the
configuration file 12
-+ echo -no-custom don't link in custom runtime
mode 12
- echo -system systypeoverride system type (esp. mingw
and win32) 12
- echo -with-toolboxalso build the toolbox 12
- echo -no-topfind don't install topfind script
into stdlib directory 12
-@@ -536,6 +541,7 @@ echo OCAMLFIND_CONF=${ocamlfind_config} Makefile.c
- echo OCAML_AUTOLINK=${ocaml_autolink} Makefile.config
- echo OCAML_REMOVE_DIRECTORY=${have_remdir} Makefile.config
-
UPDATE: sysutils/findlib
Hi, here's an update to findlib. Also include PFRAG.native in PLIST. Index: Makefile === RCS file: /cvs/ports/sysutils/findlib/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile21 Dec 2011 21:32:37 - 1.20 +++ Makefile30 May 2012 08:09:53 - @@ -2,11 +2,11 @@ COMMENT= Objective Caml package manager CATEGORIES=sysutils -DISTNAME= findlib-1.2.7 -MASTER_SITES= http://www.ocaml-programming.de/packages/ +DISTNAME= findlib-1.3.1 +MASTER_SITES= http://download.camlcity.org/download/ MAINTAINER=Anil Madhavapeddy a...@openbsd.org -HOMEPAGE= http://www.ocaml-programming.de/packages/ +HOMEPAGE= http://projects.camlcity.org/projects/findlib.html # MIT/X11 PERMIT_PACKAGE_FTP=Yes Index: distinfo === RCS file: /cvs/ports/sysutils/findlib/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo21 Dec 2011 21:32:37 - 1.6 +++ distinfo30 May 2012 08:09:53 - @@ -1,5 +1,5 @@ -MD5 (findlib-1.2.7.tar.gz) = AAv/cj6NPXJ6ft1bWQG1QA== -RMD160 (findlib-1.2.7.tar.gz) = 03Sp3P7mniQo6QSneIJhbdT+Yec= -SHA1 (findlib-1.2.7.tar.gz) = u5nahqRU7HVcnF5KRkATvlx2aAE= -SHA256 (findlib-1.2.7.tar.gz) = ySCxKeSLOzE+Z7kVoHirBqnd0uBy8zU+36dBRPJWAps= -SIZE (findlib-1.2.7.tar.gz) = 163452 +MD5 (findlib-1.3.1.tar.gz) = 5jK62H8ce+lBSmt1QjK6AQ== +RMD160 (findlib-1.3.1.tar.gz) = yKYJ10333YeFCuNMiDB682NrILw= +SHA1 (findlib-1.3.1.tar.gz) = mW2P9DcuF4qfsYtpC7l0aEd2PYI= +SHA256 (findlib-1.3.1.tar.gz) = nksGPDsQ82AGUh+070V9h8KgaEpV52wXdvvOcHQiuXg= +SIZE (findlib-1.3.1.tar.gz) = 229719 Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/findlib/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 21 Dec 2011 21:32:37 - 1.7 +++ pkg/PLIST 30 May 2012 08:09:53 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.7 2011/12/21 21:32:37 avsm Exp $ +%%native%% @bin bin/ocamlfind bin/safe_camlp4 lib/ocaml/
