Re: [NEW] lang/erlang 25.0.2

On 2022/07/11 23:30, Stuart Henderson wrote:
> On 2022/07/10 19:27, Volker Schlecht wrote:
> > I still get a conflict after
> >
> > adding @option no-default-conflict to PLIST-wx
> > removing @conflict and @pkpath from PLIST-main
> >
> > However adding EPOCH = 0 to 25/Makefile seems to have helped...
>
> Ah right I see why. I've just removed the old @conflict marker in 21
> which no longer makes any sense so you can avoid adding EPOCH for this
> for now.
>

...so here's an updated diff for 25 with that zapped

Out of time now but I'll probably commit this later in the week if nobody
beats me to it or runs into a problem


Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile 11 Mar 2022 19:28:55 -0000 1.73
+++ Makefile 11 Jul 2022 22:34:59 -0000
@@ -1,4 +1,5 @@
SUBDIR =
SUBDIR += 21
+ SUBDIR += 25

.include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/erlang/Makefile.inc,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile.inc
--- Makefile.inc 21 May 2022 12:01:42 -0000 1.25
+++ Makefile.inc 11 Jul 2022 22:34:59 -0000
@@ -78,6 +78,7 @@ gen-versions: extract
@find ${WRKSRC} -name 'vsn.mk' -exec awk -F'=' '/_VSN=/ { print $$1"\t"$$2 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_' | sort
@grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }' | sort

+# Erlang >= 25 uses configure.ac instead of configure.in
pre-configure:
${SUBST_CMD} ${WRKSRC}/make/install_bin \
${WRKSRC}/Makefile.in \
@@ -86,8 +87,10 @@ pre-configure:
${WRKSRC}/erts/etc/common/erlc.c \
${WRKSRC}/erts/etc/common/escript.c \
${WRKSRC}/erts/etc/common/typer.c \
- ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl \
- ${WRKSRC}/lib/wx/configure.in
+ ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl
+ if [ -f ${WRKSRC}/lib/wx/configure.in ]; then ${SUBST_CMD} ${WRKSRC}/lib/wx/configure.in ; fi;
+ if [ -f ${WRKSRC}/lib/wx/configure.ac ]; then ${SUBST_CMD} ${WRKSRC}/lib/wx/configure.ac ; fi;
+

