cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retire lang/erlang/21, from Volker Schlecht (maintainer), plus I added

Browse Source 
@pkgpath markers in erlang/25. agreement from ajacoutot@ rsadowski@
This commit is contained in:
sthen 2023-01-16 18:27:29 +00:00
parent 6051c34785
commit 520efa0bd0
26 changed files with 8 additions and 4885 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
lang/erlang/21/Makefile
View File

@ -1,92 +0,0 @@
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
PORTROACH= limit:^OTP-21\.
V= 21.3.8.24
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
EPOCH= 0
REVISION-main= 2
REVISION-wx= 1
VERSION_SPEC= >=21v0,<22v0
PKGSPEC-main= erlang-${VERSION_SPEC}
PKGSPEC-wx= erlang-wx-${VERSION_SPEC}
BUILD_DEPENDS+= textproc/libxslt
CONFIGURE_ARGS+=--without-jinterface \
--without-odbc \
--enable-threads \
--enable-kernel-poll \
--disable-hipe
MULTI_PACKAGES = -main -wx
WANTLIB = m pthread
WANTLIB-main = ${WANTLIB} c crypto kvm curses util z
WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX}
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
LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10
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.8 \
COMMON_TEST_VSN 1.17.2.1 \
COMPILER_VSN 7.3.2 \
CRYPTO_VSN 4.4.2.3 \
DEBUGGER_VSN 4.2.6 \
DIALYZER_VSN 3.3.2 \
DIAMETER_VSN 2.2.1 \
EDOC_VSN 0.10 \
EI_VSN 3.11.3.2 \
ELDAP_VSN 1.2.7 \
EMACS_VSN 2.7.0 \
ERL_DOCGEN_VSN 0.9 \
ERL_INTERFACE_VSN 3.11.3.2 \
ET_VSN 1.6.4 \
EUNIT_VSN 2.3.7 \
FTP_VSN 1.0.2.2 \
HIPE_VSN 3.18.3 \
INETS_VSN 7.0.7.2 \
JINTERFACE_VSN 1.9.1 \
KERNEL_VSN 6.3.1.3 \
MEGACO_VSN 3.18.4 \
MNESIA_VSN 4.15.6 \
OBSERVER_VSN 2.9 \
ODBC_VSN 2.12.3 \
OS_MON_VSN 2.4.7 \
OTP_MIBS_VSN 1.2.1 \
PARSETOOLS_VSN 2.1.8 \
PUBLIC_KEY_VSN 1.6.6.1 \
RELTOOL_VSN 0.7.8 \
RUNTIME_TOOLS_VSN 1.13.2.1 \
SASL_VSN 3.3 \
SNMP_VSN 5.2.12 \
SSH_VSN 4.7.6.6 \
SSL_VSN 9.2.3.7 \
STDLIB_VSN 3.8.2.4 \
SYNTAX_TOOLS_VSN 2.1.7.1 \
TFTP_VSN 1.0.1 \
TOOLS_VSN 3.1.0.1 \
WX_VSN 1.8.7 \
XMERL_VSN 1.3.20.1 \
ERTS_VSN 10.3.5.19
.include <bsd.port.mk>

4
lang/erlang/21/distinfo
View File

@ -1,4 +0,0 @@
SHA256 (otp_doc_man_21.3.8.24.tar.gz) = H47jDBrh0PCUnS7haNxQ/qgRihGiMjMb4ViedYIAqHI=
SHA256 (otp_src_21.3.8.24.tar.gz) = qC3ocde6QP0lZViyOjtMFTnmx+znUH1usrADMMYTUBI=
SIZE (otp_doc_man_21.3.8.24.tar.gz) = 1402291
SIZE (otp_src_21.3.8.24.tar.gz) = 88854458

13
lang/erlang/21/patches/patch-Makefile_in
View File

@ -1,13 +0,0 @@
Create symlink so the build can handle versioned binaries
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -562,6 +562,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

17
lang/erlang/21/patches/patch-erts_emulator_Makefile_in
View File

