diff --git a/lang/erlang-runtime24/Makefile b/lang/erlang-runtime24/Makefile index a66fea9c3edb..49c22f3a68fd 100644 --- a/lang/erlang-runtime24/Makefile +++ b/lang/erlang-runtime24/Makefile @@ -1,154 +1,155 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- DISTVERSION= 24.0.6 PORTREVISION= 0 CATEGORIES= lang parallel java PKGNAMESUFFIX= -runtime24 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 +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 -CPE_VENDOR= erlang -CPE_PRODUCT= erlang/otp - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-dirty-schedulers \ --enable-kernel-poll \ --enable-smp-support \ --enable-threads MAKE_ARGS= all DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} WRKSRC= ${WRKSRC_otp} ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -OPTIONS_DEFINE= CHUNKS CORBA DTRACE JAVA ODBC OPENSSL SCTP SHARING WX -OPTIONS_DEFAULT= CHUNKS CORBA DTRACE OPENSSL SCTP SHARING +OPTIONS_DEFINE= CHUNKS CORBA DTRACE JAVA KQUEUE ODBC OPENSSL SCTP \ + SHARING WX +OPTIONS_DEFAULT= CHUNKS CORBA DTRACE KQUEUE OPENSSL SCTP SHARING .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 -CHUNKS_DESC= Enable in-line documentation in erlang console +CHUNKS_DESC= Enable in-line documentation in Erlang console CORBA_DESC= Enable Corba support +KQUEUE_DESC= Enable Kernel Poll (kqueue) support 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 DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_VARS= USE_JAVA=yes +KQUEUE_CONFIGURE_ENABLE= kernel-poll ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -ODBC_CONFIGURE_WITH= odbc 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} 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: - @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 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} 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-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/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} .include diff --git a/lang/erlang-runtime24/files/patch-configure.src b/lang/erlang-runtime24/files/patch-configure similarity index 95% rename from lang/erlang-runtime24/files/patch-configure.src rename to lang/erlang-runtime24/files/patch-configure index 1d4dd2178a43..9713b597b9dc 100644 --- a/lang/erlang-runtime24/files/patch-configure.src +++ b/lang/erlang-runtime24/files/patch-configure @@ -1,40 +1,40 @@ ---- configure.src.orig 2021-05-27 09:36:50 UTC -+++ configure.src +--- 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" ] ||