View | Details | Raw Unified | Return to bug 254767
Collapse All | Expand All

(-)erlang/Makefile (-9 / +8 lines)
Lines 3-11 Link Here
3
3
4
PORTNAME=	erlang
4
PORTNAME=	erlang
5
DISTVERSIONPREFIX=	OTP-
5
DISTVERSIONPREFIX=	OTP-
6
DISTVERSION=	21.3.8.21
6
DISTVERSION=	23.3.1
7
PORTREVISION=	0
8
PORTEPOCH=	4
9
CATEGORIES=	lang parallel java
7
CATEGORIES=	lang parallel java
10
DIST_SUBDIR=	erlang
8
DIST_SUBDIR=	erlang
11
9
Lines 20-26 Link Here
20
USE_GITHUB=	nodefault
18
USE_GITHUB=	nodefault
21
GH_ACCOUNT=	erlang:otp,corba
19
GH_ACCOUNT=	erlang:otp,corba
22
GH_PROJECT=	otp:otp corba:corba
20
GH_PROJECT=	otp:otp corba:corba
23
GH_TAGNAME=	4.5.2:corba
21
GH_TAGNAME=	5.0.1:corba
24
USE_PERL5=	build
22
USE_PERL5=	build
25
USE_RC_SUBR=	epmd
23
USE_RC_SUBR=	epmd
26
24
Lines 34-42 Link Here
34
SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
32
SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
35
33
36
ERLANG_LIB=	${PORTNAME}
34
ERLANG_LIB=	${PORTNAME}
37
EI_VSN=		3.11.3.1
35
EI_VSN=		4.0.2
38
SNMP_VSN=	5.2.12
36
SNMP_VSN=	5.8
39
TOOLS_VSN=	3.1.0.1
37
TOOLS_VSN=	3.4.4
40
38
41
# On Erlang 22, native code generation does not currently work for all modules
39
# On Erlang 22, native code generation does not currently work for all modules
42
# due to new BEAM instructions not supported by HiPE the native compiler.
40
# due to new BEAM instructions not supported by HiPE the native compiler.
Lines 44-50 Link Here
44
# upgraded to such version.
42
# upgraded to such version.
45
43
46
OPTIONS_DEFINE=	CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE MANPAGES NATIVE ODBC OPENSSL PDF SCTP THREADS WX
44
OPTIONS_DEFINE=	CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE MANPAGES NATIVE ODBC OPENSSL PDF SCTP THREADS WX
47
OPTIONS_DEFAULT=CORBA DIRTY DTRACE HIPE KQUEUE MANPAGES OPENSSL SCTP THREADS
45
OPTIONS_DEFAULT=CORBA DIRTY DTRACE KQUEUE MANPAGES OPENSSL SCTP THREADS
48
OPTIONS_EXCLUDE_powerpc64=	HIPE ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}                  
46
OPTIONS_EXCLUDE_powerpc64=	HIPE ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}                  
49
OPTIONS_EXCLUDE_powerpc64_11=	DTRACE
47
OPTIONS_EXCLUDE_powerpc64_11=	DTRACE
50
OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
48
OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
Lines 97-109 Link Here
97
NATIVE_CONFIGURE_ENABLE=native-libs
95
NATIVE_CONFIGURE_ENABLE=native-libs
98
ODBC_CONFIGURE_WITH=	odbc
96
ODBC_CONFIGURE_WITH=	odbc
99
ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
97
ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
98
ODBC_LDFLAGS=		-L/usr/local/lib
100
OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
99
OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
101
OPENSSL_USES=		ssl
100
OPENSSL_USES=		ssl
102
SCTP_CONFIGURE_ENABLE=	sctp
101
SCTP_CONFIGURE_ENABLE=	sctp
103
THREADS_CONFIGURE_ENABLE=	threads
102
THREADS_CONFIGURE_ENABLE=	threads
104
WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
103
WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
105
WX_USES=		gl
104
WX_USES=		gl
106
WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
105
WX_VARS=		USE_WX=3.0+ WX_COMPS="wx" USE_GL="gl glu"
107
106
108
.include <bsd.port.pre.mk>
107
.include <bsd.port.pre.mk>
109
108
(-)erlang/distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1613753643
1
TIMESTAMP = 1617150843
2
SHA256 (erlang/erlang-otp-OTP-21.3.8.21_GH0.tar.gz) = 47a0edb246c267f905564245ca3019e8491db5537dfa5441dc5031a4d091ea15
2
SHA256 (erlang/erlang-otp-OTP-23.3.1_GH0.tar.gz) = a5a067a3b17bbef8511f2c056957925b666670b6f2cdaf645e1bc28ce3dd3517
3
SIZE (erlang/erlang-otp-OTP-21.3.8.21_GH0.tar.gz) = 54098328
3
SIZE (erlang/erlang-otp-OTP-23.3.1_GH0.tar.gz) = 56654422
4
SHA256 (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 36f397e6aef97eebda629badb0570cb4ddc979a6d1557bc487a9e13671facf8f
4
SHA256 (erlang/erlang-corba-5.0.1_GH0.tar.gz) = 5e050376e51bd414d07d96018ba746487a652fbb39934f99a0cefb6439df6247
5
SIZE (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 1422685
5
SIZE (erlang/erlang-corba-5.0.1_GH0.tar.gz) = 1395153
(-)erlang/files/patch-configure.src (+40 lines)
Line 0 Link Here
1
--- configure.src.orig	2019-12-06 10:29:10 UTC
2
+++ configure.src
3
@@ -49,7 +49,7 @@ skip_applications=
4
 while test $# != 0; do
5
     case $1 in
6
 	-srcdir=* | --srcdir=*)
7
-	    user_srcdir=`expr "$1" : '[^=]*=\(.*\)'`
8
+	    user_srcdir=`expr -- "$1" : '[^=]*=\(.*\)'`
9
 	    if test "$ERL_TOP" != ""; then
10
 		echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2
11
 		echo "" 1>&2
12
@@ -89,7 +89,7 @@ while test $# != 0; do
13
 	    echo "" 1>&2
14
 	    ;;
15
 	-cache-file=* | --cache-file=* )
