<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/933282c07b2169c5b8b942b200072438a61435c4">https://github.com/macports/macports-ports/commit/933282c07b2169c5b8b942b200072438a61435c4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 933282c07b2 ocaml-ocamlfind: update to 1.9.1
</span>933282c07b2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 933282c07b2169c5b8b942b200072438a61435c4
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Sun Aug 22 20:32:45 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> ocaml-ocamlfind: update to 1.9.1
</span>---
ocaml/ocaml-findlib/Portfile | 33 +++++----------
ocaml/ocaml-findlib/files/camlp4find | 69 -------------------------------
ocaml/ocaml-findlib/files/patch-meta.diff | 16 -------
ocaml/ocaml-findlib/files/patch-zsh.diff | 16 +++++++
4 files changed, 27 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-findlib/Portfile b/ocaml/ocaml-findlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a67466bbae..88a7f5ad2ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-findlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-findlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name ocaml-findlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ocaml ocamlfind 1.9.1 findlib-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> distname findlib-${version}
categories ocaml devel
maintainers {pmetzger @pmetzger} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,28 +28,20 @@ long_description The findlib library provides a scheme to manage reusable \
</span> are new frontends of the various OCaml compilers that \
can directly deal with packages.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://projects.camlcity.org/projects/findlib.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.camlcity.org/download/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad880f92351ea31e3741b683d85d1fe04df387d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 261544
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "findlib-(.*?).tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b1495a782a05e0049aecdf745bde85367368cc5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b736221800dcf2fdc4d0cb20b35d3adcb7812c5f3f16d8a2627cff675b082396 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 167983
</span>
depends_lib port:ocaml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see #44929
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch modified from https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-ml/findlib/files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if labltk is updated, patchfile will have to remove labltk META file as well
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meta.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-zsh.diff
</span>
configure.args -bindir ${prefix}/bin \
-mandir ${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sitelib ${prefix}/lib/ocaml/site-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sitelib ${prefix}/lib/ocaml/site-lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-camlp4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args
</span>
use_parallel_build no
build.target all opt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +56,6 @@ destroot.keepdirs ${destroot}${ocamlfind_destdir}
</span> destroot.env-append OCAMLFIND_DESTDIR=${destroot}${prefix}/lib/ocaml/site-lib
destroot.destdir prefix=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -m 755 ${filespath}/camlp4find ${destroot}${prefix}/bin/camlp4find
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-activate {
# Add our stublibs dir path to ld.conf
set ldconfpath [exec ${prefix}/bin/ocamlfind printconf ldconf]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +71,7 @@ post-activate {
</span> }
}
if {!$has_line} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${registry.format} == "receipt_flat"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${registry.format} eq "receipt_flat"} {
</span> ui_msg "## Adding line `${ocamlfind_destdir}' to file ${ldconfpath}"
ui_msg "## Be sure to remove this line if you uninstall ${name}"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-findlib/files/camlp4find b/ocaml/ocaml-findlib/files/camlp4find
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a636798c15e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-findlib/files/camlp4find
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# A camlp4o/ocamlfind combo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Public Domain. Use at your own risk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Please report bugs and fixes to Martin Jambon <martin_jambon@emailuser.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Thanks to Gerd Stolpmann
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src=''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pkg=''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-syntax='camlp4o'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libfiles=''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-usage(){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo 'camlp4find is a preprocessing command which can be used instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-of camlp4o or camlp4r in order to use ocamlfind packages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Usage: camlp4find [camlp4o|camlp4r] [packages] [files to parse]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlp4find -echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlp4find -help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-A "file to parse" can be specified as follows:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- somefile.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- somefile.mli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -impl anyfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -intf anyfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo displays the command which should be executed and exits
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--help displays this message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Example:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The following command assumes that the packages pa_tryfinally, pa_openin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and micmatch_pcre are installed. pr_o.cmo is the standard module which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-will generate a human-readable output for the preprocessed OCaml code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The file to process does not end in .ml, so we have to use the -impl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-option exactly like with camlp4o:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlp4find pa_tryfinally pa_openin micmatch_pcre pr_o.cmo -impl somefile.mml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-' 1>&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-while : ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$1" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "") break;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlp4o) syntax=camlp4o;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlp4r) syntax=camlp4r;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -impl) shift; src="$src -impl $1";;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -intf) shift; src="$src -intf $1";;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *.ml) src="$src $1";;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *.cmo|*.cma) libfiles="$libfiles $1";;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -echo) echo=true;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -*) usage;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) pkg="$pkg $1";;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-i_options=`ocamlfind query -predicates "syntax,preprocessor,$syntax" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$pkg -i-format`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a_options=`ocamlfind query -predicates "syntax,preprocessor,$syntax" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$pkg -a-format`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmd="$syntax $i_options $a_options -I +camlp4 $libfiles $src"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z "$echo" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then exec $cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else echo $cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-findlib/files/patch-meta.diff b/ocaml/ocaml-findlib/files/patch-meta.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7254167e54a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-findlib/files/patch-meta.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Avoid installing META files for camlp4, labltk, and num.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Those are provided by their respective packages now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: findlib-1.8.0/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -576,7 +576,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Generate the META files now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--l="$ldbm dynlink $lgraphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+l="$ldbm dynlink $lgraphics str threads unix stdlib bigarray ocamldoc $lobuild $lcomplibs $lbytes $lspacetime"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in site-lib-src/*; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We do not really know if $dir is a directory.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-findlib/files/patch-zsh.diff b/ocaml/ocaml-findlib/files/patch-zsh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f7cb347d78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-findlib/files/patch-zsh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix shell syntax to be compatible with zsh.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ocaml/ocamlfind/issues/21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ocaml/ocamlfind/pull/22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,8 +90,8 @@ check-installation:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -f "$(prefix)$(OCAML_SITELIB)/$$x/META" ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! grep -Fq '[distributed with Ocaml]' "$(prefix)/$(OCAML_SITELIB)/$$x/META"; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f site-lib-src/$$x/META; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test -f "site-lib-src/num/META" || rm -f "site-lib-src/num-top/META"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span></pre><pre style='margin:0'>
</pre>