Index: head/lang/erlang-runtime19/Makefile =================================================================== --- head/lang/erlang-runtime19/Makefile (revision 433109) +++ head/lang/erlang-runtime19/Makefile (revision 433110) @@ -1,252 +1,256 @@ # Created by: ruslan@shevchenko.kiev.ua # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.2.1 +PORTVERSION= 19.2.2 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= -runtime19 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-19.2.1 +PATCHFILES= patch-otp-19.2.1 patch-otp-19.2.2 MAINTAINER= olgeni@FreeBSD.org COMMENT= Functional programming language from Ericsson LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared 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= DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX 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 NATIVE_DESC= Enable native libraries SCTP_DESC= Enable SCTP support SMP_DESC= Enable SMP support WX_DESC= Enable WX application NATIVE_IMPLIES= HIPE OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_9= DTRACE OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_i386= DTRACE # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE ERL_RELEASE= 19.2 USES= gmake ncurses perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${ERLANG_DOCS}:erlangorg .endif # 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 ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 CFLAGS+= -DMAP_NORESERVE=0 .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--with-dynamic-trace=dtrace CFLAGS+= -fno-omit-frame-pointer STRIP= .else CONFIGURE_ARGS+=--without-dynamic-trace .endif .if ${PORT_OPTIONS:MOPENSSL} USES+= ssl 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:MNATIVE} CONFIGURE_ARGS+=--enable-native-libs .else CONFIGURE_ARGS+=--disable-native-libs .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 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} USE_GL+= gl glu .endif .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc LIB_DEPENDS+= libodbc.so: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:MWX} echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP .endif post-configure: .if ${PORT_OPTIONS:MODBC} ${RM} ${WRKSRC}/lib/odbc/SKIP .endif .if ${PORT_OPTIONS:MNATIVE} pre-build: @cd ${WRKSRC} && ${MAKE_CMD} clean .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} -r ${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-8.2/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.2.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.2 + + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.14.2/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.14.3 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.14.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 ${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 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif .include Index: head/lang/erlang-runtime19/distinfo =================================================================== --- head/lang/erlang-runtime19/distinfo (revision 433109) +++ head/lang/erlang-runtime19/distinfo (revision 433110) @@ -1,9 +1,11 @@ -TIMESTAMP = 1484642442 +TIMESTAMP = 1485948940 SHA256 (erlang/otp_src_19.2.tar.gz) = a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870 SIZE (erlang/otp_src_19.2.tar.gz) = 68395949 SHA256 (erlang/otp_doc_man_19.2.tar.gz) = 8a76ff3bb40a6d6a1552fa5a4204c8a3c7d99d2ea6f12684f02d038b23ad25cb SIZE (erlang/otp_doc_man_19.2.tar.gz) = 1409661 SHA256 (erlang/otp_doc_html_19.2.tar.gz) = c373c8c1a9fe7433825088684932f3ded76f53d5b8a4d3d2a364263f1f783043 SIZE (erlang/otp_doc_html_19.2.tar.gz) = 34761971 SHA256 (erlang/patch-otp-19.2.1) = 5fe07da09c914e1145c3e15e2f459fdb7cceedec0213a289ad238dada9645d2c SIZE (erlang/patch-otp-19.2.1) = 9287 +SHA256 (erlang/patch-otp-19.2.2) = a64cac32675fe57cb749461eba9458bbc4d7abddf58996c897e2528a41f2e33c +SIZE (erlang/patch-otp-19.2.2) = 9412 Index: head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp =================================================================== --- head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp (nonexistent) +++ head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp (revision 433110) @@ -0,0 +1,20 @@ +--- lib/wx/c_src/wxe_impl.cpp.orig 2017-01-30 23:13:25 UTC ++++ lib/wx/c_src/wxe_impl.cpp +@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE + throw wxe_badarg(index); + } + void * temp = memenv->ref2ptr[index]; +- if((index < memenv->next) && ((index == 0) || (temp > NULL))) ++ if((index < memenv->next) && ((index == 0) || (temp != NULL))) + return temp; + else { + throw wxe_badarg(index); +@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD + if(!memenv) + throw wxe_badarg(index); + void * temp = memenv->ref2ptr[index]; +- if((index < memenv->next) && ((index == 0) || (temp > NULL))) { ++ if((index < memenv->next) && ((index == 0) || (temp != NULL))) { + ptrMap::iterator it; + it = ptr2ref.find(temp); + if(it != ptr2ref.end()) { Property changes on: head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property