pre-test:
ln -fs ${LOCALBASE}/bin/gtar ${WRKDIR}/bin/tar && \
Index: 25/Makefile
===================================================================
RCS file: 25/Makefile
diff -N 25/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 25/Makefile 11 Jul 2022 22:34:59 -0000
@@ -0,0 +1,95 @@
+BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
+
+COMMENT-main= ${COMMENT}
+COMMENT-wx= WxWidgets bindings for Erlang
+
+V= 25.0.2
+PORTROACH= limit:^OTP-25\.
+DISTNAME= otp_src_$V
+PKGNAME= erlang-$V
+PKGNAME-main= erlang-$V
+PKGNAME-wx= erlang-wx-$V
+
+#REVISION-main=
+#REVISION-wx=
+
+VERSION_SPEC= >=25,<26
+PKGSPEC-main= erlang-${VERSION_SPEC}
+PKGSPEC-wx= erlang-wx-${VERSION_SPEC}
+
+BUILD_DEPENDS+= textproc/libxslt
+
+CONFIGURE_STYLE= simple
+
+CONFIGURE_ARGS+=--without-jinterface \
+ --without-odbc \
+ --enable-threads \
+ --enable-kernel-poll \
+ --disable-hipe
+
+MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/erts/autoconf
+
+MULTI_PACKAGES = -main -wx
+
+WANTLIB = m pthread ${COMPILER_LIBCXX}
+WANTLIB-main = ${WANTLIB} c crypto kvm curses util z
+
+WANTLIB-wx += ${WANTLIB} GL GLU
+WANTLIB-wx += wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
+WANTLIB-wx += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
+WANTLIB-wx += wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
+WANTLIB-wx += glib-2.0 intl
+
+LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
+LIB_DEPENDS-wx +=devel/glib2
+
+RUN_DEPENDS-wx =${BASE_PKGPATH},-main>=${MAJ_V}
+
+DOC_DIR= ${PREFIX}/lib/erlang${MAJ_V}/
+FAKE_FLAGS = libdir_suffix="/erlang${MAJ_V}"
+
+AUTOCONF_VERSION = 2.69
+
+# Use the target 'gen-versions' to update this list
+ERL_VERSIONS= \
+ASN1_VSN 5.0.19 \
+COMMON_TEST_VSN 1.23 \
+COMPILER_VSN 8.2 \
+CRYPTO_VSN 5.1.1 \
+DEBUGGER_VSN 5.3 \
+DIALYZER_VSN 5.0.1 \
+DIAMETER_VSN 2.2.6 \
+EDOC_VSN 1.2 \
+EI_VSN 5.3 \
+ELDAP_VSN 1.2.10 \
+EMACS_VSN 2.7.0 \
+ERL_DOCGEN_VSN 1.3 \
+ERL_INTERFACE_VSN 5.3 \
+ET_VSN 1.6.5 \
+EUNIT_VSN 2.7.1 \
+FTP_VSN 1.1.1 \
+INETS_VSN 8.0 \
+JINTERFACE_VSN 1.13 \
+KERNEL_VSN 8.4.1 \
+MEGACO_VSN 4.4 \
+MNESIA_VSN 4.21.1 \
+OBSERVER_VSN 2.12 \
+ODBC_VSN 2.14 \
+OS_MON_VSN 2.7.1 \
+PARSETOOLS_VSN 2.4 \
+PUBLIC_KEY_VSN 1.13 \
+RELTOOL_VSN 0.9 \
+RUNTIME_TOOLS_VSN 1.19 \
+SASL_VSN 4.2 \
+SNMP_VSN 5.13 \
+SSH_VSN 4.14.1 \
+SSL_VSN 10.8.2 \
+STDLIB_VSN 4.0.1 \
+SYNTAX_TOOLS_VSN 3.0 \
+TFTP_VSN 1.0.3 \
+TOOLS_VSN 3.5.3 \
+WX_VSN 2.2 \
+XMERL_VSN 1.3.29 \
+ERTS_VSN 13.0.2
+
+.include <bsd.port.mk>
Index: 25/distinfo
===================================================================
RCS file: 25/distinfo
diff -N 25/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 25/distinfo 11 Jul 2022 22:34:59 -0000
@@ -0,0 +1,4 @@
+SHA256 (otp_doc_man_25.0.2.tar.gz) = RdNNR1NomBNT3XAx6oNyZI98PrkPdHd8ogPiMFTsYFA=
+SHA256 (otp_src_25.0.2.tar.gz) = aly8jQ8Y56f9L7PRVn4rcHN+5BJMsimArU7WY8YeAQ4=
+SIZE (otp_doc_man_25.0.2.tar.gz) = 1712615
+SIZE (otp_src_25.0.2.tar.gz) = 103202807
Index: 25/patches/patch-Makefile_in
===================================================================
RCS file: 25/patches/patch-Makefile_in
diff -N 25/patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 25/patches/patch-Makefile_in 11 Jul 2022 22:34:59 -0000
@@ -0,0 +1,13 @@
+Create symlink so the build can handle versioned binaries
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -596,6 +596,7 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/e
+ $(ERL_TOP)/erts/etc/unix/erl.src.src > \
+ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
+ @chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
++ @(cd $(BOOTSTRAP_ROOT)/bootstrap/bin && $(LN_S) ./erl erl${MAJ_V})
+
+ $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc: $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ROOT)/bootstrap/target
+ @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
Index: 25/patches/patch-erts_emulator_Makefile_in
===================================================================
RCS file: 25/patches/patch-erts_emulator_Makefile_in
diff -N 25/patches/patch-erts_emulator_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 25/patches/patch-erts_emulator_Makefile_in 11 Jul 2022 22:34:59 -0000
@@ -0,0 +1,17 @@
+Index: erts/emulator/Makefile.in
+--- erts/emulator/Makefile.in.orig
++++ erts/emulator/Makefile.in
+@@ -303,13 +303,7 @@ ifeq (@EMU_LOCK_CHECKING@,yes)
+ NO_INLINE_FUNCTIONS=true
+ endif
+
+-ifneq ($(filter tile-%,$(TARGET)), )
+-# -O2 generally produces faster for tile-cc, because the code is smaller.
+-# Since tile-cc looks like gcc, we need to override the normal gcc -O3 setting.
+ OPT_LEVEL = -O2
+-else
+-OPT_LEVEL = -O3
+-endif
+
+ ifeq ($(GCC),yes)
+ ifeq ($(NO_INLINE_FUNCTIONS),true)
Index: 25/patches/patch-erts_etc_common_ct_run_c
===================================================================
RCS file: 25/patches/patch-erts_etc_common_ct_run_c
diff -N 25/patches/patch-erts_etc_common_ct_run_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 25/patches/patch-erts_etc_common_ct_run_c 11 Jul 2022 22:34:59 -0000
@@ -0,0 +1,14 @@
+Let erlang test runner handle versioned binaries.
+
+Index: erts/etc/common/ct_run.c
+--- erts/etc/common/ct_run.c.orig
++++ erts/etc/common/ct_run.c
+@@ -41,7 +41,7 @@ static int eargc; /* Number of arguments in eargv. */
+ #else
+ # define QUOTE(s) s
+ # define IS_DIRSEP(c) ((c) == '/')
+-# define ERL_NAME "erl"
++# define ERL_NAME "erl${MAJ_V}"
+