16
-	    static_cache=`expr "$1" : '[^=]*=\(.*\)'`
17
+	    static_cache=`expr -- "$1" : '[^=]*=\(.*\)'`
18
 	    if test "$static_cache" != "/dev/null"; then
19
 		echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2
20
 		echo "" 1>&2
21
@@ -126,8 +126,8 @@ while test $# != 0; do
22
 		mXY_build=
23
 	    fi;;
24
 	CFLAGS=* | LDFLAGS=*)
25
-	    flgs_var=`expr "$1" : '\([^=]*\)=.*'`
26
-	    flgs_val=`expr "$1" : '[^=]*=\(.*\)'`
27
+	    flgs_var=`expr -- "$1" : '\([^=]*\)=.*'`
28
+	    flgs_val=`expr -- "$1" : '[^=]*=\(.*\)'`
29
 	    eval $flgs_var=\$flgs_val
30
 	    ;;
31
 	--help=r* | -help=r*)
32
@@ -137,7 +137,7 @@ while test $# != 0; do
33
         *)
34
 	    case $1 in
35
 		--without-*)
36
-		    skip_app=`expr "$1" : '--without-\(.*\)'`
37
+		    skip_app=`expr -- "$1" : '--without-\(.*\)'`
38
 		    if test -d "lib/$skip_app"; then
39
 			skip_applications="$skip_applications $skip_app"
40
 		    fi;;
(-)erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl (-11 lines)
Lines 1-11 Link Here
1
--- lib/hipe/llvm/hipe_llvm_main.erl.orig	2015-06-27 20:52:09 UTC
2
+++ lib/hipe/llvm/hipe_llvm_main.erl
3
@@ -474,7 +474,7 @@ unique_folder(FunName, Arity, Options) -
4
       true ->  %% Store folder in current directory
5
         DirName;
6
       false -> %% Temporarily store folder in tempfs (/dev/shm/)
7
-        "/dev/shm/" ++ DirName
8
+        "/tmp/" ++ DirName
9
     end,
10
   %% Make sure it does not exist
11
   case dir_exists(Dir) of
(-)erlang/files/patch-lib_odbc_configure.in (-18 lines)
Lines 1-18 Link Here
1
--- lib/odbc/configure.in.orig	2021-03-29 07:15:57.000000000 -0600
2
+++ lib/odbc/configure.in	2021-03-31 00:28:03.147674000 -0600
3
@@ -111,6 +111,7 @@
4
 AC_HEADER_STDC
5
 AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
6
 AC_CHECK_HEADERS([windows.h])
7
+CFLAGS="$CFLAGS -I/usr/local/include"
8
 AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
9
 [[#ifdef HAVE_WINDOWS_H
10
      # include <windows.h>
11
@@ -208,6 +209,7 @@
12
 			    echo "No odbc library found" > "$ERL_TOP/lib/odbc/SKIP"
13
 			else
14
 			    AC_MSG_RESULT($ODBC_LIB)
15
+                            LDFLAGS="$LDFLAGS $ODBC_LIB"
16
 			    AC_CHECK_LIB(odbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes])
17
 			fi
18
 			;;
(-)erlang/patch-lib_odbc_configure.in (+18 lines)
Line 0 Link Here
1
--- lib/odbc/configure.in.orig	2021-03-29 07:15:57.000000000 -0600
2
+++ lib/odbc/configure.in	2021-03-31 00:28:03.147674000 -0600
3
@@ -111,6 +111,7 @@
4
 AC_HEADER_STDC
5
 AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
6
 AC_CHECK_HEADERS([windows.h])
7
+CFLAGS+=" -I/usr/local/include"
8
 AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
9
 [[#ifdef HAVE_WINDOWS_H
10
      # include <windows.h>
11
@@ -208,6 +209,7 @@
12
 			    echo "No odbc library found" > "$ERL_TOP/lib/odbc/SKIP"
13
 			else
14
 			    AC_MSG_RESULT($ODBC_LIB)
15
+                            LDFLAGS+=" $ODBC_LIB"
16
 			    AC_CHECK_LIB(odbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes])
17
 			fi
18
 			;;

Return to bug 254767