[NEW] lang/erlang 25.0.2

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 10 Jul 2022 12:21:40 -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 10 Jul 2022 12:21:40 -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 && \
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...

On 7/10/22 15:11, Stuart Henderson wrote:
> On 2022/07/10 14:30, Volker Schlecht wrote:
>> Hi,
>>
>> I've got a working (compiles, runs, tests pass on amd64) port for erlang
>> 25.0.2 attached, however there's something wrong with it that causes it to
>> conflict with lang/erlang/21 and I just can't figure out what causes that.
>>
>> What have I been missing?
>
> This might be due to the missing "@option no-default-conflict" in PLIST-wx.
>
> Other things I noticed on a read-through:
>
> "@pkgpath lang/erlang/25" should not be listed in PLIST-main (that was
> needed in 21 to handle a split to subpackages but doesn't apply to 25).
>
> I don't see any reason to keep "@conflict erlang-<16b.03p4v0"
>