diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index a089f87b0996..867c69b8c4c0 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,222 +1,222 @@ # Created by: ruslan@shevchenko.kiev.ua PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 24.0.6 +DISTVERSION= 24.1.1 PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= lang parallel java 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 cpe gmake ncurses perl5 +USES= cpe gmake ncurses perl5 CPE_VENDOR= erlang CPE_PRODUCT= erlang/otp USE_GITHUB= nodefault GH_ACCOUNT= erlang:otp,corba GH_PROJECT= otp:otp corba:corba GH_TAGNAME= 5.0.2:corba USE_PERL5= build USE_RC_SUBR= epmd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-dirty-schedulers \ --enable-kernel-poll \ --enable-smp-support \ --enable-threads MAKE_ARGS= all SUB_FILES= pkg-message SUB_LIST= TOOLS_VSN=${TOOLS_VSN} WRKSRC= ${WRKSRC_otp} ERLANG_LIB= ${PORTNAME} -EI_VSN= 5.0.1 -SNMP_VSN= 5.9.1 -TOOLS_VSN= 3.5 +EI_VSN= 5.1 +SNMP_VSN= 5.10.1 +TOOLS_VSN= 3.5.1 OPTIONS_DEFINE= CHUNKS CORBA DIRTY DTRACE FOP JAVA KQUEUE MANPAGES ODBC \ OPENSSL PDF SCTP SHARING WX OPTIONS_DEFAULT= CHUNKS CORBA DIRTY DTRACE KQUEUE MANPAGES OPENSSL SCTP .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_DragonFly= SCTP # ld(1) fails to link probes: missing __dtrace_erlang___* symbols # see also https://reviews.freebsd.org/D22360 OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE OPTIONS_EXCLUDE_riscv64= DTRACE OPTIONS_SUB= yes CHUNKS_DESC= Enable in-line documentation in Erlang console CORBA_DESC= Enable Corba support DIRTY_DESC= Enable dirty schedulers FOP_DESC= Build full documentation with Apache FOP KQUEUE_DESC= Enable Kernel Poll (kqueue) support PDF_DESC= Build PDF documentation SCTP_DESC= Enable SCTP support SHARING_DESC= Enable term copy-and-share support WX_DESC= Enable WX application # 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. CHUNKS_MAKE_ARGS+= docs DOC_TARGETS=chunks DIRTY_CONFIGURE_WITH= dirty-schedulers DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" FOP_PREVENTS= MANPAGES FOP_BUILD_DEPENDS= fop:textproc/fop \ xsltproc:textproc/libxslt JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE= kernel-poll MANPAGES_RUN_DEPENDS= ${LOCALBASE}/etc/man.d/erlang.conf:lang/erlang-man ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_USES= localbase ODBC_CONFIGURE_WITH= odbc ODBC_CFLAGS= -I/usr/local/include ODBC_LDFLAGS= -L/usr/local/lib OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} PDF_IMPLIES= FOP SCTP_CONFIGURE_ENABLE= sctp SHARING_CONFIGURE_ENABLE= sharing-preserving WX_USES= gl WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=3.1+ \ WX_COMPS="wx" .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: @if [ ! $$(${CAT} ${WRKSRC}/lib/erl_interface/vsn.mk | ${GREP} "EI_VSN *=" | ${CUT} -w -f3) = ${EI_VSN} ]; then \ ${ECHO_MSG} "===> EI_VSN (${EI_VSN}) in Makefile does not match value in lib/erl_interface/vsn.mk"; exit 1; \ fi @if [ ! $$(${CAT} ${WRKSRC}/lib/tools/vsn.mk | ${GREP} "TOOLS_VSN *=" | ${CUT} -w -f3) = ${TOOLS_VSN} ]; then \ ${ECHO_MSG} "===> TOOLS_VSN (${TOOLS_VSN}) in Makefile does not match value in lib/tools/vsn.mk"; exit 1; \ fi @if [ ! $$(${CAT} ${WRKSRC}/lib/snmp/vsn.mk | ${GREP} -E "SNMP_VSN *=" | ${CUT} -w -f3) = ${SNMP_VSN} ]; then \ ${ECHO_MSG} "===> SNMP_VSN (${SNMP_VSN}) in Makefile does not match value in lib/snmp/vsn.mk"; exit 1; \ fi 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 post-configure-ODBC-off: echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP post-build-CORBA-on: cd ${WRKSRC_corba} \ && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} ${MAKE_CMD} # The man-pages are put (in spite of FreeBSD's port convention) in a private # subdir. This is to avoid cluttering up the man page name space. Also the # Erlang man pages are more of internal documentation using the man format than # actual system man pages. (erl.1 and epmd.1 perhaps being the exception). post-build-FOP-on: @cd ${WRKSRC} && ${MAKE_CMD} docs .if ${PORT_OPTIONS:MCORBA} cd ${WRKSRC_corba} \ && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} ${MAKE_CMD} docs .endif post-install: ${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call ${LN} -sf ../lib/${ERLANG_LIB}/lib/snmp-${SNMP_VSN}/bin/snmpc ${STAGEDIR}${PREFIX}/bin/snmpc post-install-CORBA-on: cd ${WRKSRC_corba} \ && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \ ${MAKE_CMD} release RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} post-install-DTRACE-on: ${MKDIR} ${STAGEDIR}${DATADIR}/dtrace ${INSTALL_DATA} ${WRKSRC}/erts/emulator/beam/*.d \ ${WRKSRC}/lib/runtime_tools/c_src/*.d \ ${WRKSRC}/lib/runtime_tools/examples/*.d \ ${STAGEDIR}${DATADIR}/dtrace post-install-FOP-on: @${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf ${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf for SECTION in 1 3 4 6 7; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/man/man$${SECTION}; \ ${FIND} ${WRKSRC}/erts ${WRKSRC}/lib -type f | ${GREP} doc/man$${SECTION} \ | ${XARGS} -J % ${CP} -v % ${STAGEDIR}${PREFIX}/lib/erlang/man/man$${SECTION}; \ done .if ${PORT_OPTIONS:MCORBA} ${FIND} ${WRKSRC_corba}/lib -type f | ${GREP} doc/man3 \ | ${XARGS} -J % ${CP} -v % ${STAGEDIR}${PREFIX}/lib/erlang/man/man3 .endif 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-PDF-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${FIND} ${WRKSRC} -name \*.pdf | ${XARGS} -J % ${CP} -v % ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MCORBA} ${FIND} ${WRKSRC_corba} -name \*.pdf | ${XARGS} -J % ${CP} -v % ${STAGEDIR}${DOCSDIR} .endif post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/debugger-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/et-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-* ${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}/* ${DATADIR_REL}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} @if [ -d ${STAGEDIR}/${DOCSDIR} ]; then \ cd ${STAGEDIR}${PREFIX}; ${FIND} ${DOCSDIR_REL}/* -name \*.pdf \ | ${SORT} >> ${TMPPLIST}; \ fi .include diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index f52cbf9f48cd..cda08596480f 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1631542362 -SHA256 (erlang/erlang-otp-OTP-24.0.6_GH0.tar.gz) = a60a7d776a4573e2018d6fad6df957e3911ecbce5f11497a8ec537f613aca0a1 -SIZE (erlang/erlang-otp-OTP-24.0.6_GH0.tar.gz) = 58894872 +TIMESTAMP = 1633082017 +SHA256 (erlang/erlang-otp-OTP-24.1.1_GH0.tar.gz) = 96a9ffd0ce529dda8bb98eb3e607994fe9f67c1abb3fc1cca545826ad088358d +SIZE (erlang/erlang-otp-OTP-24.1.1_GH0.tar.gz) = 59041453 SHA256 (erlang/erlang-corba-5.0.2_GH0.tar.gz) = d82b3efb0330870ac59a86ed96130b3e2caa7df5304e46b06dd79ad237686703 SIZE (erlang/erlang-corba-5.0.2_GH0.tar.gz) = 1393602 diff --git a/lang/erlang/files/patch-configure b/lang/erlang/files/patch-configure deleted file mode 100644 index 9713b597b9dc..000000000000 --- a/lang/erlang/files/patch-configure +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.orig 2021-09-13 14:43:59 UTC -+++ configure -@@ -55,7 +55,7 @@ skip_applications= - while test $# != 0; do - case $1 in - -srcdir=* | --srcdir=*) -- user_srcdir=`expr "$1" : '[^=]*=\(.*\)'` -+ user_srcdir=`expr -- "$1" : '[^=]*=\(.*\)'` - if test "$ERL_TOP" != ""; then - echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2 - echo "" 1>&2 -@@ -95,7 +95,7 @@ while test $# != 0; do - echo "" 1>&2 - ;; - -cache-file=* | --cache-file=* ) -- static_cache=`expr "$1" : '[^=]*=\(.*\)'` -+ static_cache=`expr -- "$1" : '[^=]*=\(.*\)'` - if test "$static_cache" != "/dev/null"; then - echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2 - echo "" 1>&2 -@@ -140,8 +140,8 @@ while test $# != 0; do - pie_ldflags="-no-pie" - ;; - CFLAGS=* | LDFLAGS=*) -- flgs_var=`expr "$1" : '\([^=]*\)=.*'` -- flgs_val=`expr "$1" : '[^=]*=\(.*\)'` -+ flgs_var=`expr -- "$1" : '\([^=]*\)=.*'` -+ flgs_val=`expr -- "$1" : '[^=]*=\(.*\)'` - eval $flgs_var=\$flgs_val - ;; - --help=r* | -help=r*) -@@ -151,7 +151,7 @@ while test $# != 0; do - *) - case $1 in - --without-*) -- skip_app=`expr "$1" : '--without-\(.*\)'` -+ skip_app=`expr -- "$1" : '--without-\(.*\)'` - if [ "$skip_app" = "stdlib" ] || - [ "$skip_app" = "kernel" ] || - [ "$skip_app" = "sasl" ] ||