<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/23728b4ad367361e91a866caf54bf778ec3ff841">https://github.com/macports/macports-ports/commit/23728b4ad367361e91a866caf54bf778ec3ff841</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 23728b4ad36 Fix geneweb incompatibility with camlp5 8.03.0 (#24362)
</span>23728b4ad36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 23728b4ad367361e91a866caf54bf778ec3ff841
</span>Author: Paul Guyot <pguyot@kallisys.net>
AuthorDate: Thu Jun 6 20:37:51 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> Fix geneweb incompatibility with camlp5 8.03.0 (#24362)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ocaml-ocamlgraph: new port 2.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Paul Guyot <pguyot@kallisys.net>
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ocaml-not-ocamlfind: new port 0.13
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Paul Guyot <pguyot@kallisys.net>
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ocaml-ppx_blob: increase revision as ocaml-ppxlib was updated
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Paul Guyot <pguyot@kallisys.net>
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * geneweb: fix incompatibility with camlp5 8.03.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Add upstream patch in PR1806
</span><span style='display:block; white-space:pre;color:#404040;'> * Add ocaml-notocamlfind as a dependency required by upstream patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/70174
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Paul Guyot <pguyot@kallisys.net>
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ---------
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Paul Guyot <pguyot@kallisys.net>
</span>---
genealogy/geneweb/Portfile | 8 +-
genealogy/geneweb/files/patch-Makefile-PR1806.diff | 182 +++++++++++++++++++++
ocaml/ocaml-not-ocamlfind/Portfile | 39 +++++
.../ocaml-not-ocamlfind/files/patch-Makefile.diff | 10 ++
ocaml/ocaml-ocamlgraph/Portfile | 30 ++++
ocaml/ocaml-ppx_blob/Portfile | 2 +-
6 files changed, 268 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/genealogy/geneweb/Portfile b/genealogy/geneweb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbb46f7daee..aa8ce49c1de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/genealogy/geneweb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/genealogy/geneweb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup geneweb geneweb 7.1-beta v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories genealogy
maintainers {pguyot @pguyot} openmaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,7 @@ depends_lib port:ocaml \
</span> port:ocaml-fmt \
port:ocaml-jingoo \
port:ocaml-markup \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-not-ocamlfind \
</span> port:ocaml-num \
port:ocaml-ocamlformat \
port:ocaml-ounit \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +70,10 @@ startupitem.executable \
</span> -daemon
startupitem.pidfile none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-bin-gwrepl-mk_data.ml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Include PR1806 to fix compatibility with camlp5 8.03.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/geneweb/geneweb/pull/1806/files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-bin-gwrepl-mk_data.ml.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile-PR1806.diff
</span> post-patch {
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" \
${worksrcpath}/bin/gwrepl/mk_data.ml
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/genealogy/geneweb/files/patch-Makefile-PR1806.diff b/genealogy/geneweb/files/patch-Makefile-PR1806.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..20b5f748626
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/genealogy/geneweb/files/patch-Makefile-PR1806.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,182 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile 2024-04-18 11:42:42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2024-06-06 10:39:46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPIL_DATE := $(shell date +'%Y-%m-%d')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMIT_DATE := $(shell git show -s --date=short --pretty=format:'%cd')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMIT_ID := $(shell git rev-parse --short HEAD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-COMMIT_MSG := $(shell git log -1 --pretty="%s%n%n%b" | sed 's/"/\\"/g')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++COMMIT_TITLE := $(shell git log -1 --no-merges --pretty="%s" | sed "s/\"/\\\"/g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++COMMIT_COMMENT:= $(shell git log -1 --no-merges --pretty="%b" | sed "s/\"/\\\"/g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION := $(shell awk -F\" '/er =/ {print $$2}' lib/version.txt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCE := $(shell git remote get-url origin | sed -n 's|^.*m/\([^/]\+/[^/.]\+\)\(.git\)\?|\1|p')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,13 +66,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @printf "let commit_date = \"$(COMMIT_DATE)\"\n" >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @printf "let compil_date = \"$(COMPIL_DATE)\"\n" >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @printf "Generating $@… Done.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.PHONY: lib/version.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Patch/unpatch files for campl5 >= 8.03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CAMLP5_VERSION := $(shell camlp5 -version 2>/dev/null || echo 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CAMLP5_MAJOR := $(shell echo $(CAMLP5_VERSION) | cut -d '.' -f 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CAMLP5_MINOR := $(shell echo $(CAMLP5_VERSION) | cut -d '.' -f 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++patch_files:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @if [ "$(CAMLP5_VERSION)" != 0 ] && [ $(CAMLP5_MAJOR) -eq 8 ] && [ $(CAMLP5_MINOR) -ge 3 ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "\nPatching bin/ged2gwb/dune.in and ged2gwb.ml for camlp5 version $(CAMLP5_VERSION) (>= 8.03.00)… Done.\n"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perl -pi.bak -e 's|\(preprocess \(action \(run camlp5o pr_o.cmo pa_extend.cmo q_MLast.cmo %\{input-file\}\)\)\)|\(preprocess \(action \(run not-ocamlfind preprocess -package camlp5.extend,camlp5.quotations,camlp5.pr_o -syntax camlp5o %\{input-file\}\)\)\)|' bin/ged2gwb/dune.in; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perl -0777 -pi.bak -e 's/(; Token\.tok_comm = None)(\n \})/$$1\n ; Token.kwds = Hashtbl.create 10$$2/' bin/ged2gwb/ged2gwb.ml; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unpatch_files:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @if [ -f bin/ged2gwb/dune.in.bak ] && [ -f bin/ged2gwb/ged2gwb.ml.bak ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "Restoring original patched files… Done.\n"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mv bin/ged2gwb/dune.in.bak bin/ged2gwb/dune.in; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mv bin/ged2gwb/ged2gwb.ml.bak bin/ged2gwb/ged2gwb.ml; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BUILD = dune build -p geneweb --profile $(DUNE_PROFILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++UNPATCH = $(MAKE) --no-print-directory unpatch_files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "Building \033[1;37mGeneweb $(VERSION)\033[0m with $(OCAMLV).\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "Repository \033[1;37m$(SOURCE)\033[0m. Branch \033[1;37m$(BRANCH)\033[0m.\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "Last commit \033[1;37m$(COMMIT_ID)\033[0m with message “\033[1;37m%s\033[0m”.\n" '$(subst ','\'',$(COMMIT_MSG))'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37mGenerating configuration files\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Building \033[1;1mGeneweb $(VERSION)\033[0m with $(OCAMLV).\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Repository \033[1;1m$(SOURCE)\033[0m. Branch \033[1;1m$(BRANCH)\033[0m. "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Last commit \033[1;1m$(COMMIT_ID)\033[0m message:\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\033[1;1m %s\033[0m\n" '$(subst ','\'',$(COMMIT_TITLE))'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf " %s\n" '$(subst ','\'',$(COMMIT_COMMENT))' | fmt -w 80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\033[1;1mGenerating configuration files\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.PHONY: patch_files unpatch_files info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GENERATED_FILES_DEP = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dune-workspace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,36 +125,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test/dune \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generated: $(GENERATED_FILES_DEP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Done.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install uninstall fmt build distrib: info $(GENERATED_FILES_DEP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fmt build gwd install uninstall: info patch_files generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt: ## Format Ocaml code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(OS_TYPE),Win)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37mOcamlformat\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dune build @fmt --auto-promote
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1mOcamlformat\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dune build @fmt --auto-promote ; $(UNPATCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # [BEGIN] Installation / Distribution section
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build: ## Build the geneweb package (libraries and binaries)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37mBuilding executables\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dune build -p geneweb --profile $(DUNE_PROFILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1mBuilding executables\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(BUILD) ; $(UNPATCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Done."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gwd: ## Build ondy gwd/gwc executables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1mBuilding only gwd and gwc executables\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @dune build bin/gwd bin/gwc --profile $(DUNE_PROFILE) ; $(UNPATCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Done."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: ## Install geneweb using dune
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dune build @install --profile $(DUNE_PROFILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dune build @install --profile $(DUNE_PROFILE) ; $(UNPATCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dune install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall: ## Uninstall geneweb using dune
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dune build @install --profile $(DUNE_PROFILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dune build @install --profile $(DUNE_PROFILE) ; $(UNPATCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dune uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-distrib: build ## Build the project and copy what is necessary for distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-distrib:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(RM) -r $(DISTRIB_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37mCreating distribution directory\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++distrib: info ## Build the project and copy what is necessary for distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(MAKE) --no-print-directory patch_files generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1mBuilding executables.\n\033[0m"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(BUILD) || { $(UNPATCH) && exit 1; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Done."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(RM) -r $(DISTRIB_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1mCreating distribution directory\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir $(DISTRIB_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(DISTRIB_DIR)/bases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp CHANGES $(DISTRIB_DIR)/CHANGES.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,7 +185,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir $(DISTRIB_DIR)/gw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp etc/a.gwf $(DISTRIB_DIR)/gw/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "-setup_link" > $(DISTRIB_DIR)/gw/gwd.arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37m└ Copy binaries in $(DISTRIB_DIR)/gw/\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1m└ Copy binaries in $(DISTRIB_DIR)/gw/\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)connex/connex.exe $(DISTRIB_DIR)/gw/connex$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)consang/consang.exe $(DISTRIB_DIR)/gw/consang$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)fixbase/gwfixbase.exe $(DISTRIB_DIR)/gw/gwfixbase$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,11 +195,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)gwc/gwc.exe $(DISTRIB_DIR)/gw/gwc$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)gwd/gwd.exe $(DISTRIB_DIR)/gw/gwd$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)gwdiff/gwdiff.exe $(DISTRIB_DIR)/gw/gwdiff$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f $(BUILD_DISTRIB_DIR)gwrepl/gwrepl.bc ; then cp $(BUILD_DISTRIB_DIR)gwrepl/gwrepl.bc $(DISTRIB_DIR)/gw/gwrepl$(EXT); fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @if test -f $(BUILD_DISTRIB_DIR)gwrepl/gwrepl.bc ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "cp %s %s\n" "$(BUILD_DISTRIB_DIR)gwrepl/gwrepl.bc" "$(DISTRIB_DIR)/gw/gwrepl$(EXT)"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp $(BUILD_DISTRIB_DIR)gwrepl/gwrepl.bc $(DISTRIB_DIR)/gw/gwrepl$(EXT); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)gwu/gwu.exe $(DISTRIB_DIR)/gw/gwu$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)setup/setup.exe $(DISTRIB_DIR)/gw/gwsetup$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(BUILD_DISTRIB_DIR)update_nldb/update_nldb.exe $(DISTRIB_DIR)/gw/update_nldb$(EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37m└ Copy templates in $(DISTRIB_DIR)/gw/\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1m└ Copy templates in $(DISTRIB_DIR)/gw/\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -R hd/* $(DISTRIB_DIR)/gw/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir $(DISTRIB_DIR)/gw/setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp bin/setup/intro.txt $(DISTRIB_DIR)/gw/setup/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,23 +212,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp bin/setup/lang/*.htm $(DISTRIB_DIR)/gw/setup/lang/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp bin/setup/lang/lexicon.txt $(DISTRIB_DIR)/gw/setup/lang/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp bin/setup/lang/intro.txt $(DISTRIB_DIR)/gw/setup/lang/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "\n\033[1;37m└ Copy plugins in $(DISTRIB_DIR)/gw/plugins\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "\n\033[1;1m└ Copy plugins in $(DISTRIB_DIR)/gw/plugins\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir $(DISTRIB_DIR)/gw/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for P in $(shell ls plugins); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -f $(BUILD_DIR)/plugins/$$P/plugin_$$P.cmxs ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir $(DISTRIB_DIR)/gw/plugins/$$P; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $(BUILD_DIR)/plugins/$$P/plugin_$$P.cmxs $(DISTRIB_DIR)/gw/plugins/$$P/; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -d plugins/$$P/assets ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -R $(BUILD_DIR)/plugins/$$P/assets $(DISTRIB_DIR)/gw/plugins/$$P/; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -f $(BUILD_DIR)/plugins/$$P/META ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $(BUILD_DIR)/plugins/$$P/META $(DISTRIB_DIR)/gw/plugins/$$P/; \
</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;'>++ @for P in $(shell ls plugins); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -f $(BUILD_DIR)/plugins/$$P/plugin_$$P.cmxs ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir $(DISTRIB_DIR)/gw/plugins/$$P; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "cp %s %s\n" "$(BUILD_DIR)/plugins/$$P/plugin_$$P.cmxs" "$(DISTRIB_DIR)/gw/plugins/$$P/"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp $(BUILD_DIR)/plugins/$$P/plugin_$$P.cmxs $(DISTRIB_DIR)/gw/plugins/$$P/; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -d plugins/$$P/assets ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "cp -R %s %s\n" "$(BUILD_DIR)/plugins/$$P/assets" "$(DISTRIB_DIR)/gw/plugins/$$P/"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp -R $(BUILD_DIR)/plugins/$$P/assets $(DISTRIB_DIR)/gw/plugins/$$P/; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -f $(BUILD_DIR)/plugins/$$P/META ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "cp %s %s\n" "$(BUILD_DIR)/plugins/$$P/META" "$(DISTRIB_DIR)/gw/plugins/$$P/"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp $(BUILD_DIR)/plugins/$$P/META $(DISTRIB_DIR)/gw/plugins/$$P/; \
</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;'>+- @printf "\033[1;37mBuild complete.\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @printf "You can launch Geneweb with “\033[1;37mcd $(DISTRIB_DIR)\033[0m” followed by “\033[1;37mgw/gwd$(EXT)\033[0m”.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.PHONY: install uninstall distrib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "Done.\n\n\033[1;1mDistribution complete.\033[0m\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(UNPATCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @printf "You can launch Geneweb with “\033[1;1mcd $(DISTRIB_DIR)\033[0m” followed by “\033[1;1mgw/gwd$(EXT)\033[0m”.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.PHONY: fmt install uninstall distrib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # [END] Installation / Distribution section
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-not-ocamlfind/Portfile b/ocaml/ocaml-not-ocamlfind/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..444196b6f0f
</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-not-ocamlfind/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup ocaml 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup chetmurthy not-ocamlfind 0.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ocaml-not-ocamlfind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories ocaml devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {pguyot @pguyot} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A small frontend for ocamlfind that adds a few useful commands
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 29a6b4ef6f3db3241d1d80efb3d4769eea743c6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1192728dd4faa44ce7f1d14028828f68aad7dc2f70e8feb042e3159fcf24f2ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 290986
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:ocaml-camlp-streams \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-fmt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-ocamlgraph \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-rresult
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -bindir ${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mandir ${prefix}/share/man \
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use_findlib does OCAMLFIND_DESTDIR but not OCAMLFIND_BINDIR which may be specific to not-ocamlfind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ocaml.use_findlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append OCAMLFIND_BINDIR=${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-not-ocamlfind/files/patch-Makefile.diff b/ocaml/ocaml-not-ocamlfind/files/patch-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c7bc50833cf
</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-not-ocamlfind/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2024-06-06 11:36:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2024-06-06 11:37:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OCAMLFIND_BINDIR:=$(shell dirname `which ocamlfind`)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OCAMLFIND_BINDIR?=$(shell dirname `which ocamlfind`)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PACKAGES = str,unix,fmt,rresult,ocamlgraph,camlp-streams
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC= -I local-packages/ocamlfind/src/findlib findlib.cma
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-ocamlgraph/Portfile b/ocaml/ocaml-ocamlgraph/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89594f97aaf
</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-ocamlgraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup ocaml 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup backtracking ocamlgraph 2.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ocaml-ocamlgraph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories ocaml devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {pguyot @pguyot} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ocamlgraph-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tbz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ocaml.org/p/ocamlgraph/latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A generic graph library for OCaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description} which Provides both graph data structures \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and graph algorithms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 90bab1566146dea0826ee3abf33db44fcfacae72 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f962c36f9253df2393955af41b074b6a426b2f92a9def795b2005b57d302d65 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 311740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:ocaml-stdlib-shims
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ocaml.build_type dune
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-ppx_blob/Portfile b/ocaml/ocaml-ppx_blob/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1343fceab46..1fa74cb4a4b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-ppx_blob/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-ppx_blob/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span>
name ocaml-ppx_blob
version 0.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories ocaml devel
maintainers {pguyot @pguyot} openmaintainer
license Unlicense
</pre><pre style='margin:0'>
</pre>