On 6/9/23 18:57, Klemens Nanni wrote:
-V= 25.3.2
+V= 25.3.2.2
Looks like for 25 you keep the conflict in sync, would this be better?
UPDATE_PLIST_ARGS = -i V
Yup, looks better, thanks! :-)
26, however, is at 26.0.1 and <26.1 with your latest diff, so I'm unsure.
I tried it out and keeping that bit in sync between 25 and 26 gives me
clean updates with both erlang versions.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 31 May 2023 15:17:33 -0000 1.17
+++ Makefile 9 Jun 2023 19:26:56 -0000
@@ -3,14 +3,13 @@ BROKEN-alpha= beam/erl_process.c:6692: i
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 25.3.2
+V= 25.3.2.2
PORTROACH= limit:^OTP-25\.
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
EPOCH= 0
-REVISION= 0
VERSION_SPEC= >=25v0,<26v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@@ -60,11 +59,13 @@ FAKE_FLAGS = libdir_suffix="/erlang${MAJ
AUTOCONF_VERSION = 2.69
+UPDATE_PLIST_ARGS = -i V
+
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ASN1_VSN 5.0.21 \
COMMON_TEST_VSN 1.24 \
-COMPILER_VSN 8.2.6 \
+COMPILER_VSN 8.2.6.2 \
CRYPTO_VSN 5.1.4 \
DEBUGGER_VSN 5.3.1 \
DIALYZER_VSN 5.0.5 \
@@ -93,12 +94,12 @@ SASL_VSN 4.2 \
SNMP_VSN 5.13.5 \
SSH_VSN 4.15.3 \
SSL_VSN 10.9.1 \
-STDLIB_VSN 4.3.1 \
+STDLIB_VSN 4.3.1.1 \
SYNTAX_TOOLS_VSN 3.0.1 \
TFTP_VSN 1.0.4 \
TOOLS_VSN 3.5.3 \
WX_VSN 2.2.2 \
-XMERL_VSN 1.3.31 \
-ERTS_VSN 13.2.2
+XMERL_VSN 1.3.31.1 \
+ERTS_VSN 13.2.2.1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/erlang/25/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 17 May 2023 13:39:46 -0000 1.9
+++ distinfo 9 Jun 2023 19:26:56 -0000
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_25.3.2.tar.gz) = H5hRYz30VrMZ9rxw1vkDXFrF1j0ZN+GnlL2MiIs5Eq8=
-SHA256 (otp_src_25.3.2.tar.gz) = rtTkcmzcWHq4IMg3nWPlEeRqGxzAxZ1qcgtRrmJbJRA=
-SIZE (otp_doc_man_25.3.2.tar.gz) = 1717601
-SIZE (otp_src_25.3.2.tar.gz) = 103757566
+SHA256 (otp_doc_man_25.3.2.2.tar.gz) = GoQkTwUYpIDEGWlwh+DseYjhIhfF8X6OI3LQCiiEMlk=
+SHA256 (otp_src_25.3.2.2.tar.gz) = g6NvPZDe7zatthW7+0bNMn8Ldrdmjh9/JT/Wa0riRRg=
+SIZE (otp_doc_man_25.3.2.2.tar.gz) = 1718654
+SIZE (otp_src_25.3.2.2.tar.gz) = 103844480
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 31 May 2023 15:17:34 -0000 1.10
+++ pkg/PLIST-main 9 Jun 2023 19:26:56 -0000
@@ -2,7 +2,7 @@
@option is-branch
@conflict erlang->=25,<26
@conflict erlang->=25v0,<26v0
-@conflict erlang-wx->=25,<25.3.2
+@conflict erlang-wx->=25,<${V}
@pkgpath lang/erlang/21,-main
@newgroup _epmd:888
@newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/26/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 31 May 2023 15:06:44 -0000 1.1.1.1
+++ Makefile 9 Jun 2023 19:26:04 -0000
@@ -5,7 +5,7 @@ USE_WXNEEDED= Yes
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 26.0
+V= 26.0.1
DISTNAME= otp_src_${V}
PORTROACH= limit:^OTP-26\.
PKGNAME= erlang-${V}
@@ -61,11 +61,13 @@ FAKE_FLAGS = libdir_suffix="/erlang${MAJ
AUTOCONF_VERSION = 2.69
+UPDATE_PLIST_ARGS = -i V
+
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ASN1_VSN 5.1 \
COMMON_TEST_VSN 1.25 \
-COMPILER_VSN 8.3 \
+COMPILER_VSN 8.3.1 \
CRYPTO_VSN 5.2 \
DEBUGGER_VSN 5.3.1 \
DIALYZER_VSN 5.1 \
@@ -79,9 +81,9 @@ ERL_INTERFACE_VSN 5.4 \
ET_VSN 1.7 \
EUNIT_VSN 2.8.2 \
FTP_VSN 1.2 \
-INETS_VSN 9.0 \
+INETS_VSN 9.0.1 \
JINTERFACE_VSN 1.14 \
-KERNEL_VSN 9.0 \
+KERNEL_VSN 9.0.1 \
MEGACO_VSN 4.4.4 \
MNESIA_VSN 4.22 \
OBSERVER_VSN 2.15 \
@@ -94,13 +96,13 @@ RUNTIME_TOOLS_VSN 2.0 \
SASL_VSN 4.2.1 \
SNMP_VSN 5.14 \
SSH_VSN 5.0 \
-SSL_VSN 11.0 \
-STDLIB_VSN 5.0 \
+SSL_VSN 11.0.1 \
+STDLIB_VSN 5.0.1 \
SYNTAX_TOOLS_VSN 3.1 \
TFTP_VSN 1.1 \
TOOLS_VSN 3.6 \
WX_VSN 2.3 \
-XMERL_VSN 1.3.31 \
-ERTS_VSN 14.0
+XMERL_VSN 1.3.32 \
+ERTS_VSN 14.0.1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/erlang/26/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 31 May 2023 15:06:44 -0000 1.1.1.1
+++ distinfo 9 Jun 2023 19:26:04 -0000
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_26.0.tar.gz) = nD6nvzNrIQg5Rnn1o4J7YnxhqppBrVnSUG25b+fEnVw=
-SHA256 (otp_src_26.0.tar.gz) = P/PFPX75pFtXIOlbh1YmnBobWOtRrMyZLKl1Iv2yNNQ=
-SIZE (otp_doc_man_26.0.tar.gz) = 1742307
-SIZE (otp_src_26.0.tar.gz) = 104683285
+SHA256 (otp_doc_man_26.0.1.tar.gz) = p3ZwPTxbvLetKKgB63IJc00YZCsKG5yZitQkCUF5IJ8=
+SHA256 (otp_src_26.0.1.tar.gz) = 0Mjhf3PnFGKUujn0md4IbQZABY7AOMJAIXIuphIgfZI=
+SIZE (otp_doc_man_26.0.1.tar.gz) = 1735789
+SIZE (otp_src_26.0.1.tar.gz) = 104738804
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/erlang/26/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 31 May 2023 15:06:46 -0000 1.1.1.1
+++ pkg/PLIST-main 9 Jun 2023 19:26:04 -0000
@@ -2,7 +2,7 @@
@option is-branch
@conflict erlang->=26,<27
@conflict erlang->=26v0,<27v0
-@conflict erlang-wx->=26,<26.1
+@conflict erlang-wx->=26,<${V}
@pkgpath lang/erlang/21,-main
@newgroup _epmd:888
@newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
