Index: head/lang/erlang-runtime22/Makefile =================================================================== --- head/lang/erlang-runtime22/Makefile (revision 498566) +++ head/lang/erlang-runtime22/Makefile (revision 498567) @@ -1,137 +1,136 @@ # Created by: ruslan@shevchenko.kiev.ua # $FreeBSD$ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 21.3.3 -# NB when bumping OTP versions also bump PORTREVISION in databases/couchdb2 +DISTVERSION= 22.0-rc2 CATEGORIES= lang parallel java -PKGNAMESUFFIX= -runtime21 +PKGNAMESUFFIX= -runtime22 DIST_SUBDIR= erlang MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared USES= autoreconf:build gmake ncurses perl5 USE_GITHUB= yes GH_PROJECT= otp USE_PERL5= build GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX -OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS +OPTIONS_DEFAULT=DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS OPTIONS_EXCLUDE_powerpc64= HIPE DIRTY_DESC= Enable Dirty schedulers GS_DESC= Enable GS application (deprecated) HIPE_DESC= Build native HiPE compiler KQUEUE_DESC= Enable Kernel Poll (kqueue) support NATIVE_DESC= Enable native libraries SCTP_DESC= Enable SCTP support WX_DESC= Enable WX application NATIVE_IMPLIES= HIPE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl111 # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. CONFIGURE_ENABLE= smp-support DIRTY_CONFIGURE_ENABLE= dirty-schedulers DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace DTRACE_VARS= STRIP="" GS_USES= tk:run HIPE_CONFIGURE_ENABLE= hipe JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_CONFIGURE_WITH= javac JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE=kernel-poll NATIVE_CONFIGURE_ENABLE=native-libs ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" .include .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 MAKE_ARGS+= ARCH=arm .endif pre-configure: @cd ${WRKSRC} && ./otp_build autoconf pre-configure-WX-off: echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: ${RM} ${WRKSRC}/lib/odbc/SKIP pre-build-NATIVE-on: @cd ${WRKSRC} && ${MAKE_CMD} clean post-install-GS-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* post-install-JAVA-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* post-install-ODBC-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* post-install-OPENSSL-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* post-stage: ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} .include Index: head/lang/erlang-runtime22/distinfo =================================================================== --- head/lang/erlang-runtime22/distinfo (revision 498566) +++ head/lang/erlang-runtime22/distinfo (revision 498567) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554131181 -SHA256 (erlang/erlang-otp-OTP-21.3.3_GH0.tar.gz) = c56d6c736163e93ee3edab0b3ae59209cfd751f0d8078a7ca83d63942202b706 -SIZE (erlang/erlang-otp-OTP-21.3.3_GH0.tar.gz) = 54025876 +TIMESTAMP = 1554892845 +SHA256 (erlang/erlang-otp-OTP-22.0-rc2_GH0.tar.gz) = b3f62e5b01ef565a7281985cb88839e3d6cbaa2096716a86dc697bd3eb9d3eb9 +SIZE (erlang/erlang-otp-OTP-22.0-rc2_GH0.tar.gz) = 54634947 Index: head/lang/erlang-runtime22/files/patch-lib_hipe_llvm_hipe__llvm__main.erl =================================================================== --- head/lang/erlang-runtime22/files/patch-lib_hipe_llvm_hipe__llvm__main.erl (revision 498566) +++ head/lang/erlang-runtime22/files/patch-lib_hipe_llvm_hipe__llvm__main.erl (nonexistent) @@ -1,11 +0,0 @@ ---- lib/hipe/llvm/hipe_llvm_main.erl.orig 2015-06-27 20:52:09 UTC -+++ lib/hipe/llvm/hipe_llvm_main.erl -@@ -474,7 +474,7 @@ unique_folder(FunName, Arity, Options) - - true -> %% Store folder in current directory - DirName; - false -> %% Temporarily store folder in tempfs (/dev/shm/) -- "/dev/shm/" ++ DirName -+ "/tmp/" ++ DirName - end, - %% Make sure it does not exist - case dir_exists(Dir) of Property changes on: head/lang/erlang-runtime22/files/patch-lib_hipe_llvm_hipe__llvm__main.erl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/erlang-runtime22/files/patch-Makefile.in =================================================================== --- head/lang/erlang-runtime22/files/patch-Makefile.in (revision 498566) +++ head/lang/erlang-runtime22/files/patch-Makefile.in (revision 498567) @@ -1,20 +1,20 @@ --- Makefile.in.orig 2015-06-23 18:56:21 UTC +++ Makefile.in @@ -60,7 +60,7 @@ bindir = @bindir@ libdir = @libdir@ # Where Erlang/OTP is located -libdir_suffix = /erlang -+libdir_suffix = /erlang21 ++libdir_suffix = /erlang22 erlang_libdir = $(libdir)$(libdir_suffix) erlang_bindir = $(erlang_libdir)/bin @@ -1013,7 +1013,7 @@ $(TEST_DIRS): # # Order is important here, don't change it! # -INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin +INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install: $(INST_DEP) Index: head/lang/erlang-runtime22/pkg-descr =================================================================== --- head/lang/erlang-runtime22/pkg-descr (revision 498566) +++ head/lang/erlang-runtime22/pkg-descr (revision 498567) @@ -1,10 +1,10 @@ Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high availability. Some of its uses are in telecoms, banking, e-commerce, computer telephony and instant messaging. Erlang's runtime system has built-in support for concurrency, distribution and fault tolerance. -This port contains a standalone runtime environment of Erlang 21 +This port contains a standalone runtime environment of Erlang 22 to be used during the development of OTP applications. WWW: http://www.erlang.org/