@ -1,17 +0,0 @@
Index: erts/emulator/Makefile.in
--- erts/emulator/Makefile.in.orig
+++ erts/emulator/Makefile.in
@@ -283,13 +283,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)

14
lang/erlang/21/patches/patch-erts_etc_common_ct_run_c
View File

@ -1,14 +0,0 @@
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}"
#endif
#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)

14
lang/erlang/21/patches/patch-erts_etc_common_dialyzer_c
View File

@ -1,14 +0,0 @@
Let static analyzer handle versioned binaries.
Index: erts/etc/common/dialyzer.c
--- erts/etc/common/dialyzer.c.orig
+++ erts/etc/common/dialyzer.c
@@ -42,7 +42,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}"
#endif
#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)

14
lang/erlang/21/patches/patch-erts_etc_common_erlc_c
View File

@ -1,14 +0,0 @@
Let erlang compiler handle versioned binaries.
Index: erts/etc/common/erlc.c
--- erts/etc/common/erlc.c.orig
+++ erts/etc/common/erlc.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}"
#endif
#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)

24
lang/erlang/21/patches/patch-erts_etc_common_escript_c
View File

@ -1,24 +0,0 @@
Let escript handle versioned binaries.
Index: erts/etc/common/escript.c
--- erts/etc/common/escript.c.orig
+++ erts/etc/common/escript.c
@@ -48,7 +48,7 @@ static int eargc; /* Number of arguments in eargv. */
# define DIRSEPSTR "/"
# define PATHSEPSTR ":"
# define PMAX PATH_MAX
-# define ERL_NAME "erl"
+# define ERL_NAME "erl${MAJ_V}"
#endif
#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
@@ -459,7 +459,8 @@ main(int argc, char** argv)
if ( (_stricmp(basename, "escript.exe") == 0)
||(_stricmp(basename, "escript") == 0)) {
#else
- if (strcmp(basename, "escript") == 0) {
+ if ( (strcmp(basename, "escript") == 0)
+ ||(strcmp(basename, "escript${MAJ_V}") == 0)) {
#endif
def_emu_lookup_path = argv[0];
/*

14
lang/erlang/21/patches/patch-erts_etc_common_typer_c
View File

@ -1,14 +0,0 @@
Let erlang type inspection handle versioned binaries.
Index: erts/etc/common/typer.c
--- erts/etc/common/typer.c.orig
+++ erts/etc/common/typer.c
@@ -42,7 +42,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}"
#endif
#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)

12
lang/erlang/21/patches/patch-erts_lib_src_Makefile_in
View File

@ -1,12 +0,0 @@
Index: erts/lib_src/Makefile.in
--- erts/lib_src/Makefile.in.orig
+++ erts/lib_src/Makefile.in
@@ -38,7 +38,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
ERLANG_OSTYPE=@ERLANG_OSTYPE@
OMIT_FP=false
-CFLAGS=$(subst O2,O3, @CFLAGS@)
+CFLAGS=@CFLAGS@
ifeq ($(TYPE),debug)
CFLAGS=@DEBUG_CFLAGS@ -DDEBUG

13
lang/erlang/21/patches/patch-lib_crypto_c_src_crypto_c
View File

@ -1,13 +0,0 @@
Fix build with opaque EVP structures
Index: lib/crypto/c_src/crypto.c
--- lib/crypto/c_src/crypto.c.orig
+++ lib/crypto/c_src/crypto.c
@@ -93,6 +93,7 @@
#ifdef LIBRESSL_VERSION_NUMBER
/* A macro to test on in this file */
#define HAS_LIBRESSL
+#define HAS_EVP_PKEY_CTX
#endif
#ifdef HAS_LIBRESSL

16
lang/erlang/21/patches/patch-lib_crypto_c_src_otp_test_engine_c
View File

@ -1,16 +0,0 @@
With opaque EVP_MD_METHOD, erlang needs to use EVP_MD_meth_*()
instead of initializing the method statically.
Index: lib/crypto/c_src/otp_test_engine.c
--- lib/crypto/c_src/otp_test_engine.c.orig
+++ lib/crypto/c_src/otp_test_engine.c
@@ -33,8 +33,7 @@
#define PACKED_OPENSSL_VERSION_PLAIN(MAJ, MIN, FIX) \
PACKED_OPENSSL_VERSION(MAJ,MIN,FIX,('a'-1))
-#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) \
- || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
# define OLD
#endif

15
lang/erlang/21/patches/patch-lib_dialyzer_src_dialyzer_plt_erl
View File

@ -1,15 +0,0 @@
Prevent collisions during static analysis when multiple versions of
erlang are installed
Index: lib/dialyzer/src/dialyzer_plt.erl
--- lib/dialyzer/src/dialyzer_plt.erl.orig
+++ lib/dialyzer/src/dialyzer_plt.erl
@@ -236,7 +236,7 @@ get_default_plt() ->
case os:getenv("DIALYZER_PLT") of
false ->
{ok,[[HomeDir]]} = init:get_argument(home),
- filename:join(HomeDir, ".dialyzer_plt");
+ filename:join(HomeDir, ".dialyzer${MAJ_V}_plt");
UserSpecPlt -> UserSpecPlt
end.

12
lang/erlang/21/patches/patch-lib_tools_c_src_Makefile_in
View File

@ -1,12 +0,0 @@
Index: lib/tools/c_src/Makefile.in
--- lib/tools/c_src/Makefile.in.orig
+++ lib/tools/c_src/Makefile.in
@@ -110,7 +110,7 @@ EMEM_INCLUDES = -I$(ERL_TOP)/erts/include \
EMEM_HEADERS = erl_memory_trace_block_table.h
EMEM_SRCS = erl_memory.c erl_memory_trace_block_table.c
-EMEM_CFLAGS = $(THR_DEFS) $(subst O2,O3, $(CFLAGS)) $(EMEM_INCLUDES)
+EMEM_CFLAGS = $(THR_DEFS) $(CFLAGS) $(EMEM_INCLUDES)
EMEM_LDFLAGS = $(LDFLAGS)
ifeq ($(USING_VC), yes)

12
lang/erlang/21/patches/patch-lib_wx_configure_in
View File

@ -1,12 +0,0 @@
Don't blindly discard library path for GL libs.
--- lib/wx/configure.in.orig Tue Jun 23 20:56:21 2015
+++ lib/wx/configure.in Thu Jul 2 13:19:07 2015
@@ -236,6 +236,7 @@ dnl
if test X"$host_os" != X"win32" ; then
AC_CHECK_HEADERS([GL/gl.h], [],
[AC_CHECK_HEADERS([OpenGL/gl.h])])
+ GL_LIBS="-L/usr/X11R6/lib $GL_LIBS"
if test X"$ac_cv_header_GL_gl_h" != Xyes &&
test X"$ac_cv_header_OpenGL_gl_h" != Xyes
then

17
lang/erlang/21/patches/patch-make_install_bin
View File

@ -1,17 +0,0 @@
Create versioned symlinks in ${PREFIX}/bin/
--- make/install_bin.orig Tue Jun 23 20:56:21 2015
+++ make/install_bin Thu Jun 25 13:47:10 2015
@@ -691,9 +691,9 @@ done
# do it
for file in "$@"; do
- echo $ln_s "$DQ$src_dir/$file$DQ" "$file"
- $dbg $ln_s "$src_dir/$file" "$file" || {
- test "$tst" = "" || echo "{error,{$type,\"$file\",failed}}." > $tst
+ echo $ln_s "$DQ$src_dir/$file$DQ" "${file}${MAJ_V}"
+ $dbg $ln_s "$src_dir/$file" "${file}${MAJ_V}" || {
+ test "$tst" = "" || echo "{error,{$type,\"$file${MAJ_V}\",failed}}." > $tst
exit 1
}
done

10
lang/erlang/21/patches/patch-make_target_mk
View File

@ -1,10 +0,0 @@
--- make/target.mk.orig Tue Jun 23 20:56:21 2015
+++ make/target.mk Thu Jun 25 13:47:10 2015
@@ -25,6 +25,7 @@ ifeq ($(OVERRIDE_TARGET),)
ifeq ($(TARGET),)
TARGET := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
+TARGET := $(shell $(ERL_TOP)/erts/autoconf/config.sub $(TARGET))
else

8
lang/erlang/21/pkg/DESCR-main
View File

@ -1,8 +0,0 @@
Erlang is a programming language which has many features more commonly
associated with an operating system than with a programming language:
concurrent processes, scheduling, memory management, distribution,
networking, etc.
Erlang was designed at the Ericsson Computer Science Laboratory.
Open-source Erlang is being released to help encourage the spread
of Erlang outside Ericsson.

1
lang/erlang/21/pkg/DESCR-wx
View File

@ -1 +0,0 @@
WxWidgets bindings for Erlang.

3535
lang/erlang/21/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

1006
lang/erlang/21/pkg/PLIST-wx
View File

File diff suppressed because it is too large Load Diff

4
lang/erlang/25/Makefile
View File

@ -10,8 +10,8 @@ PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
#REVISION-main=
#REVISION-wx=
REVISION-main= 0
REVISION-wx= 0
VERSION_SPEC= >=25,<26
PKGSPEC-main= erlang-${VERSION_SPEC}

1
lang/erlang/25/pkg/PLIST-main
View File

@ -1,6 +1,7 @@
@option no-default-conflict
@option is-branch
@conflict erlang-wx->=25,<25.1.2
@pkgpath lang/erlang/21,-main
bin/ct_run25
bin/dialyzer25
bin/epmd25

1
lang/erlang/25/pkg/PLIST-wx
View File

@ -1,5 +1,6 @@
@option no-default-conflict
@option is-branch
@pkgpath lang/erlang/21,-wx
lib/${ERLANG_V}/lib/${ERL_DEBUGGER}/
lib/${ERLANG_V}/lib/${ERL_DEBUGGER}/doc/
lib/${ERLANG_V}/lib/${ERL_DEBUGGER}/doc/chunks/

1
lang/erlang/Makefile
View File

@ -1,5 +1,4 @@
SUBDIR =
SUBDIR += 21
SUBDIR += 25
.include <bsd.port.subdir.mk>

23
lang/erlang/erlang.port.mk
View File

@ -20,38 +20,23 @@ FLAVOR?= # empty
# When no flavor is explicitly set, assume MODERL_DEFAULT_VERSION
.if ${FLAVOR:Merlang21}
MODERL_VERSION = 21
_MODERL_FLAVOR = ${FLAVOR}
ERRORS += "Invalid FLAVOR set: ${FLAVOR}."
.else
MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
_MODERL_FLAVOR ?= # empty
.endif
.if ${MODERL_VERSION} == 21
_MODERL_FLAVOR = erlang21
.elif ${MODERL_VERSION} == 25
.if ${MODERL_VERSION} == 25
_MODERL_FLAVOR = erlang25
.else
ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
.endif
# If no configure style is set, then assume "rebar"
.if ${CONFIGURE_STYLE} == "" && ${MODERL_VERSION} == 21
CONFIGURE_STYLE = rebar
.endif
.if ${CONFIGURE_STYLE} == "" && ${MODERL_VERSION} >= 25
# If no configure style is set, then assume "rebar3"
.if ${CONFIGURE_STYLE} == ""
CONFIGURE_STYLE = rebar3
.endif
.if ${CONFIGURE_STYLE} == "rebar"
MODERL_BUILD_DEPENDS += devel/rebar
REBAR_BIN ?= ${LOCALBASE}/bin/rebar${MODERL_VERSION}
# Make sure rebar gets called as 'rebar', otherwise escript tries to call the
# binary name (e.g. rebar21) as the script entrypoint.
_MODERL_LINKS += rebar${MODERL_VERSION} rebar
.endif
.if ${CONFIGURE_STYLE} == "rebar3"
MODERL_BUILD_DEPENDS += devel/rebar3
REBAR_BIN ?= ${LOCALBASE}/bin/rebar3-${MODERL_VERSION}