Index: head/lang/erlang-runtime17/Makefile =================================================================== --- head/lang/erlang-runtime17/Makefile (revision 403236) +++ head/lang/erlang-runtime17/Makefile (revision 403237) @@ -1,273 +1,277 @@ # Created by: ruslan@shevchenko.kiev.ua # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 17.5.6.4 +PORTVERSION= 17.5.6.6 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg PKGNAMESUFFIX= -runtime17 DISTNAME= otp_src_${ERL_RELEASE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ ${ERLANG_MAN}:erlangorg DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni PATCHFILES= patch-otp-17.5.1 patch-otp-17.5.2 patch-otp-17.5.3 \ patch-otp-17.5.4 patch-otp-17.5.5 patch-otp-17.5.6 \ patch-otp-17.5.6.1 patch-otp-17.5.6.2 patch-otp-17.5.6.3 \ - patch-otp-17.5.6.4 + patch-otp-17.5.6.4 patch-otp-17.5.6.5 patch-otp-17.5.6.6 MAINTAINER= olgeni@FreeBSD.org COMMENT= Functional programming language from Ericsson WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DIRTY DIRTY_DESC= Enable Dirty schedulers (experimental) DTRACE_DESC= Enable DTrace support GS_DESC= Enable GS application (deprecated) HIPE_DESC= Build native HiPE compiler KQUEUE_DESC= Enable Kernel Poll (kqueue) support SCTP_DESC= Enable SCTP support SMP_DESC= Enable SMP support WX_DESC= Enable WX application OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS OPTIONS_EXCLUDE_DragonFly= HIPE SCTP ERL_RELEASE= 17.5 USES= gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${ERLANG_DOCS}:erlangorg .endif # See http://wiki.freebsd.org/DTrace to learn how to enable DTrace # on your system. You will need to configure STRIP, WITH_CTF and # CFLAGS in your make.conf before building. # 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. .if ${OSVERSION} < 1000000 .if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC} IGNORE= DTRACE support on amd64 requires GCC option .endif .endif .if ${PORT_OPTIONS:MGCC} USE_GCC?= yes .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--with-dynamic-trace=dtrace .else CONFIGURE_ARGS+=--without-dynamic-trace .endif .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} .else CONFIGURE_ARGS+=--without-ssl .endif .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes CONFIGURE_ARGS+=--with-javac CONFIGURE_ENV+= ac_cv_prog_JAVAC="${JAVAC}" .else CONFIGURE_ARGS+=--without-javac .endif .if ${PORT_OPTIONS:MHIPE} CONFIGURE_ARGS+=--enable-hipe .else CONFIGURE_ARGS+=--disable-hipe .endif .if ${PORT_OPTIONS:MKQUEUE} CONFIGURE_ARGS+=--enable-kernel-poll .else CONFIGURE_ARGS+=--disable-kernel-poll .endif .if ${PORT_OPTIONS:MGS} USES+= tk:run .endif .if ${PORT_OPTIONS:MWX} USE_WX= 2.8+ WX_COMPS= wx contrib WX_UNICODE= yes CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} .endif .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-odbc .endif ERLANG_MAN= otp_doc_man_${ERL_RELEASE}.tar.gz ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+=--enable-threads .else CONFIGURE_ARGS+=--disable-threads .endif .if ${PORT_OPTIONS:MSCTP} CONFIGURE_ARGS+=--enable-sctp .else CONFIGURE_ARGS+=--disable-sctp .endif # enabling --enable-smp-support crashes the OS when # net_kernel:start([node_name, shortnames]) invoked repeatedly # TODO verify if it still applies .if ${PORT_OPTIONS:MSMP} CONFIGURE_ARGS+=--enable-smp-support .else CONFIGURE_ARGS+=--disable-smp-support .endif .if ${PORT_OPTIONS:MDIRTY} CONFIGURE_ARGS+=--enable-dirty-schedulers .endif .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif .if ${ARCH} == armv6 MAKE_ARGS+= ARCH=arm .endif # 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). # Install documentation. (HTML docs need to be in same dir as the # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. pre-configure: .if ${PORT_OPTIONS:MDTRACE} @if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \ ${ECHO_CMD}; \ ${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \ ${ECHO_CMD}; \ exit 1; \ fi .endif .if ! ${PORT_OPTIONS:MWX} echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP .endif post-install: for SECTION in 1 3 4 6 7; do \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \ "man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \ done ${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat? .if ${PORT_OPTIONS:MDOCS} ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4/* \ - ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4.1.3 + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4.1.5 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.6/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.9 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.6 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2.4 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9.2.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/debugger-4.0.3/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/debugger-4.0.3.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/debugger-4.0.3 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.1/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.2 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.1 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0/* \ - ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0.1 + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0.1.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/runtime_tools-1.8.16/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/runtime_tools-1.8.16.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/runtime_tools-1.8.16 + + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/kernel-3.2/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/kernel-3.2.0.1 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/kernel-3.2 ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ .endif .if ! ${PORT_OPTIONS:MGS} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* .endif .if ! ${PORT_OPTIONS:MJAVA} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* .endif .if ! ${PORT_OPTIONS:MODBC} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* .endif .if ! ${PORT_OPTIONS:MOPENSSL} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* .endif .if ! ${PORT_OPTIONS:MWX} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* .endif @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \ | ${SORT} \ | ${SED} -e 's#^#@dir #g' \ > ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} \ >> ${TMPPLIST} .include Index: head/lang/erlang-runtime17/distinfo =================================================================== --- head/lang/erlang-runtime17/distinfo (revision 403236) +++ head/lang/erlang-runtime17/distinfo (revision 403237) @@ -1,26 +1,30 @@ SHA256 (erlang/otp_src_17.5.tar.gz) = 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 SIZE (erlang/otp_src_17.5.tar.gz) = 67242289 SHA256 (erlang/otp_doc_man_17.5.tar.gz) = 85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3 SIZE (erlang/otp_doc_man_17.5.tar.gz) = 1363320 SHA256 (erlang/otp_doc_html_17.5.tar.gz) = baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5 SIZE (erlang/otp_doc_html_17.5.tar.gz) = 33510258 SHA256 (erlang/patch-otp-17.5.1) = e95b17b539b84b2408cbdd8af68ea96ad239a1b38117243d21ebb809ab3ca1c3 SIZE (erlang/patch-otp-17.5.1) = 36012 SHA256 (erlang/patch-otp-17.5.2) = 9c70e90c3b040ab1e136738f355f0925f64afd5a4b28f1c9a6f4035f2bf03b1b SIZE (erlang/patch-otp-17.5.2) = 17821 SHA256 (erlang/patch-otp-17.5.3) = fd2879176733c34c002123da9d9b96ac3cf1857c7422a061711be818aecc9e13 SIZE (erlang/patch-otp-17.5.3) = 135959 SHA256 (erlang/patch-otp-17.5.4) = dce1130adfabe4fdecd1e5e700bea70a5e9ba7886b51c81a7a2371e204d725ca SIZE (erlang/patch-otp-17.5.4) = 14618 SHA256 (erlang/patch-otp-17.5.5) = 78f81dc17c52b73d45819de50fc11df3a19ff0593a6d5c6d105b5875c1e654f6 SIZE (erlang/patch-otp-17.5.5) = 44523 SHA256 (erlang/patch-otp-17.5.6) = 25461538cf79af56ee64019cfb76764bc5c2ac7cc9d3f9061ef01dd93d46ef36 SIZE (erlang/patch-otp-17.5.6) = 57264 SHA256 (erlang/patch-otp-17.5.6.1) = 695bea19a372d58fc94ca79e84054524e7895516aab3a1d03905dd5971779ed7 SIZE (erlang/patch-otp-17.5.6.1) = 9062 SHA256 (erlang/patch-otp-17.5.6.2) = 47fc4468fdc75249f30a4ba120ed39db03dfb5ebc5c2b1c7e94eb43d8c221002 SIZE (erlang/patch-otp-17.5.6.2) = 14293 SHA256 (erlang/patch-otp-17.5.6.3) = 75e91ad34a910353452cc1cf26ffb6936e9df3f0d1144793eb83ac7ab3074486 SIZE (erlang/patch-otp-17.5.6.3) = 63652 SHA256 (erlang/patch-otp-17.5.6.4) = 9156ea7d173b8fef62ee1eb2483b943cfdbeca80b74177f51aa131a688db8ed5 SIZE (erlang/patch-otp-17.5.6.4) = 11945 +SHA256 (erlang/patch-otp-17.5.6.5) = 270501a8ab836456aeddf2601996601b3b7f040dc360a438319434b21c26e1b0 +SIZE (erlang/patch-otp-17.5.6.5) = 16967 +SHA256 (erlang/patch-otp-17.5.6.6) = 53125e68a9a8530e1eaa6451a0849b8b458d40b6611ded9c1cae2936166f65bf +SIZE (erlang/patch-otp-17.5.6.6) = 5252 Index: head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.erl =================================================================== --- head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.erl (revision 403236) +++ head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.erl (nonexistent) @@ -1,22 +0,0 @@ ---- lib/ssl/src/ssl_cipher.erl.orig 2015-03-31 12:32:52 UTC -+++ lib/ssl/src/ssl_cipher.erl -@@ -1209,7 +1209,8 @@ hash_algorithm(?SHA) -> sha; - hash_algorithm(?SHA224) -> sha224; - hash_algorithm(?SHA256) -> sha256; - hash_algorithm(?SHA384) -> sha384; --hash_algorithm(?SHA512) -> sha512. -+hash_algorithm(?SHA512) -> sha512; -+hash_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other. - - sign_algorithm(anon) -> ?ANON; - sign_algorithm(rsa) -> ?RSA; -@@ -1218,7 +1219,8 @@ sign_algorithm(ecdsa) -> ?ECDSA; - sign_algorithm(?ANON) -> anon; - sign_algorithm(?RSA) -> rsa; - sign_algorithm(?DSA) -> dsa; --sign_algorithm(?ECDSA) -> ecdsa. -+sign_algorithm(?ECDSA) -> ecdsa; -+sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other. - - hash_size(null) -> - 0; Property changes on: head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.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