git: a8c9290c831b - main - devel/ocaml-seq: Mark DEPRECATED and set EXPIRATION_DATE to 2024-12-10
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 10 Oct 2024 06:15:26 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a8c9290c831b42ef0b40d7f89e8321ce595e08c9
commit a8c9290c831b42ef0b40d7f89e8321ce595e08c9
Author: Benjamin Jacobs <freebsd@dev.thsi.be>
AuthorDate: 2024-10-10 06:11:15 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-10-10 06:14:48 +0000
devel/ocaml-seq: Mark DEPRECATED and set EXPIRATION_DATE to 2024-12-10
Seq the ocaml module is part of lang/ocaml since 4.07. This package is a
compatibility shims that is needed for people using 4.06 and earlier.
PR: 280761
Approved by: submitter is maintainer
---
devel/ocaml-camlp5/Makefile | 2 +-
devel/ocaml-dolmen/Makefile | 1 +
devel/ocaml-linol/Makefile | 1 +
devel/ocaml-lsp/Makefile | 1 +
devel/ocaml-ppx_yojson_conv/Makefile | 1 +
devel/ocaml-ppx_yojson_conv_lib/Makefile | 1 +
devel/ocaml-re/Makefile | 7 +------
devel/ocaml-re/files/patch-lib_dune | 8 ++++++++
devel/ocaml-seq/Makefile | 3 +++
math/alt-ergo/Makefile | 1 +
textproc/ocaml-yojson/Makefile | 6 ++----
textproc/ocaml-yojson/files/patch-dune-project | 12 ++++++++++++
textproc/ocaml-yojson/files/patch-lib_dune | 9 +++++++++
13 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile
index 68efa32b46d2..1980daa9ea5f 100644
--- a/devel/ocaml-camlp5/Makefile
+++ b/devel/ocaml-camlp5/Makefile
@@ -1,6 +1,6 @@
PORTNAME= camlp5
PORTVERSION= 8.02.01
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocaml-dolmen/Makefile b/devel/ocaml-dolmen/Makefile
index be0f524d1956..e5157f3bc480 100644
--- a/devel/ocaml-dolmen/Makefile
+++ b/devel/ocaml-dolmen/Makefile
@@ -1,6 +1,7 @@
PORTNAME= dolmen
DISTVERSIONPREFIX= v
DISTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocaml-linol/Makefile b/devel/ocaml-linol/Makefile
index e9397a3a6930..58a2dcbd385d 100644
--- a/devel/ocaml-linol/Makefile
+++ b/devel/ocaml-linol/Makefile
@@ -1,6 +1,7 @@
PORTNAME= linol
PORTVERSION= 0.6
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocaml-lsp/Makefile b/devel/ocaml-lsp/Makefile
index ba3ac3606bcc..f9ebae9d256a 100644
--- a/devel/ocaml-lsp/Makefile
+++ b/devel/ocaml-lsp/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ocaml-lsp
DISTVERSION= 1.19.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= freebsd@dev.thsi.be
diff --git a/devel/ocaml-ppx_yojson_conv/Makefile b/devel/ocaml-ppx_yojson_conv/Makefile
index 174b0c29ac40..cc33ab7d4d21 100644
--- a/devel/ocaml-ppx_yojson_conv/Makefile
+++ b/devel/ocaml-ppx_yojson_conv/Makefile
@@ -1,6 +1,7 @@
PORTNAME= ppx_yojson_conv
DISTVERSIONPREFIX= v
DISTVERSION= 0.17.0
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocaml-ppx_yojson_conv_lib/Makefile b/devel/ocaml-ppx_yojson_conv_lib/Makefile
index 48af0f7bbb32..b41b1d12c380 100644
--- a/devel/ocaml-ppx_yojson_conv_lib/Makefile
+++ b/devel/ocaml-ppx_yojson_conv_lib/Makefile
@@ -1,6 +1,7 @@
PORTNAME= ppx_yojson_conv_lib
DISTVERSIONPREFIX= v
DISTVERSION= 0.17.0
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile
index e8a52fc2c8ba..3acfdd2cba10 100644
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@@ -1,6 +1,6 @@
PORTNAME= re
PORTVERSION= 1.11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@@ -10,9 +10,6 @@ WWW= https://github.com/ocaml/ocaml-re
LICENSE= LGPL21
-BUILD_DEPENDS= ${SA_DIR}/seq/META:devel/ocaml-seq
-RUN_DEPENDS= ${SA_DIR}/seq/META:devel/ocaml-seq
-
USES= ocaml:dune
USE_GITHUB= yes
GH_ACCOUNT= ocaml
@@ -24,8 +21,6 @@ PORTDOCS= CHANGES.md LICENSE.md README.md
OPTIONS_DEFINE= DOCS
-SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR}
-
post-patch:
${REINPLACE_CMD} \
-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
diff --git a/devel/ocaml-re/files/patch-lib_dune b/devel/ocaml-re/files/patch-lib_dune
new file mode 100644
index 000000000000..dab1e1998729
--- /dev/null
+++ b/devel/ocaml-re/files/patch-lib_dune
@@ -0,0 +1,8 @@
+--- lib/dune.orig 2023-08-19 10:51:09 UTC
++++ lib/dune
+@@ -1,5 +1,4 @@
+ (library
+ (name re)
+ (synopsis "Pure OCaml regular expression library")
+- (libraries seq)
+ (public_name re))
diff --git a/devel/ocaml-seq/Makefile b/devel/ocaml-seq/Makefile
index e130084dbcec..e301063c52ce 100644
--- a/devel/ocaml-seq/Makefile
+++ b/devel/ocaml-seq/Makefile
@@ -11,6 +11,9 @@ WWW= https://github.com/c-cube/seq
LICENSE= LGPL21
+DEPRECATED= Seq is provided by lang/ocaml.
+EXPIRATION_DATE= 2024-12-10
+
USES= ocaml:dune
USE_GITHUB= yes
GH_ACCOUNT= c-cube
diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile
index 5978e3fa0760..9dd6ce4db55c 100644
--- a/math/alt-ergo/Makefile
+++ b/math/alt-ergo/Makefile
@@ -1,6 +1,7 @@
PORTNAME= alt-ergo
DISTVERSIONPREFIX= v
DISTVERSION= 2.5.4
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= freebsd@dev.thsi.be
diff --git a/textproc/ocaml-yojson/Makefile b/textproc/ocaml-yojson/Makefile
index 74cf8f8fd440..e504e8216025 100644
--- a/textproc/ocaml-yojson/Makefile
+++ b/textproc/ocaml-yojson/Makefile
@@ -1,5 +1,6 @@
PORTNAME= yojson
DISTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= textproc
PKGNAMEPREFIX= ocaml-
@@ -10,9 +11,7 @@ WWW= https://github.com/ocaml-community/yojson/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-BUILD_DEPENDS= ${SA_DIR}/seq/META:devel/ocaml-seq \
- cppo:devel/ocaml-cppo
-RUN_DEPENDS= ${SA_DIR}/seq/META:devel/ocaml-seq
+BUILD_DEPENDS= cppo:devel/ocaml-cppo
USES= ocaml:dune
USE_GITHUB= yes
@@ -26,7 +25,6 @@ PORTDOCS= CHANGES.md LICENSE.md README.md odoc-pages/index.mld
OPTIONS_DEFINE= DOCS
DUNE_INSTALL_TARGETS= ${OCAML_PACKAGES}
-SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR}
post-install:
@${STRIP_CMD} \
diff --git a/textproc/ocaml-yojson/files/patch-dune-project b/textproc/ocaml-yojson/files/patch-dune-project
new file mode 100644
index 000000000000..f71c3714a767
--- /dev/null
+++ b/textproc/ocaml-yojson/files/patch-dune-project
@@ -0,0 +1,12 @@
+--- dune-project.orig 2024-06-27 14:38:13 UTC
++++ dune-project
+@@ -18,8 +18,7 @@ yojson package.")
+ (documentation "https://ocaml.org/p/yojson/latest")
+ (depends
+ (ocaml (>= 4.02.3))
+- (alcotest (and :with-test (>= 0.8.5)))
+- (seq (>= 0.2.2))))
++ (alcotest (and :with-test (>= 0.8.5)))))
+
+ (package
+ (name yojson-five)
diff --git a/textproc/ocaml-yojson/files/patch-lib_dune b/textproc/ocaml-yojson/files/patch-lib_dune
new file mode 100644
index 000000000000..e6e4465ee7c8
--- /dev/null
+++ b/textproc/ocaml-yojson/files/patch-lib_dune
@@ -0,0 +1,9 @@
+--- lib/dune.orig 2024-06-27 14:38:13 UTC
++++ lib/dune
+@@ -115,6 +115,5 @@
+ (public_name yojson)
+ (modules yojson t basic safe raw common codec lexer_utils)
+ (synopsis "JSON parsing and printing")
+- (libraries seq)
+ (flags
+ (:standard -w -27-32)))