Date: Thu, 15 Apr 2021 14:00:51 GMT From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 85caa7603b65 - main - Erlang: portclippy fixes (order of variables and targets). Message-ID: <202104151400.13FE0pDh011526@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=85caa7603b65893c395f7687f07862dd74d51c7e commit 85caa7603b65893c395f7687f07862dd74d51c7e Author: Jimmy Olgeni <olgeni@FreeBSD.org> AuthorDate: 2021-04-13 08:28:06 +0000 Commit: Jimmy Olgeni <olgeni@FreeBSD.org> CommitDate: 2021-04-15 14:00:10 +0000 Erlang: portclippy fixes (order of variables and targets). --- lang/erlang-runtime20/Makefile | 32 +++++++------- lang/erlang-runtime21/Makefile | 55 ++++++++++++------------ lang/erlang-runtime22/Makefile | 53 ++++++++++++------------ lang/erlang-runtime23/Makefile | 53 ++++++++++++------------ lang/erlang/Makefile | 94 +++++++++++++++++++++--------------------- 5 files changed, 140 insertions(+), 147 deletions(-) diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile index 19ba12e1c1ab..cbcbf0e497aa 100644 --- a/lang/erlang-runtime20/Makefile +++ b/lang/erlang-runtime20/Makefile @@ -33,17 +33,6 @@ ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP \ THREADS WX OPTIONS_DEFAULT= DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS -OPTIONS_EXCLUDE_powerpc64= HIPE -OPTIONS_EXCLUDE_riscv64= DTRACE - -DIRTY_DESC= Enable Dirty schedulers -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 @@ -55,33 +44,42 @@ OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE HIPE NATIVE +OPTIONS_EXCLUDE_powerpc64= HIPE +OPTIONS_EXCLUDE_riscv64= DTRACE -OPENSSL_VARS= BROKEN_SSL=openssl +DIRTY_DESC= Enable Dirty schedulers +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 # 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. DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace +DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_CONFIGURE_WITH= javac +JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE= kernel-poll +NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs -ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CONFIGURE_WITH= odbc ODBC_CFLAGS= -I/usr/local/include ODBC_LDFLAGS= -L/usr/local/lib -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} +OPENSSL_VARS= BROKEN_SSL=openssl SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_USES= gl +WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=2.8+ \ WX_COMPS="wx contrib" diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile index 1b1ea46a085b..d57fcf02ac38 100644 --- a/lang/erlang-runtime21/Makefile +++ b/lang/erlang-runtime21/Makefile @@ -22,35 +22,22 @@ GH_PROJECT= otp:otp corba:corba GH_TAGNAME= 4.5.2:corba USE_PERL5= build -DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -WRKSRC= ${WRKSRC_otp} - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-smp-support MAKE_JOBS_UNSAFE= yes +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= CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL \ SCTP THREADS WX OPTIONS_DEFAULT= CORBA DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS -OPTIONS_EXCLUDE_powerpc64= HIPE -OPTIONS_EXCLUDE_powerpc64le= HIPE -OPTIONS_EXCLUDE_riscv64= DTRACE - -CORBA_DESC= Enable Corba support -DIRTY_DESC= Enable Dirty schedulers -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 @@ -62,31 +49,43 @@ OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE HIPE NATIVE +OPTIONS_EXCLUDE_powerpc64= HIPE +OPTIONS_EXCLUDE_powerpc64le= HIPE +OPTIONS_EXCLUDE_riscv64= DTRACE + +CORBA_DESC= Enable Corba support +DIRTY_DESC= Enable Dirty schedulers +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 # 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. DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace +DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_CONFIGURE_WITH= javac +JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE= kernel-poll +NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs -ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CONFIGURE_WITH= odbc ODBC_CFLAGS= -I/usr/local/include ODBC_LDFLAGS= -L/usr/local/lib -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_USES= gl +WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=3.1+ \ WX_COMPS="wx" @@ -129,6 +128,13 @@ post-install-CORBA-on: && ${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-* @@ -146,13 +152,6 @@ post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* -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-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 \ diff --git a/lang/erlang-runtime22/Makefile b/lang/erlang-runtime22/Makefile index f19c45530771..88ec75344929 100644 --- a/lang/erlang-runtime22/Makefile +++ b/lang/erlang-runtime22/Makefile @@ -22,34 +22,22 @@ GH_PROJECT= otp:otp corba:corba GH_TAGNAME= 4.5.2:corba USE_PERL5= build -DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -WRKSRC= ${WRKSRC_otp} - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-smp-support MAKE_JOBS_UNSAFE= yes +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= CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL \ SCTP THREADS WX OPTIONS_DEFAULT= CORBA DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS -OPTIONS_EXCLUDE_powerpc64= HIPE -OPTIONS_EXCLUDE_riscv64= DTRACE - -CORBA_DESC= Enable Corba support -DIRTY_DESC= Enable Dirty schedulers -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 @@ -61,31 +49,42 @@ OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE HIPE NATIVE +OPTIONS_EXCLUDE_powerpc64= HIPE +OPTIONS_EXCLUDE_riscv64= DTRACE + +CORBA_DESC= Enable Corba support +DIRTY_DESC= Enable Dirty schedulers +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 # 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. DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace +DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_CONFIGURE_WITH= javac +JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE= kernel-poll +NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs -ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CONFIGURE_WITH= odbc ODBC_CFLAGS= -I/usr/local/include ODBC_LDFLAGS= -L/usr/local/lib -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_USES= gl +WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=3.1+ \ WX_COMPS="wx" @@ -128,6 +127,13 @@ post-install-CORBA-on: && ${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-* @@ -145,13 +151,6 @@ post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* -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-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 \ diff --git a/lang/erlang-runtime23/Makefile b/lang/erlang-runtime23/Makefile index fb5b5af17d0a..a1a9e9cbb099 100644 --- a/lang/erlang-runtime23/Makefile +++ b/lang/erlang-runtime23/Makefile @@ -21,34 +21,22 @@ GH_PROJECT= otp:otp corba:corba GH_TAGNAME= 5.0.1:corba USE_PERL5= build -DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -WRKSRC= ${WRKSRC_otp} - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-smp-support MAKE_JOBS_UNSAFE= yes +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= CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL \ SCTP THREADS WX OPTIONS_DEFAULT= CORBA DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS -OPTIONS_EXCLUDE_powerpc64= HIPE -OPTIONS_EXCLUDE_riscv64= DTRACE - -CORBA_DESC= Enable Corba support -DIRTY_DESC= Enable Dirty schedulers -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 @@ -60,31 +48,42 @@ OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE HIPE NATIVE +OPTIONS_EXCLUDE_powerpc64= HIPE +OPTIONS_EXCLUDE_riscv64= DTRACE + +CORBA_DESC= Enable Corba support +DIRTY_DESC= Enable Dirty schedulers +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 # 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. DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace +DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_CONFIGURE_WITH= javac +JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" JAVA_VARS= USE_JAVA=yes KQUEUE_CONFIGURE_ENABLE= kernel-poll +NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs -ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CONFIGURE_WITH= odbc ODBC_CFLAGS= -I/usr/local/include ODBC_LDFLAGS= -L/usr/local/lib -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_USES= gl +WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=3.1+ \ WX_COMPS="wx" @@ -127,6 +126,13 @@ post-install-CORBA-on: && ${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-* @@ -144,13 +150,6 @@ post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* -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-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 \ diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index f22a4511e07a..a2a2abbf2747 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -23,17 +23,16 @@ GH_TAGNAME= 4.5.2:corba USE_PERL5= build USE_RC_SUBR= epmd -WRKSRC= ${WRKSRC_otp} - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-smp-support MAKE_JOBS_UNSAFE= yes -OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= TOOLS_VSN=${TOOLS_VSN} +WRKSRC= ${WRKSRC_otp} + ERLANG_LIB= ${PORTNAME} EI_VSN= 3.11.3.1 SNMP_VSN= 5.2.12 @@ -44,15 +43,27 @@ TOOLS_VSN= 3.1.0.1 # Remove HIPE from OPTIONS_DEFAULT if this is still the case when the port is # upgraded to such version. -OPTIONS_DEFINE= CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE \ - MANPAGES NATIVE ODBC OPENSSL PDF SCTP THREADS \ - WX -OPTIONS_DEFAULT= CORBA DIRTY DTRACE HIPE KQUEUE MANPAGES OPENSSL \ - SCTP THREADS +OPTIONS_DEFINE= CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE MANPAGES NATIVE \ + ODBC OPENSSL PDF SCTP THREADS WX +OPTIONS_DEFAULT= CORBA DIRTY DTRACE HIPE KQUEUE MANPAGES OPENSSL SCTP \ + THREADS + +.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 HIPE NATIVE OPTIONS_EXCLUDE_powerpc64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} HIPE OPTIONS_EXCLUDE_powerpc64_11= DTRACE OPTIONS_EXCLUDE_powerpc64_12= DTRACE OPTIONS_EXCLUDE_powerpc64le= HIPE +OPTIONS_EXCLUDE_riscv64= DTRACE +OPTIONS_SUB= yes CORBA_DESC= Enable Corba support DIRTY_DESC= Enable Dirty schedulers @@ -64,49 +75,36 @@ PDF_DESC= Build PDF documentation SCTP_DESC= Enable SCTP support WX_DESC= Enable WX application -FOP_PREVENTS= MANPAGES -NATIVE_IMPLIES= HIPE -PDF_IMPLIES= FOP - -.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 HIPE NATIVE -OPTIONS_EXCLUDE_riscv64= DTRACE - # 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. DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer 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 HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" 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 +NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs -ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CONFIGURE_WITH= odbc ODBC_CFLAGS= -I/usr/local/include ODBC_LDFLAGS= -L/usr/local/lib -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_USES= ssl +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} +PDF_IMPLIES= FOP SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_USES= gl +WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} WX_VARS= USE_GL="gl glu" \ USE_WX=3.1+ \ WX_COMPS="wx" @@ -153,11 +151,6 @@ 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} - # 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 @@ -174,6 +167,18 @@ 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 @@ -187,13 +192,6 @@ post-install-FOP-on: | ${XARGS} -J % ${CP} -v % ${STAGEDIR}${PREFIX}/lib/erlang/man/man3 .endif -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-JAVA-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* @@ -205,19 +203,19 @@ post-install-OPENSSL-off: ${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-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-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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104151400.13FE0pDh011526>